summaryrefslogtreecommitdiff
path: root/target/device
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-29 17:41:36 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-29 17:41:36 +0000
commit7f44fb1ae26741aaa9ba00d9a33983d0cc3bbced (patch)
treee223ea4eac5fbc1fe18febe155f7e1711e168005 /target/device
parentb3e516ec8d801a8db82e8c19c23fb4cf3cfed750 (diff)
Clean up ARM Ltd BSP
Diffstat (limited to 'target/device')
-rw-r--r--target/device/ARMLTD/Config.in33
-rw-r--r--target/device/ARMLTD/Makefile.in2
-rw-r--r--target/device/ARMLTD/integrator926/integrator926_defconfig (renamed from target/device/ARMLTD/integrator926_defconfig)0
-rw-r--r--target/device/ARMLTD/integrator926/linux-2.6.22.9.config (renamed from target/device/ARMLTD/linux26.integrator926.config)0
-rw-r--r--target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig (renamed from target/device/ARMLTD/integrator926_huge_defconfig)0
-rw-r--r--target/device/ARMLTD/integrator926_huge/linux-2.6.26.8.config (renamed from target/device/ARMLTD/linux26.integrator926_huge.config)0
-rw-r--r--target/device/Config.in1
7 files changed, 29 insertions, 7 deletions
diff --git a/target/device/ARMLTD/Config.in b/target/device/ARMLTD/Config.in
index 6f3cd2d45..b7a5d0d73 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 45703a7da..4994ff5cd 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
index 58fc0b47f..58fc0b47f 100644
--- a/target/device/ARMLTD/integrator926_defconfig
+++ b/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
index c33d5215f..c33d5215f 100644
--- a/target/device/ARMLTD/linux26.integrator926.config
+++ b/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
index d7cb4872c..d7cb4872c 100644
--- a/target/device/ARMLTD/integrator926_huge_defconfig
+++ b/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
index c40f2a3ab..c40f2a3ab 100644
--- a/target/device/ARMLTD/linux26.integrator926_huge.config
+++ b/target/device/ARMLTD/integrator926_huge/linux-2.6.26.8.config
diff --git a/target/device/Config.in b/target/device/Config.in
index b21336404..a366603a7 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"