buildroot: s/depends/depends on/

The new kconfig is more strict regarding depends/depends on, so fixup
the tree.

16 files changed, 169 insertions, 169 deletions

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 00624288d..c9b0e469b 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -52,7 +52,7 @@ endchoice
 #
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_arm || BR2_armeb
+	depends on BR2_arm || BR2_armeb
 	default BR2_generic_arm
 	help
 	  Specific CPU variant to use
@@ -112,7 +112,7 @@ config BR2_ARM_TYPE
 
 choice
 	prompt "Target ABI"
-	depends BR2_arm || BR2_armeb
+	depends on BR2_arm || BR2_armeb
 	default BR2_ARM_OABI
 	help
 	  Application Binary Interface to use
@@ -125,7 +125,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_mips || BR2_mipsel
+	depends on BR2_mips || BR2_mipsel
 	default BR2_mips_3 if BR2_mips
 	default BR2_mips_1 if BR2_mipsel
 	help
@@ -157,7 +157,7 @@ endchoice
 
 choice
 	prompt "Target ABI"
-	depends BR2_mips || BR2_mipsel
+	depends on BR2_mips || BR2_mipsel
 	default BR2_MIPS_OABI32 if BR_mips_32 || BR_mips_32r2
 	default BR2_MIPS_ABI32 if BR_mips_64 || BR_mips_64r2
 	help
@@ -167,26 +167,26 @@ config BR2_MIPS_OABI32
 	bool "o32"
 config BR2_MIPS_ABI32
 	bool "n32"
-	depends BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
+	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
 config BR2_MIPS_EABI
 	bool "eabi"
-	depends BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
+	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
 config BR2_MIPS_ABI64
 	bool "n64"
-	depends BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
+	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
 config BR2_MIPS_OABI64
 	bool "o64"
-	depends BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
+	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
 config BR2_MIPS_ABI_none
 	bool "unspecified"
-	depends BR2_mips_16
+	depends on BR2_mips_16
 	help
 	  Unspecified ABI leaves ABI selection blank.
 endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_avr32
+	depends on BR2_avr32
 config BR2_at32ap7000
 	bool "AT32AP7000"
 config BR2_at32ap7001
@@ -198,7 +198,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_sh
+	depends on BR2_sh
 	default BR2_sh4
 	help
 	  Specific CPU variant to use
@@ -223,7 +223,7 @@ endchoice
 #
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_i386
+	depends on BR2_i386
 	default BR2_x86_i386
 	help
 	  Specific CPU variant to use
@@ -280,7 +280,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_x86_64
+	depends on BR2_x86_64
 	default BR2_x86_64_core2
 	help
 	  Specific CPU variant to use
@@ -299,7 +299,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_alpha
+	depends on BR2_alpha
 	default BR2_alpha_21064
 	help
 	  Specific CPU variant to use
@@ -320,7 +320,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_s390
+	depends on BR2_s390
 	default BR2_s390_g5
 	help
 	  Specific CPU variant to use
@@ -339,7 +339,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_sparc
+	depends on BR2_sparc
 	default BR2_sparc_v7
 	help
 	  Specific CPU variant to use
@@ -382,7 +382,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_sparc64
+	depends on BR2_sparc64
 	default BR2_sparc64_v9
 	help
 	  Specific CPU variant to use
@@ -411,7 +411,7 @@ config BR2_SPARC_TYPE
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_ia64
+	depends on BR2_ia64
 	default BR2_ia64_itanium2
 	help
 	  Specific CPU variant to use
@@ -424,7 +424,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_powerpc
+	depends on BR2_powerpc
 	default BR2_generic_powerpc
 	help
 	  Specific CPU variant to use
diff --git a/target/device/AMD/Config.in b/target/device/AMD/Config.in
index d2eb8f673..a636fdae4 100644
--- a/target/device/AMD/Config.in
+++ b/target/device/AMD/Config.in
@@ -1,9 +1,9 @@
 comment "AMD Specific Device Support"
