diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:00 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:00 +0200 |
| commit | 41c344979d5d0484dfc0d50ab029d0673b7cd8e7 (patch) | |
| tree | c55b9eb7feb36669a47d20f72e82effe7c677705 /arch/arm/Kconfig | |
| parent | 5b2d69d78c286cea48a49eb2c77cd8e4b790ac4b (diff) | |
| parent | 3e4a0405455f66fbae0a98dc1faee5c7c39f17a2 (diff) | |
| download | barebox-41c344979d5d0484dfc0d50ab029d0673b7cd8e7.tar.gz barebox-41c344979d5d0484dfc0d50ab029d0673b7cd8e7.tar.xz | |
Merge branch 'for-next/arm'
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b227bb78b6..349ad33909 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -25,20 +25,6 @@ config TEXT_BASE menu "System Type" -config BUILTIN_DTB - bool "link a DTB into the barebox image" - depends on OFTREE - depends on !HAVE_PBL_MULTI_IMAGES - -config BUILTIN_DTB_NAME - string "DTB to build into the barebox image" - depends on BUILTIN_DTB - default "canon-a1100" if MACH_CANON_A1100 - default "imx51-genesi-efika-sb" if MACH_EFIKA_MX_SMARTBOOK - default "versatile-pb" if ARCH_VERSATILE_PB - default "virt2real" if MACH_VIRT2REAL - default "module-mb7707" if MACH_MB7707 - choice prompt "ARM system type" @@ -145,10 +131,6 @@ config ARCH_MXS select CLKDEV_LOOKUP select HAS_DEBUG_LL -config ARCH_NETX - bool "Hilscher NetX based" - select CPU_ARM926T - config ARCH_NOMADIK bool "STMicroelectronics Nomadik" select CPU_ARM926T @@ -298,7 +280,6 @@ source "arch/arm/mach-imx/Kconfig" source "arch/arm/mach-layerscape/Kconfig" source "arch/arm/mach-mxs/Kconfig" source "arch/arm/mach-mvebu/Kconfig" -source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-nomadik/Kconfig" source "arch/arm/mach-omap/Kconfig" source "arch/arm/mach-pxa/Kconfig" |