From a5ac61715b70ef628e1239e92ffd7aae859e8294 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 19 Jun 2008 19:06:25 +0000 Subject: buildroot: s/depends/depends on/ The new kconfig is more strict regarding depends/depends on, so fixup the tree. --- target/device/Atmel/AT91_Config.in | 160 ++++++++++++++-------------- target/device/Atmel/AVR32_Config.in | 24 ++--- target/device/Atmel/Config.in | 2 +- target/device/Atmel/at91bootstrap/Config.in | 2 +- 4 files changed, 94 insertions(+), 94 deletions(-) (limited to 'target/device/Atmel') diff --git a/target/device/Atmel/AT91_Config.in b/target/device/Atmel/AT91_Config.in index 254a2f2be..1a5bb0b5c 100644 --- a/target/device/Atmel/AT91_Config.in +++ b/target/device/Atmel/AT91_Config.in @@ -1,9 +1,9 @@ comment "Atmel AT91 Specific Device Support" - depends BR2_arm + depends on BR2_arm config BR2_TARGET_AT91 bool "Board support for the Atmel AT91 range of microprocessors" - depends BR2_arm + depends on BR2_arm default n help Atmel AT91 ARM based systems @@ -12,7 +12,7 @@ comment "Selection criteria" config BR2_TARGET_ATMEL_ALL bool "Allow all ARM targets" - depends BR2_arm + depends on BR2_arm default y config BR2_TARGET_ATMEL_NET @@ -39,136 +39,136 @@ comment "Device Selection" choice prompt "AT91 device" - depends BR2_TARGET_AT91 + depends on BR2_TARGET_AT91 default BR2_TARGET_AT91SAM9260 help Select the specific AT91 chip you wish to use. config BR2_TARGET_AT91RM9200 bool "Atmel AT91RM9200 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_LCD - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_LCD + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB help Atmel AT91RM9200 ARM based systems config BR2_TARGET_AT91SAM9260 bool "Atmel AT91SAM9260 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_LCD - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_LCD + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB help Atmel AT91SAM9260 ARM based systems config BR2_TARGET_AT91SAM9G20 bool "Atmel AT91SAM9G20 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_LCD - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_LCD + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel AT91SAM9G20 ARM based systems (Not Yet Implemented) config BR2_TARGET_AT91SAM9261 bool "Atmel AT91SAM9261 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_NET - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_NET + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB help Atmel AT91SAM9261 ARM based systems config BR2_TARGET_AT91SAM9261S bool "Atmel AT91SAM9261S Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_NET - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_NET + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel AT91SAM9261 ARM based systems (Not Yet Implemented) config BR2_TARGET_AT91SAM9RL64 bool "Atmel AT91SAM9RL64 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_NET - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_NET + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel AT91SAM9RL64 ARM based systems (Not Yet Implemented) config BR2_TARGET_AT91SAM9263 bool "Atmel AT91SAM9263 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB help Atmel AT91SAM9263 ARM based systems config BR2_TARGET_AT91SAM9G41 bool "Atmel AT91SAM9G41 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel AT91SAM9G41 ARM based systems config BR2_TARGET_AT91SAM9M10 bool "Atmel AT91SAM9M10 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel AT91SAM9M10 ARM based systems config BR2_TARGET_AT91SAM9M11 bool "Atmel AT91SAM9M11 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel AT91SAM9M11 ARM based systems config BR2_TARGET_AT91SAM9XE bool "Atmel AT91SAM9XE Microprocessors" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_LCD - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_LCD + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel AT91SAM9263 ARM based systems (Not Yet Implemented) config BR2_TARGET_AT572D940HF bool "Atmel AT572D940HF Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_LCD - depends !BR2_TARGET_ATMEL_MPB - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_LCD + depends on !BR2_TARGET_ATMEL_MPB + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel AT572D940 ARM based systems config BR2_TARGET_AT91CAP9 bool "Atmel AT91CAP9 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_FPDSP - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_FPDSP + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel AT91CAP9 ARM based systems config BR2_TARGET_AT91SAM9262 bool "Atmel ATR0663 Microprocessor" - depends BR2_TARGET_AT91 - depends !BR2_TARGET_ATMEL_FPDSP - depends !BR2_TARGET_ATMEL_MPB - depends ! BR2_TARGET_AT91_ADVANCED_INFO + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_ATMEL_FPDSP + depends on !BR2_TARGET_ATMEL_MPB + depends on ! BR2_TARGET_AT91_ADVANCED_INFO help Atmel ATR0663 ARM based systems (Not Yet Implemented) @@ -178,92 +178,92 @@ comment "Development Board Selection" choice prompt "Development Board support" - depends BR2_TARGET_AT91 + depends on BR2_TARGET_AT91 default BR2_TARGET_AT91SAM9260DFC help Select the specific AT91 development board you wish to use. config BR2_TARGET_AT91RM9200DF bool "Atmel AT91RM9200 Generic Dataflash(Card) Board Support" - depends BR2_TARGET_AT91RM9200 + depends on BR2_TARGET_AT91RM9200 help The Atmel AT91RM9200EK Development Board using Dataflashcard config BR2_TARGET_AT91RM9200SE bool "Atmel AT91RM9200 Generic Dataflash(Card) Board Support (SE)" - depends BR2_TARGET_AT91RM9200 + depends on BR2_TARGET_AT91RM9200 help The Atmel AT91RM9200EK Development Board using Dataflashcard (SE) config BR2_TARGET_AT91RM9200EK bool "Atmel AT91RM9200EK Development Board Support" - depends BR2_TARGET_AT91RM9200 + depends on BR2_TARGET_AT91RM9200 help The Atmel AT91RM9200EK Development Board config BR2_TARGET_AT91RM9200DK bool "Atmel AT91RM9200DK Development Board Support" - depends BR2_TARGET_AT91RM9200 + depends on BR2_TARGET_AT91RM9200 help The Atmel AT91RM9200DK Development Board config BR2_TARGET_AT91SAM9260DFC bool "Atmel AT91SAM9260DFC" - depends BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE + depends on BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE help The Atmel AT91SAM9260 Development Board booting from Dataflashcard config BR2_TARGET_AT91SAM9260EK bool "Atmel AT91SAM9260EK" - depends BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE + depends on BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE help The Atmel AT91SAM9260 Development Board booting from dataflash config BR2_TARGET_AT91SAM9XEEK bool "Atmel AT91SAM9XE-EK" - depends BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE + depends on BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE help The Atmel AT91SAM9xe Development Board (Not Yet Implemented) config BR2_TARGET_AT91SAM9261EK bool "Atmel AT91SAM9261EK" - depends BR2_TARGET_AT91SAM9261 || BR2_TARGET_AT91SAM9261S + depends on BR2_TARGET_AT91SAM9261 || BR2_TARGET_AT91SAM9261S help The Atmel AT91SAM9261 Development Board config BR2_TARGET_AT91SAM9RL64EK bool "Atmel AT91SAM9RL64EK" - depends BR2_TARGET_AT91SAM9RL64 + depends on BR2_TARGET_AT91SAM9RL64 help The Atmel AT91SAM9RL64 Development Board config BR2_TARGET_AT91SAM9262EK bool "Atmel AT91SAM9262EK" - depends BR2_TARGET_AT91SAM9262 + depends on BR2_TARGET_AT91SAM9262 help The Atmel AT91SAM9262 Development Board (Not Yet Implemented) config BR2_TARGET_AT91SAM9263EK bool "Atmel AT91SAM9263EK" - depends BR2_TARGET_AT91SAM9263 + depends on BR2_TARGET_AT91SAM9263 help The Atmel AT91SAM9263 Development Board (Not Yet Implemented) config BR2_TARGET_AT572D940DCM bool "Atmel AT572D940 Diopsis Computer Module" - depends BR2_TARGET_AT572D940HF + depends on BR2_TARGET_AT572D940HF help The Atmel Diopsis CPU Module (Not Yet Implemented) config BR2_TARGET_AT91CAP9DK bool "Atmel AT91CAP9DK" - depends BR2_TARGET_AT91CAP9 + depends on BR2_TARGET_AT91CAP9 help The Atmel AT91CAP9 Development Kit (Not Yet Implemented) config BR2_TARGET_AT91CAP9STK bool "Atmel AT91CAP9STK" - depends BR2_TARGET_AT91CAP9 + depends on BR2_TARGET_AT91CAP9 help The Atmel AT91CAP9 Starter Kit (Not Yet Implemented) @@ -271,20 +271,20 @@ endchoice choice prompt "SPI Mode" - depends BR2_TARGET_AT91SAM9261EK + depends on BR2_TARGET_AT91SAM9261EK default BR2_TARGET_AT91SAM9261EK_SPIMODE0 help Select SPI Mode 0 or 3 config BR2_TARGET_AT91SAM9261EK_SPIMODE0 bool "SPI Mode 0" - depends BR2_TARGET_AT91SAM9261EK + depends on BR2_TARGET_AT91SAM9261EK help Use SPI Mode 0, Required for AT45DB642D chips config BR2_TARGET_AT91SAM9261EK_SPIMODE3 bool "SPI Mode 3" - depends BR2_TARGET_AT91SAM9261EK + depends on BR2_TARGET_AT91SAM9261EK help Use SPI Mode 3 diff --git a/target/device/Atmel/AVR32_Config.in b/target/device/Atmel/AVR32_Config.in index 6bbb02142..5be23e703 100644 --- a/target/device/Atmel/AVR32_Config.in +++ b/target/device/Atmel/AVR32_Config.in @@ -1,74 +1,74 @@ comment "Atmel AVR32 Specific Device Support" - depends BR2_avr32 + depends on BR2_avr32 config BR2_TARGET_AVR32 bool "Board support for the Atmel AP7 microprocessors" - depends BR2_avr32 + depends on BR2_avr32 default n help Atmel AT32AP7XXX AVR32 based systems choice prompt "AVR32 device" - depends BR2_TARGET_AVR32 + depends on BR2_TARGET_AVR32 default BR2_TARGET_AT32AP7000 help Select the specific AVR32 chip you wish to use. config BR2_TARGET_AT32AP7000 bool "Board support for the Atmel AT32AP7000 Microprocessor" - depends BR2_TARGET_AVR32 + depends on BR2_TARGET_AVR32 help Atmel AT32AP7000 AVR32 based systems config BR2_TARGET_AT32AP7001 bool "Board support for the Atmel AT32AP7001 Microprocessor" - depends BR2_TARGET_AVR32 + depends on BR2_TARGET_AVR32 help Atmel AT32AP7001 AVR32 based systems config BR2_TARGET_AT32AP7002 bool "Board support for the Atmel AT32AP7002 Microprocessor" - depends BR2_TARGET_AVR32 + depends on BR2_TARGET_AVR32 help Atmel AT32AP7002 AVR32 based systems endchoice comment "Development board support" - depends BR2_TARGET_AVR32 + depends on BR2_TARGET_AVR32 choice prompt "Development board support" - depends BR2_TARGET_AVR32 + depends on BR2_TARGET_AVR32 default BR2_TARGET_AVR32_ATSTK1000 help Select the specific AVR32 development board you wish to use. config BR2_TARGET_AVR32_ATSTK1002 bool "Atmel ATSTK1000/2 AVR32 development board support" - depends BR2_TARGET_AT32AP7000 + depends on BR2_TARGET_AT32AP7000 select BR2_PACKAGE_LINUX help The Atmel ATSTK1000 AVR32 Development Board. config BR2_TARGET_AVR32_ATNGW100 bool "Atmel AVR32 network gateway board support" - depends BR2_TARGET_AT32AP7000 + depends on BR2_TARGET_AT32AP7000 select BR2_PACKAGE_LINUX help The Atmel AVR32 Network Gateway Board. config BR2_TARGET_AVR32_ATNGW100_BASE bool "Atmel AVR32 basic network gateway board support" - depends BR2_TARGET_AT32AP7000 + depends on BR2_TARGET_AT32AP7000 select BR2_PACKAGE_LINUX help Very simple configuration for the Atmel AVR32 Network Gateway Board. config BR2_TARGET_AVR32_ATNGW100_EXPANDED bool "Atmel AVR32 expanded network gateway board support" - depends BR2_TARGET_AT32AP7000 + depends on BR2_TARGET_AT32AP7000 select BR2_PACKAGE_LINUX help The Atmel AVR32 Network Gateway Board expanded to include audio, video, and PS/2. diff --git a/target/device/Atmel/Config.in b/target/device/Atmel/Config.in index 676a2da0d..cd710f6df 100644 --- a/target/device/Atmel/Config.in +++ b/target/device/Atmel/Config.in @@ -27,7 +27,7 @@ config BR2_BOARD_NAME config BR2_TARGET_AT91_ADVANCED_INFO bool "Remove work in progress" - depends BR2_TARGET_AT91 + depends on BR2_TARGET_AT91 default y help Atmel AT91 ARM based systems diff --git a/target/device/Atmel/at91bootstrap/Config.in b/target/device/Atmel/at91bootstrap/Config.in index 3e53d3e6b..758e0d0b8 100644 --- a/target/device/Atmel/at91bootstrap/Config.in +++ b/target/device/Atmel/at91bootstrap/Config.in @@ -43,7 +43,7 @@ config BR2_AT91BOOTSTRAP_IMG_SIZE default "0x32000" if BR2_TARGET_AT91BOOT_DATAFLASH || BR2_TARGET_AT91BOOT_DATAFLASHCARD default "0x30000" if BR2_TARGET_AT91BOOT_NANDFLASH default "0x100000" if BR2_TARGET_AT91BOOT_FLASH - depends BR2_TARGET_AT91BOOTSTRAP + depends on BR2_TARGET_AT91BOOTSTRAP help Select the size of your application AT91 Bootstrap will copy this amount from flash to SDRAM -- cgit v1.2.3