"Project Name" needed before "root" file system can be copied.
authorUlf Samuelsson <ulf.samuelsson@atmel.com>
Wed, 26 Sep 2007 06:13:09 +0000 (06:13 -0000)
committerUlf Samuelsson <ulf.samuelsson@atmel.com>
Wed, 26 Sep 2007 06:13:09 +0000 (06:13 -0000)
Put first according to principle of configuration order
Merge root skeleton configuration to one place
- currently in package/busybox/Config.in
- Should maybe have it's own Config.in
gcc ABI configuration moved from toplevel to toolchain/gcc/Config.in

Config.in
package/busybox/Config.in
project/Config.in
target/arch.in
target/device/Config.in
toolchain/gcc/Config.in

index c348dc4b85c2beb0846debb67f38c16e25519600..dc589ff1e615b15e34797daae23d152225be7752 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -10,6 +10,8 @@ config BR2_VERSION
        string
        default "0.10.0-svn"
 
+source "project/Config.in"
+
 source "target/arch.in"
 
 menu "Build options"
index be2306f686d8220a2bd53d711ee7cf534c93b9f2..1574cf2f04027353973cf5c88ab5cbbba741e3d3 100644 (file)
@@ -127,6 +127,8 @@ config BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
          Do not show packages in menuconfig that are potentially provided
          by busybox.
 
+comment "Skeleton configuration"
+
 config BR2_PACKAGE_BUSYBOX_SKELETON
        bool "use minimal target skeleton"
        depends on BR2_PACKAGE_BUSYBOX
@@ -135,6 +137,19 @@ config BR2_PACKAGE_BUSYBOX_SKELETON
          Use a minimal target skeleton. Make sure to select mdev
          which is used to populate /dev/.
 
+config BR2_HOSTNAME
+       string "hostname"
+       default "uclibc"
+       help
+         The hostname string is stored in "/etc/hostname"
+
+config BR2_BANNER
+       string "banner"
+       default "Welcome to the Erik's uClibc development environment."
+       help
+         The banner string is stored in "/etc/issue"
+
+
 #config BR2_PACKAGE_BUSYBOX_INITRAMFS
 #      bool "initramfs perusing busybox"
 #      depends on BR2_PACKAGE_BUSYBOX
index e5927c2e346582c7be76bcc39e409248113e7864..a355623b59a8dbb1f64514925fd43d80671646cf 100644 (file)
@@ -1,4 +1,4 @@
-comment "Project Options"
+menu "Project Options"
 
 config BR2_PROJECT
        string "Project name"
@@ -11,15 +11,4 @@ config BR2_PROJECT
          Older targets may still build in the build_<arch>
          and store binaries in the top directory.
 
-config BR2_HOSTNAME
-       string "hostname"
-       default "uclibc"
-       help
-         The hostname string is stored in "/etc/hostname"
-
-config BR2_BANNER
-       string "banner"
-       default "Welcome to the Erik's uClibc development environment."
-       help
-         The banner string is stored in "/etc/issue"
-
+endmenu
index 7a75044cc9738bc657e139c1fac1643bafbff79d..9d56548bb3f156de2caa3e86cd762835ff9f6a87 100644 (file)
@@ -108,18 +108,6 @@ config BR2_ARM_TYPE
        default ARM_XSCALE      if BR2_xscale
        default ARM_IWMMXT      if BR2_iwmmxt
 
-choice
-       prompt "Target ABI"
-       depends BR2_arm || BR2_armeb
-       default BR2_ARM_OABI
-       help
-         Application Binary Interface to use
-
-config BR2_ARM_OABI
-       bool "OABI"
-config BR2_ARM_EABI
-       bool "EABI"
-endchoice
 
 choice
        prompt "Target Architecture Variant"
@@ -635,24 +623,3 @@ config BR2_GCC_TARGET_ARCH
        default z990            if BR2_s390_z990
        default z9-109          if BR2_s390_z9_109
 
-config BR2_GCC_TARGET_ABI
-       string
-       default apcs-gnu        if BR2_arm_dunno
-       default atpcs           if BR2_arm_dunno
-       default aapcs           if BR2_arm_dunno
-       default aapcs-linux     if BR2_arm_dunno
-       default iwmmxt          if BR2_iwmmxt
-       default 32              if BR2_mipsel && BR2_OABI
-       default n32             if BR2_mipsel && BR2_EABI
-       default o64             if BR2_mips && BR2_OABI
-       default 64              if BR2_mips && BR2_ABI64
-       default eabi            if BR2_mips && BR2_EABI
-       default mmixware        if BR2_mmix && BR2_ABI_native
-       default gnu             if BR2_mmix && !BR2_ABI_native
-       default altivec         if BR2_powerpc && BR2_ABI_altivec
-       default no-altivec      if BR2_powerpc && BR2_ABI_no-altivec
-       default spe             if BR2_powerpc && BR2_ABI_spe
-       default no-spe          if BR2_powerpc && BR2_ABI_no-spe
-       default ibmlongdouble   if BR2_powerpc && BR2_ABI_ibmlongdouble
-       default ieeelongdouble  if BR2_powerpc && BR2_ABI_ieeelongdouble
-
index 3b7fead8b87dc9cb01e8f0f420d51d3cbf491e8c..94d16037f1c0a4eade4d781472382b34e173cad3 100644 (file)
@@ -1,7 +1,5 @@
 menu "Board Support Options"
 
-source "project/Config.in"
-
 comment "Preset Devices"
 
 source "target/device/AMD/Config.in"
index 93c7a4de547ced8970fe5e2cad529d248230d3db..07cea045cedb4059d2fd592f76d4e1c144215037 100644 (file)
@@ -69,6 +69,40 @@ config BR2_GCC_VERSION
        default "4.2.1"     if BR2_GCC_VERSION_4_2_1
        default "4.3"       if BR2_GCC_VERSION_4_3
 
+choice
+       prompt "Target ABI"
+       depends BR2_arm || BR2_armeb
+       default BR2_ARM_OABI
+       help
+         Application Binary Interface to use
+
+config BR2_ARM_OABI
+       bool "OABI"
+config BR2_ARM_EABI
+       bool "EABI"
+endchoice
+
+config BR2_GCC_TARGET_ABI
+       string
+       default apcs-gnu        if BR2_arm_dunno
+       default atpcs           if BR2_arm_dunno
+       default aapcs           if BR2_arm_dunno
+       default aapcs-linux     if BR2_arm_dunno
+       default iwmmxt          if BR2_iwmmxt
+       default 32              if BR2_mipsel && BR2_OABI
+       default n32             if BR2_mipsel && BR2_EABI
+       default o64             if BR2_mips && BR2_OABI
+       default 64              if BR2_mips && BR2_ABI64
+       default eabi            if BR2_mips && BR2_EABI
+       default mmixware        if BR2_mmix && BR2_ABI_native
+       default gnu             if BR2_mmix && !BR2_ABI_native
+       default altivec         if BR2_powerpc && BR2_ABI_altivec
+       default no-altivec      if BR2_powerpc && BR2_ABI_no-altivec
+       default spe             if BR2_powerpc && BR2_ABI_spe
+       default no-spe          if BR2_powerpc && BR2_ABI_no-spe
+       default ibmlongdouble   if BR2_powerpc && BR2_ABI_ibmlongdouble
+       default ieeelongdouble  if BR2_powerpc && BR2_ABI_ieeelongdouble
+
 config BR2_TOOLCHAIN_SYSROOT
        bool "Enable toolchain with --sysroot support"
        depends on BR2_GCC_SUPPORTS_SYSROOT