Browse Source

arch/Config.in*: fix attributes order

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Ricardo Martincoski 7 years ago
parent
commit
7e26b8886b

+ 1 - 1
arch/Config.in

@@ -376,8 +376,8 @@ endchoice
 # Set up flat binary type
 # Set up flat binary type
 choice
 choice
 	prompt "FLAT Binary type"
 	prompt "FLAT Binary type"
-	depends on BR2_BINFMT_FLAT
 	default BR2_BINFMT_FLAT_ONE
 	default BR2_BINFMT_FLAT_ONE
+	depends on BR2_BINFMT_FLAT
 
 
 config BR2_BINFMT_FLAT_ONE
 config BR2_BINFMT_FLAT_ONE
 	bool "One memory region"
 	bool "One memory region"

+ 1 - 1
arch/Config.in.arc

@@ -1,7 +1,7 @@
 choice
 choice
 	prompt "Target CPU"
 	prompt "Target CPU"
-	depends on BR2_arc
 	default BR2_arc770d
 	default BR2_arc770d
+	depends on BR2_arc
 	help
 	help
 	    Specific CPU to use
 	    Specific CPU to use
 
 

+ 2 - 2
arch/Config.in.arm

@@ -456,9 +456,9 @@ config BR2_ARM_ENABLE_VFP
 
 
 choice
 choice
 	prompt "Target ABI"
 	prompt "Target ABI"
-	depends on BR2_arm || BR2_armeb
 	default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_VFPV2
 	default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_VFPV2
 	default BR2_ARM_EABI
 	default BR2_ARM_EABI