-	depends BR2_mipsel || BR2_mips
+	depends on BR2_mipsel || BR2_mips
 
 config BR2_TARGET_AMD_ALCHEMY
 	bool "Board support for the AMD development boards"
-	depends BR2_mipsel || BR2_mips
+	depends on BR2_mipsel || BR2_mips
 	default n
 	help
 	  AMD Alchemy mips based systems
@@ -11,11 +11,11 @@ config BR2_TARGET_AMD_ALCHEMY
 config BR2_TARGET_AMD_ALCHEMY_DBAU1500
 	bool "AMD Alchemy DBAu1500 Development Board Support"
 	default n
-	depends BR2_TARGET_AMD_ALCHEMY
+	depends on BR2_TARGET_AMD_ALCHEMY
 	select BR2_PACKAGE_LINUX
 	help
 	  The AMD Alchemy DBAu1500 Development Board
 
 comment "Package support"
-	depends BR2_TARGET_AMD_ALCHEMY
+	depends on BR2_TARGET_AMD_ALCHEMY
 
diff --git a/target/device/ARMLTD/Config.in b/target/device/ARMLTD/Config.in
index ffa6a2749..76c92860e 100644
--- a/target/device/ARMLTD/Config.in
+++ b/target/device/ARMLTD/Config.in
@@ -1,14 +1,14 @@
 menuconfig BR2_TARGET_ARMLTD
 	bool "ARM Ltd. Device Support"
-	depends BR2_arm
+	depends on BR2_arm
 	default n
 
 comment "Arm based Device Support"
-	depends BR2_arm && BR2_TARGET_ARMLTD
+	depends on BR2_arm && BR2_TARGET_ARMLTD
 
 config BR2_TARGET_ARM_INTEGRATOR_926
 	bool "Integrator arm926"
-	depends BR2_arm && BR2_TARGET_ARMLTD
+	depends on BR2_arm && BR2_TARGET_ARMLTD
 	default y
 	select BR2_PACKAGE_LINUX
 	select BR2_ARM_EABI
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
diff --git a/target/device/Hitachi/Config.in b/target/device/Hitachi/Config.in
index 8048e8508..60341880a 100644
--- a/target/device/Hitachi/Config.in
+++ b/target/device/Hitachi/Config.in
@@ -1,5 +1,5 @@
 comment "Hitachi ULSI Systems device support"
-	depends BR2_sh
+	depends on BR2_sh
 
 config BR2_TARGET_HITACHI_SE
 	bool "Board support for Solution Engine development boards"
@@ -8,5 +8,5 @@ config BR2_TARGET_HITACHI_SE
 
 config BR2_TARGET_HITACHI_MS7206SE01
 	bool "MS7206SE01 development board support"
-	depends BR2_TARGET_HITACHI_SE && BR2_sh2a_nofpueb
+	depends on BR2_TARGET_HITACHI_SE && BR2_sh2a_nofpueb
 	default n
diff --git a/target/device/Sharp/Config.in b/target/device/Sharp/Config.in
index 6a385c3a9..6c750420f 100644
--- a/target/device/Sharp/Config.in
+++ b/target/device/Sharp/Config.in
@@ -5,11 +5,11 @@ menuconfig BR2_TARGET_SHARP
 
 if BR2_TARGET_SHARP
 comment "Sharp Specific Device Support"
-	depends BR2_arm
+	depends on BR2_arm
  
 config BR2_TARGET_SHARP_LNODE80
 	bool "Board support for the LNode80 development board"
-	depends BR2_arm
+	depends on BR2_arm
 	default n
 	help
 	  Support for the LNode80 LH79520 based device
diff --git a/target/device/Soekris/Config.in b/target/device/Soekris/Config.in
index 925b3e5dd..54cc152a8 100644
--- a/target/device/Soekris/Config.in
+++ b/target/device/Soekris/Config.in
@@ -1,6 +1,6 @@
 menuconfig BR2_TARGET_SOEKRIS
 	bool "Soekris device support"
-	depends BR2_i386
+	depends on BR2_i386
 	default n
 
 if BR2_TARGET_SOEKRIS
