diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-10 08:56:01 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-10 08:56:01 +0200 |
| commit | ebf8644a113a36b163c2e06fe1e081c73f563c3a (patch) | |
| tree | bdb14d7e33d6c2d1b7a803508e0f45eef301fb7a /arch/arm/Kconfig | |
| parent | 7d2f669b94aa42579b5d5775dfb076bce0102e3f (diff) | |
| parent | b219773957d2ee8fedb56f0fcb19288eb72d4867 (diff) | |
| download | u-boot-imx-ebf8644a113a36b163c2e06fe1e081c73f563c3a.zip u-boot-imx-ebf8644a113a36b163c2e06fe1e081c73f563c3a.tar.gz u-boot-imx-ebf8644a113a36b163c2e06fe1e081c73f563c3a.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7365fca..72558b8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -336,6 +336,9 @@ config TARGET_BCM958622HR config ARCH_EXYNOS bool "Samsung EXYNOS" +config ARCH_S5PC1XX + bool "Samsung S5PC1XX" + config ARCH_HIGHBANK bool "Calxeda Highbank" @@ -432,12 +435,6 @@ config RMOBILE config TARGET_CM_FX6 bool "Support cm_fx6" -config TARGET_S5P_GONI - bool "Support s5p_goni" - -config TARGET_SMDKC100 - bool "Support smdkc100" - config TARGET_SOCFPGA_CYCLONE5 bool "Support socfpga_cyclone5" @@ -553,6 +550,8 @@ source "arch/arm/cpu/arm926ejs/orion5x/Kconfig" source "arch/arm/cpu/armv7/rmobile/Kconfig" +source "arch/arm/cpu/armv7/s5pc1xx/Kconfig" + source "arch/arm/cpu/armv7/tegra-common/Kconfig" source "arch/arm/cpu/armv7/uniphier/Kconfig" @@ -661,9 +660,7 @@ source "board/raspberrypi/rpi_b/Kconfig" source "board/ronetix/pm9261/Kconfig" source "board/ronetix/pm9263/Kconfig" source "board/ronetix/pm9g45/Kconfig" -source "board/samsung/goni/Kconfig" source "board/samsung/smdk2410/Kconfig" -source "board/samsung/smdkc100/Kconfig" source "board/sandisk/sansa_fuze_plus/Kconfig" source "board/scb9328/Kconfig" source "board/schulercontrol/sc_sps_1/Kconfig" |