diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
| commit | 8c746628fe6ab2cba89ef440b2895cbf3d67846b (patch) | |
| tree | e1aaf4c57155003560f6dfed9a15dc08259acfcb /arch/arm | |
| parent | 08d86870b2346290e94ea1d604437a1b441850e5 (diff) | |
| parent | 25bffd8a9a1c15a2676b3b128af05c8c66981a5a (diff) | |
| download | barebox-8c746628fe6ab2cba89ef440b2895cbf3d67846b.tar.gz barebox-8c746628fe6ab2cba89ef440b2895cbf3d67846b.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/tqma53_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/tx53stk5_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 3 |
5 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 13f0bd41be..3c9b81ab06 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -109,6 +109,7 @@ config ARCH_MVEBU select MVEBU_MBUS select OFTREE select OF_ADDRESS_PCI + select PINCTRL config ARCH_MXS bool "Freescale i.MX23/28 (mxs) based" @@ -208,6 +209,7 @@ config ARCH_TEGRA select OFTREE select RELOCATABLE select RESET_CONTROLLER + select PINCTRL config ARCH_UEMD bool "RC Module UEMD Platform" diff --git a/arch/arm/configs/tqma53_defconfig b/arch/arm/configs/tqma53_defconfig index f163b7c701..144abbf5fb 100644 --- a/arch/arm/configs/tqma53_defconfig +++ b/arch/arm/configs/tqma53_defconfig @@ -19,7 +19,6 @@ CONFIG_AUTO_COMPLETE=y CONFIG_BLSPEC=y CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/tqma53/env/" CONFIG_DEBUG_INFO=y CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y diff --git a/arch/arm/configs/tx53stk5_defconfig b/arch/arm/configs/tx53stk5_defconfig index fc6a9a69ff..5751623295 100644 --- a/arch/arm/configs/tx53stk5_defconfig +++ b/arch/arm/configs/tx53stk5_defconfig @@ -20,7 +20,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/karo-tx53/env" CONFIG_RESET_SOURCE=y CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 7c51264ce9..8323b66041 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -11,25 +11,21 @@ config ARCH_ARMADA_370 bool select CPU_V7 select CLOCKSOURCE_MVEBU - select PINCTRL_ARMADA_370 config ARCH_ARMADA_XP bool select CPU_V7 select CLOCKSOURCE_MVEBU - select PINCTRL_ARMADA_XP config ARCH_DOVE bool select CPU_V7 select CLOCKSOURCE_ORION - select PINCTRL_DOVE config ARCH_KIRKWOOD bool select CPU_FEROCEON select CLOCKSOURCE_ORION - select PINCTRL_KIRKWOOD # # Armada 370 SoC boards diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 7214ecaf3a..2c69406dfc 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -44,15 +44,12 @@ endchoice config ARCH_TEGRA_2x_SOC bool - select PINCTRL_TEGRA20 config ARCH_TEGRA_3x_SOC bool - select PINCTRL_TEGRA30 config ARCH_TEGRA_124_SOC bool - select PINCTRL_TEGRA30 menu "select Tegra boards to be built" |