diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-29 21:22:23 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-29 21:22:23 +0000 |
| commit | 98175bd43dbfc70f473cca6759bc8a2f4e655734 (patch) | |
| tree | 4fb0f5cefa3728fa2b7d895003f321e164db96a0 /target/device/Arm | |
| parent | 37a085768535229cb0025822df2b0b23c9804edb (diff) | |
- revert part of 20119 (renaming BR2_ARM_.ABI to BR2_.ABI)
Diffstat (limited to 'target/device/Arm')
| -rw-r--r-- | target/device/Arm/Config.in | 8 | ||||
| -rw-r--r-- | target/device/Arm/Makefile.in | 2 | ||||
| -rw-r--r-- | target/device/Arm/integrator926_defconfig | 4 | ||||
| -rw-r--r-- | target/device/Arm/integrator926_huge_defconfig | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/target/device/Arm/Config.in b/target/device/Arm/Config.in index de50fea77..36934ee09 100644 --- a/target/device/Arm/Config.in +++ b/target/device/Arm/Config.in @@ -3,16 +3,15 @@ menuconfig BR2_TARGET_ARM depends BR2_arm default n -if BR2_TARGET_ARM comment "Arm based Device Support" - depends BR2_arm + depends BR2_arm && BR2_TARGET_ARM config BR2_TARGET_ARM_INTEGRATOR_926 bool "Integrator arm926" - depends BR2_arm + depends BR2_arm && BR2_TARGET_ARM default n select BR2_PACKAGE_LINUX - select BR2_EABI + select BR2_ARM_EABI select BR2_KERNEL_HEADERS_2_6_22 select BR2_PTHREADS select BR2_arm926t @@ -20,4 +19,3 @@ config BR2_TARGET_ARM_INTEGRATOR_926 An ARM integrator 926 board for use with qemu. This one has an MMU. -endif diff --git a/target/device/Arm/Makefile.in b/target/device/Arm/Makefile.in index db1b81240..a55389e7f 100644 --- a/target/device/Arm/Makefile.in +++ b/target/device/Arm/Makefile.in @@ -7,7 +7,7 @@ UCLIBC_CONFIG_FILE:=target/device/Arm/uClibc.integrator926.config endif # pin some settings -BR2_EABI:=y +BR2_ARM_EABI:=y BR2_GNU_TARGET_SUFFIX:="linux-uclibcgnueabi" BR2_DEFAULT_KERNEL_HEADERS:="2.6.22.8" endif diff --git a/target/device/Arm/integrator926_defconfig b/target/device/Arm/integrator926_defconfig index 2b4d9c676..1977375eb 100644 --- a/target/device/Arm/integrator926_defconfig +++ b/target/device/Arm/integrator926_defconfig @@ -39,8 +39,8 @@ BR2_arm926t=y # BR2_xscale is not set # BR2_iwmmxt is not set BR2_ARM_TYPE="ARM926T" -# BR2_OABI is not set -BR2_EABI=y +# BR2_ARM_OABI is not set +BR2_ARM_EABI=y # BR2_x86_i386 is not set # BR2_x86_i486 is not set # BR2_x86_i586 is not set diff --git a/target/device/Arm/integrator926_huge_defconfig b/target/device/Arm/integrator926_huge_defconfig index 72c0d0757..43e436ca3 100644 --- a/target/device/Arm/integrator926_huge_defconfig +++ b/target/device/Arm/integrator926_huge_defconfig @@ -39,8 +39,8 @@ BR2_arm926t=y # BR2_xscale is not set # BR2_iwmmxt is not set BR2_ARM_TYPE="ARM926T" -# BR2_OABI is not set -BR2_EABI=y +# BR2_ARM_OABI is not set +BR2_ARM_EABI=y BR2_ARCH="arm" BR2_ENDIAN="LITTLE" BR2_GCC_TARGET_TUNE="arm9tdmi" |