diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-06 14:11:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-06 14:11:57 +0200 |
| commit | 497d1c49f4b75a6827bb400513d53a39dc8bb57c (patch) | |
| tree | 3227133463cb942c4d5be45108aab82e79daa98c /arch/arm/Kconfig | |
| parent | 94418c2d0d3d7dbaa6995fb53f00a5d5fc9f4028 (diff) | |
| parent | 4024d9ca11295b63dd2b9b795a8f1019b9bba64a (diff) | |
| download | barebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.gz barebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8a4e1a2b41..3eada5b80f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -73,10 +73,21 @@ config ARCH_S3C24xx select CPU_ARM920T select GENERIC_GPIO +config ARCH_S5PCxx + bool "Samsung S5PC110, S5PV210" + select ARCH_SAMSUNG + select CPU_V7 + select GENERIC_GPIO + config ARCH_VERSATILE bool "ARM Versatile boards (ARM926EJ-S)" select CPU_ARM926T +config ARCH_TEGRA + bool "Nvidia Tegra-based boards" + select CPU_ARM926T + select HAS_DEBUG_LL + endchoice source arch/arm/cpu/Kconfig @@ -90,6 +101,7 @@ source arch/arm/mach-omap/Kconfig source arch/arm/mach-pxa/Kconfig source arch/arm/mach-samsung/Kconfig source arch/arm/mach-versatile/Kconfig +source arch/arm/mach-tegra/Kconfig config ARM_ASM_UNIFIED bool |