+	depends on BR2_arm || BR2_armeb
 	help
 	help
 	  Application Binary Interface to use. The Application Binary
 	  Application Binary Interface to use. The Application Binary
 	  Interface describes the calling conventions (how arguments
 	  Interface describes the calling conventions (how arguments
@@ -746,7 +746,6 @@ config BR2_GCC_TARGET_ABI
 	default "lp64"		if BR2_aarch64 || BR2_aarch64_be
 	default "lp64"		if BR2_aarch64 || BR2_aarch64_be
 
 
 config BR2_GCC_TARGET_FPU
 config BR2_GCC_TARGET_FPU
-	depends on BR2_arm || BR2_armeb
 	default "vfp"		if BR2_ARM_FPU_VFPV2
 	default "vfp"		if BR2_ARM_FPU_VFPV2
 	default "vfpv3"		if BR2_ARM_FPU_VFPV3
 	default "vfpv3"		if BR2_ARM_FPU_VFPV3
 	default "vfpv3-d16"	if BR2_ARM_FPU_VFPV3D16
 	default "vfpv3-d16"	if BR2_ARM_FPU_VFPV3D16
@@ -756,6 +755,7 @@ config BR2_GCC_TARGET_FPU
 	default "neon-vfpv4"	if BR2_ARM_FPU_NEON_VFPV4
 	default "neon-vfpv4"	if BR2_ARM_FPU_NEON_VFPV4
 	default "fp-armv8"	if BR2_ARM_FPU_FP_ARMV8
 	default "fp-armv8"	if BR2_ARM_FPU_FP_ARMV8
 	default "neon-fp-armv8"	if BR2_ARM_FPU_NEON_FP_ARMV8
 	default "neon-fp-armv8"	if BR2_ARM_FPU_NEON_FP_ARMV8
+	depends on BR2_arm || BR2_armeb
 
 
 config BR2_GCC_TARGET_FLOAT_ABI
 config BR2_GCC_TARGET_FLOAT_ABI
 	default "soft"		if BR2_ARM_SOFT_FLOAT
 	default "soft"		if BR2_ARM_SOFT_FLOAT

+ 1 - 1
arch/Config.in.bfin

@@ -1,7 +1,7 @@
 choice
 choice
 	prompt "Target CPU"
 	prompt "Target CPU"
-	depends on BR2_bfin
 	default BR2_bf532
 	default BR2_bf532
+	depends on BR2_bfin
 	help
 	help
 	  Specify target CPU
 	  Specify target CPU
 config BR2_bf512
 config BR2_bf512

+ 1 - 1
arch/Config.in.m68k

@@ -15,8 +15,8 @@ config BR2_m68k_cf
 # coldfire variants will be added later
 # coldfire variants will be added later
 choice
 choice
 	prompt "Target CPU"
 	prompt "Target CPU"
-	depends on BR2_m68k
 	default BR2_m68k_68040
 	default BR2_m68k_68040
+	depends on BR2_m68k
 	help
 	help
 	  Specific CPU variant to use
 	  Specific CPU variant to use
 
 

+ 4 - 4
arch/Config.in.mips

@@ -28,9 +28,9 @@ config BR2_MIPS_CPU_MIPS64R6
 
 
 choice
 choice
 	prompt "Target Architecture Variant"
 	prompt "Target Architecture Variant"
-	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	default BR2_mips_32 if BR2_mips || BR2_mipsel
 	default BR2_mips_32 if BR2_mips || BR2_mipsel
 	default BR2_mips_64 if BR2_mips64 || BR2_mips64el
 	default BR2_mips_64 if BR2_mips64 || BR2_mips64el
+	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	help
 	help
 	  Specific CPU variant to use
 	  Specific CPU variant to use
 
 
@@ -118,8 +118,8 @@ endchoice
 
 
 choice
 choice
 	prompt "Target ABI"
 	prompt "Target ABI"
-	depends on BR2_mips64 || BR2_mips64el
 	default BR2_MIPS_NABI32
 	default BR2_MIPS_NABI32
+	depends on BR2_mips64 || BR2_mips64el
 
 
 	help
 	help
 	  Application Binary Interface to use
 	  Application Binary Interface to use
@@ -145,8 +145,8 @@ config BR2_MIPS_SOFT_FLOAT
 
 
 choice
 choice
 	prompt "FP mode"
 	prompt "FP mode"
-	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
 	default BR2_MIPS_FP32_MODE_XX
 	default BR2_MIPS_FP32_MODE_XX
+	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
 	help
 	help
 	  MIPS32 supports different FP modes (32,xx,64). Information about FP
 	  MIPS32 supports different FP modes (32,xx,64). Information about FP
 	  modes can be found here:
 	  modes can be found here:
@@ -180,8 +180,8 @@ config BR2_MIPS_NAN_2008
 
 
 choice
 choice
 	prompt "Target NaN"
 	prompt "Target NaN"
-	depends on BR2_mips_32r5 || BR2_mips_64r5
 	default BR2_MIPS_ENABLE_NAN_2008
 	default BR2_MIPS_ENABLE_NAN_2008
+	depends on BR2_mips_32r5 || BR2_mips_64r5
 	help
 	help
 	  MIPS supports two different NaN encodings, legacy and 2008.
 	  MIPS supports two different NaN encodings, legacy and 2008.
 	  Information about MIPS NaN encodings can be found here:
 	  Information about MIPS NaN encodings can be found here:

+ 2 - 2
arch/Config.in.powerpc

@@ -71,12 +71,12 @@ config BR2_powerpc_740
 	depends on !BR2_ARCH_IS_64
 	depends on !BR2_ARCH_IS_64
 config BR2_powerpc_7400
 config BR2_powerpc_7400
 	bool "7400"
 	bool "7400"
-	select BR2_POWERPC_CPU_HAS_ALTIVEC
 	depends on !BR2_ARCH_IS_64
 	depends on !BR2_ARCH_IS_64
+	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_7450
 config BR2_powerpc_7450
 	bool "7450"
 	bool "7450"
-	select BR2_POWERPC_CPU_HAS_ALTIVEC
 	depends on !BR2_ARCH_IS_64
 	depends on !BR2_ARCH_IS_64
+	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_750
 config BR2_powerpc_750
 	bool "750"
 	bool "750"
 	depends on !BR2_ARCH_IS_64
 	depends on !BR2_ARCH_IS_64

+ 1 - 1
arch/Config.in.sh

@@ -1,7 +1,7 @@
 choice
 choice
 	prompt "Target Architecture Variant"
 	prompt "Target Architecture Variant"
-	depends on BR2_sh
 	default BR2_sh4
 	default BR2_sh4
+	depends on BR2_sh
 	help
 	help
 	  Specific CPU variant to use
 	  Specific CPU variant to use
 
 

+ 1 - 1
arch/Config.in.sparc

@@ -1,8 +1,8 @@
 choice
 choice
 	prompt "Target Architecture Variant"
 	prompt "Target Architecture Variant"
-	depends on BR2_sparc || BR2_sparc64
 	default BR2_sparc_v8 if BR2_sparc
 	default BR2_sparc_v8 if BR2_sparc
 	default BR2_sparc_v9 if BR2_sparc64
 	default BR2_sparc_v9 if BR2_sparc64
+	depends on BR2_sparc || BR2_sparc64
 	help
 	help
 	  Specific CPU variant to use
 	  Specific CPU variant to use
 
 

+ 15 - 15
arch/Config.in.x86

@@ -20,8 +20,8 @@ config BR2_X86_CPU_HAS_AVX2
 
 
 choice
 choice
 	prompt "Target Architecture Variant"
 	prompt "Target Architecture Variant"
-	depends on BR2_i386 || BR2_x86_64
 	default BR2_x86_i586 if BR2_i386
 	default BR2_x86_i586 if BR2_i386
+	depends on BR2_i386 || BR2_x86_64
 	help
 	help
 	  Specific CPU variant to use
 	  Specific CPU variant to use
 
 
@@ -50,35 +50,35 @@ config BR2_x86_pentiumpro
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
 config BR2_x86_pentium_mmx
 config BR2_x86_pentium_mmx
 	bool "pentium MMX"
 	bool "pentium MMX"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_pentium_m
 config BR2_x86_pentium_m
 	bool "pentium mobile"
 	bool "pentium mobile"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_pentium2
 config BR2_x86_pentium2
 	bool "pentium2"
 	bool "pentium2"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_pentium3
 config BR2_x86_pentium3
 	bool "pentium3"
 	bool "pentium3"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_pentium4
 config BR2_x86_pentium4
 	bool "pentium4"
 	bool "pentium4"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE2
-	depends on !BR2_x86_64
 config BR2_x86_prescott
 config BR2_x86_prescott
 	bool "prescott"
 	bool "prescott"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
 	select BR2_X86_CPU_HAS_SSE3
-	depends on !BR2_x86_64
 config BR2_x86_nocona
 config BR2_x86_nocona
 	bool "nocona"
 	bool "nocona"
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_MMX
@@ -140,21 +140,21 @@ config BR2_x86_silvermont
 	select BR2_X86_CPU_HAS_SSE42
 	select BR2_X86_CPU_HAS_SSE42
 config BR2_x86_k6
 config BR2_x86_k6
 	bool "k6"
 	bool "k6"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_k6_2
 config BR2_x86_k6_2
 	bool "k6-2"
 	bool "k6-2"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_athlon
 config BR2_x86_athlon
 	bool "athlon"
 	bool "athlon"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_athlon_4
 config BR2_x86_athlon_4
 	bool "athlon-4"
 	bool "athlon-4"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_opteron
 config BR2_x86_opteron
 	bool "opteron"
 	bool "opteron"
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_MMX
@@ -198,21 +198,21 @@ config BR2_x86_geode
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
 config BR2_x86_c3
 config BR2_x86_c3
 	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
 	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_c32
 config BR2_x86_c32
 	bool "Via C3-2 (Nehemiah cores)"
 	bool "Via C3-2 (Nehemiah cores)"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_winchip_c6
 config BR2_x86_winchip_c6
 	bool "IDT Winchip C6"
 	bool "IDT Winchip C6"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_winchip2
 config BR2_x86_winchip2
 	bool "IDT Winchip 2"
 	bool "IDT Winchip 2"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 endchoice
 endchoice
 
 
 config BR2_ARCH
 config BR2_ARCH

+ 4 - 4
arch/Config.in.xtensa

@@ -1,15 +1,15 @@
 choice
 choice
 	prompt "Target Architecture Variant"
 	prompt "Target Architecture Variant"
-	depends on BR2_xtensa
 	default BR2_xtensa_fsf
 	default BR2_xtensa_fsf
+	depends on BR2_xtensa
 
 
 config BR2_XTENSA_CUSTOM
 config BR2_XTENSA_CUSTOM
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 	bool "Custom Xtensa processor configuration"
 	bool "Custom Xtensa processor configuration"
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 
 config BR2_xtensa_fsf
 config BR2_xtensa_fsf
-	select BR2_ARCH_HAS_MMU_MANDATORY
 	bool "fsf - Default configuration"
 	bool "fsf - Default configuration"
+	select BR2_ARCH_HAS_MMU_MANDATORY
 
 
 endchoice
 endchoice
 
 
@@ -30,8 +30,8 @@ config BR2_XTENSA_OVERLAY_FILE
 
 
 choice
 choice
 	prompt "Target Architecture Endianness"
 	prompt "Target Architecture Endianness"
-	depends on BR2_XTENSA_CUSTOM
 	default BR2_XTENSA_LITTLE_ENDIAN
 	default BR2_XTENSA_LITTLE_ENDIAN
+	depends on BR2_XTENSA_CUSTOM
 
 
 config BR2_XTENSA_LITTLE_ENDIAN
 config BR2_XTENSA_LITTLE_ENDIAN
 	bool "Little endian"
 	bool "Little endian"