@@ -13,7 +13,7 @@ config BR2_TARGET_SOEKRIS_NET4521
 
 config BR2_TARGET_SOEKRIS_NET4801
 	bool "Soekris net4801"
-	depends BR2_i386
+	depends on BR2_i386
 	default n
 	select BR2_PACKAGE_LINUX
 	help
diff --git a/target/device/Via/Config.in b/target/device/Via/Config.in
index 8d7f269fe..036e159bb 100644
--- a/target/device/Via/Config.in
+++ b/target/device/Via/Config.in
@@ -1,6 +1,6 @@
 config BR2_TARGET_VIA_EPIA_MII
 	bool "EPIA MII"
-	depends BR2_i386
+	depends on BR2_i386
 	default n
 	select BR2_PACKAGE_LINUX
 	help
diff --git a/target/device/jp/Config.in b/target/device/jp/Config.in
index ca382c8d5..da2d3e60f 100644
--- a/target/device/jp/Config.in
+++ b/target/device/jp/Config.in
@@ -1,11 +1,11 @@
 config BR2_TARGET_Q5
 	bool "jp-embedded Q5 board support"
 	default n
-	depends BR2_mipsel
+	depends on BR2_mipsel
 	select BR2_PACKAGE_LINUX
 	help
 	  jp-embedded Q5 series MIPS based boards, see http://www.jp-embedded.com for further information.
 
 comment "Package support"
-	depends BR2_TARGET_Q5
+	depends on BR2_TARGET_Q5
 
diff --git a/target/device/valka/Config.in b/target/device/valka/Config.in
index 8bc816e0a..c0663e9aa 100644
--- a/target/device/valka/Config.in
+++ b/target/device/valka/Config.in
@@ -7,13 +7,13 @@ if BR2_TARGET_VALKA
 
 choice
 	prompt "Controller board"
-	depends BR2_TARGET_VALKA
+	depends on BR2_TARGET_VALKA
 	help
 	  Valka Controller Board to build for
 
 config BR2_TARGET_VALKA_V100SC2
 	bool "V100SC2 (Based on NGW100)"
-	depends BR2_TARGET_VALKA
+	depends on BR2_TARGET_VALKA
 	help
 	  Board based on NGW100
 
diff --git a/target/device/x86/Config.in b/target/device/x86/Config.in
index 630795347..2895872eb 100644
--- a/target/device/x86/Config.in
+++ b/target/device/x86/Config.in
@@ -1,6 +1,6 @@
 comment "Generic x86 Device Support"
-	depends BR2_i386
+	depends on BR2_i386
 
 comment "Package support"
-	depends BR2_TARGET_AMD_ALCHEMY
+	depends on BR2_TARGET_AMD_ALCHEMY
 
diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index cd58a4abb..6ea223f89 100644
--- a/target/linux/Config.in.advanced
+++ b/target/linux/Config.in.advanced
@@ -419,13 +419,13 @@ config BR2_PACKAGE_LINUX_USE_KCONFIG
 
 config BR2_PACKAGE_LINUX_USE_DEFCONFIG
 	bool "Run make <board>_defconfig "
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Configure Linux by make <board>_defconfig
 
 config BR2_PACKAGE_LINUX_USE_XCONFIG
 	bool "Run make ARCH=$(ARCH) [xconfig|menuconfig] before build"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Configure Linux by make xconfig
 endchoice
@@ -478,31 +478,31 @@ choice
 
 config BR2_LINUX_BIN_BZIMAGE
 	bool "bzImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_BIN_UIMAGE
 	bool "uImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build uImage binary
 
 config BR2_LINUX_BIN_VMLINUX
 	bool "vmlinux"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build vmlinux binary
 
 config BR2_LINUX_BIN_ZIMAGE
 	bool "zImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_BIN_CUSTOM
 	bool "<custom> Linux binary"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build custom Linux binary format
 endchoice
