From 7f44fb1ae26741aaa9ba00d9a33983d0cc3bbced Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Thu, 29 Jan 2009 17:41:36 +0000 Subject: [PATCH] Clean up ARM Ltd BSP --- target/device/ARMLTD/Config.in | 33 +++++++++++++++---- target/device/ARMLTD/Makefile.in | 2 +- .../integrator926_defconfig | 0 .../linux-2.6.22.9.config} | 0 .../integrator926_huge_defconfig | 0 .../linux-2.6.26.8.config} | 0 target/device/Config.in | 1 + 7 files changed, 29 insertions(+), 7 deletions(-) rename target/device/ARMLTD/{ => integrator926}/integrator926_defconfig (100%) rename target/device/ARMLTD/{linux26.integrator926.config => integrator926/linux-2.6.22.9.config} (100%) rename target/device/ARMLTD/{ => integrator926_huge}/integrator926_huge_defconfig (100%) rename target/device/ARMLTD/{linux26.integrator926_huge.config => integrator926_huge/linux-2.6.26.8.config} (100%) diff --git a/target/device/ARMLTD/Config.in b/target/device/ARMLTD/Config.in index 6f3cd2d455..b7a5d0d735 100644 --- a/target/device/ARMLTD/Config.in +++ b/target/device/ARMLTD/Config.in @@ -5,16 +5,37 @@ menuconfig BR2_TARGET_ARMLTD comment "Arm based Device Support" depends on BR2_arm && BR2_TARGET_ARMLTD + +if BR2_TARGET_ARMLTD + +choice + prompt "Controller board" + help + ARM Ltd. Controller Board to build for + config BR2_TARGET_ARM_INTEGRATOR_926 bool "Integrator arm926" depends on BR2_arm && BR2_TARGET_ARMLTD default y - select BR2_PACKAGE_LINUX select BR2_ARM_EABI - select BR2_KERNEL_HEADERS_2_6_22 - select BR2_PTHREADS select BR2_arm926t - help - An ARM integrator 926 board for use with qemu. - This one has an MMU. +config BR2_TARGET_ARM_INTEGRATOR_926_HUGE + bool "Integrator arm926 (Huge)" + depends on BR2_arm && BR2_TARGET_ARMLTD + default y + select BR2_ARM_EABI + select BR2_arm926t + +endchoice + +config BR2_BOARD_NAME + string + default "integrator926" if BR2_TARGET_ARM_INTEGRATOR_926 + default "integrator926_huge" if BR2_TARGET_ARM_INTEGRATOR_926 + +config BR2_BOARD_PATH + string "Board Path" + default "target/device/ARMLTD/$(BR2_BOARD_NAME)" + +endif diff --git a/target/device/ARMLTD/Makefile.in b/target/device/ARMLTD/Makefile.in index 45703a7daa..4994ff5cdf 100644 --- a/target/device/ARMLTD/Makefile.in +++ b/target/device/ARMLTD/Makefile.in @@ -3,7 +3,7 @@ LINUX26_KCONFIG:=target/device/Arm/linux26.integrator926.config TARGETS+=linux26 ifndef UCLIBC_CONFIG_FILE -UCLIBC_CONFIG_FILE:=target/device/Arm/uClibc.integrator926.config +UCLIBC_CONFIG_FILE:=target/device/ARM/uClibc.integrator926.config endif # pin some settings diff --git a/target/device/ARMLTD/integrator926_defconfig b/target/device/ARMLTD/integrator926/integrator926_defconfig similarity index 100% rename from target/device/ARMLTD/integrator926_defconfig rename to target/device/ARMLTD/integrator926/integrator926_defconfig diff --git a/target/device/ARMLTD/linux26.integrator926.config b/target/device/ARMLTD/integrator926/linux-2.6.22.9.config similarity index 100% rename from target/device/ARMLTD/linux26.integrator926.config rename to target/device/ARMLTD/integrator926/linux-2.6.22.9.config diff --git a/target/device/ARMLTD/integrator926_huge_defconfig b/target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig similarity index 100% rename from target/device/ARMLTD/integrator926_huge_defconfig rename to target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig diff --git a/target/device/ARMLTD/linux26.integrator926_huge.config b/target/device/ARMLTD/integrator926_huge/linux-2.6.26.8.config similarity index 100% rename from target/device/ARMLTD/linux26.integrator926_huge.config rename to target/device/ARMLTD/integrator926_huge/linux-2.6.26.8.config diff --git a/target/device/Config.in b/target/device/Config.in index b213364044..a366603a74 100644 --- a/target/device/Config.in +++ b/target/device/Config.in @@ -11,6 +11,7 @@ source "target/device/KwikByte/Config.in" source "target/device/valka/Config.in" comment "Generic Architecture support" + depends on BR2_i386 source "target/device/x86/Config.in" -- 2.30.2