diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-30 11:30:50 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-30 11:30:50 +0200 |
| commit | a2487fe7af50d291be980fd5f01f64286e413df9 (patch) | |
| tree | 1c8596ec83d067e2c0c45714e6cd88756b68eccf /arch/arm | |
| parent | 5bdb74a14bc2acc0645121ec1bafcf13dc75d6fe (diff) | |
| parent | 18b7b5448c78bd351b1e795984b08bea3822a1e2 (diff) | |
| download | barebox-a2487fe7af50d291be980fd5f01f64286e413df9.tar.gz barebox-a2487fe7af50d291be980fd5f01f64286e413df9.tar.xz | |
Merge branch 'for-next/kconfig' into next
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/Kconfig | 5 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 3 |
5 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 77b3e9db64..54fa9b8aa2 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -6,9 +6,6 @@ config HAVE_AT91_UTMI config HAVE_AT91_USB_CLK bool -config HAVE_AT91_PIO4 - bool - config COMMON_CLK_AT91 bool select COMMON_CLK @@ -142,7 +139,6 @@ config SOC_AT91RM9200 bool select CPU_ARM920T select HAS_AT91_ETHER - select HAVE_AT91_DBGU0 select HAVE_AT91_USB_CLK select PINCTRL_AT91 diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index e9228809f0..220b635167 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -19,9 +19,6 @@ menu "OMAP Features" depends on ARCH_OMAP -config MACH_OMAP - bool - config ARCH_OMAP3 bool select CPU_V7 diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 06ad1885a6..fd9084f83e 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -72,7 +72,6 @@ config MACH_MAINSTONE Say Y here if you are using a Mainstone board config MACH_MIOA701 bool "Mitac Mio A701" - select BCH_CONST_PARAMS select PWM select POLLER help diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 3d8fc8ba42..2da875cef0 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -8,11 +8,6 @@ config ARCH_SOCFPGA_XLOAD bool prompt "Build preloader image" -config ARCH_TEXT_BASE - hex - default 0x00100000 if MACH_SOCFPGA_CYCLONE5 - default 0xffe00000 if MACH_SOCFPGA_ARRIA10 - comment "Altera SoCFPGA System-on-Chip" config ARCH_SOCFPGA_CYCLONE5 diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 160732fbef..f144d346b4 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -4,9 +4,6 @@ config ARCH_TEXT_BASE hex default 0x0 -config BOARDINFO - default "" - # --------------------------------------------------------- config ARCH_TEGRA_2x_SOC |