@@ -544,7 +544,7 @@ menu "Destinations for linux kernel binaries"
 
 config BR2_LINUX_COPYTO_ROOTFS
 	bool "Copy kernel to root file system"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	default n
 	help
 	  Copy kernel to <root>/boot directory
diff --git a/target/linux/Config.in.experimental b/target/linux/Config.in.experimental
index 92ffc9e4f..a7f758659 100644
--- a/target/linux/Config.in.experimental
+++ b/target/linux/Config.in.experimental
@@ -10,115 +10,115 @@ choice
 
 config BR2_LINUX_2_6_SNAP
 	bool "The latest snapshot for the stable Linux kernel"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.x-git#
 
 config BR2_LINUX_2_6_MM
 	bool "With latest -mm patch for the stable Linux kernel"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.x-rc#-mm#
 
 config BR2_LINUX_2_6_STABLE
 	bool "The latest stable Linux kernel (2.6.22.1)"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.22.1
 
 config BR2_LINUX_2_6_22_10
 	bool "Linux 2.6.22.10"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.22.10
 
 config BR2_LINUX_2_6_22_1
 	bool "Linux 2.6.22.1"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.22.1
 
 config BR2_LINUX_2_6_22
 	bool "Linux 2.6.22"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.22
 
 config BR2_LINUX_2_6_21_6
 	bool "Linux 2.6.21.6"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.21.6
 
 config BR2_LINUX_2_6_21_1
 	bool "Linux 2.6.21.1"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.21.1
 
 config BR2_LINUX_2_6_21
 	bool "Linux 2.6.21"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.21
 
 config BR2_LINUX_2_6_20_4
 	bool "Linux 2.6.20.4"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.20.4
 
 config BR2_LINUX_2_6_20
 	bool "Linux 2.6.20"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.20
 
 config BR2_LINUX_2_6_19_2
 	bool "Linux 2.6.19.2"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_2_6_19
 	bool "Linux 2.6.19"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19
 
 config BR2_LINUX_2_6_18
 	bool "Linux 2.6.18"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.18
 
 config BR2_LINUX_2_6_17
 	bool "Linux 2.6.17"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.17
 
 config BR2_LINUX_2_6_16
 	bool "Linux 2.6.16"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.16
 
 config BR2_LINUX_2_6_15
 	bool "Linux 2.6.15"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.15
 
 config BR2_LINUX_2_6_23
 	bool "Linux 2.6.23"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.23
 
 config BR2_LINUX_CUSTOM
 	bool "Linux <custom> version"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux <your selection>
 
@@ -228,13 +228,13 @@ config BR2_PACKAGE_LINUX_USE_KCONFIG
 
 config BR2_LINUX26_DEFCONFIG
 	bool "Run make <board>_defconfig "
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Configure Linux by make <board>_defconfig
 
 config BR2_LINUX_CUSTOMIZE
 	bool "Run make ARCH=$(ARCH) xconfig before build"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Configure Linux by make xconfig
 endchoice
@@ -259,31 +259,31 @@ choice
 
 config BR2_LINUX_BIN_BZIMAGE
 	bool "bzImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_BIN_UIMAGE
 	bool "uImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build uImage binary
 
 config BR2_LINUX_BIN_VMLINUX
 	bool "vmlinux"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build vmlinux binary
 
 config BR2_LINUX_BIN_ZIMAGE
 	bool "zImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_BIN_CUSTOM
 	bool "<custom> Linux binary"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build custom Linux binary format
 endchoice
@@ -326,7 +326,7 @@ comment "Destinations for linux kernel binaries"
 
 config BR2_LINUX_IN_ROOTFS
 	bool "Copy kernel to root file system"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	default n
 	help
 	  Copy kernel to <root>/boot directory
@@ -338,7 +338,7 @@ menuconfig BR2_LINUX_COPY
 
 config BR2_LINUX_COPYTO
 	string "also copy the image to..."
-	depends BR2_LINUX_COPY
+	depends on BR2_LINUX_COPY
 	default "/tftpboot"
 	help
 	  Copy kernel to secondary location