diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:20:32 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:20:32 +0100 |
| commit | fa54ae137a7357310fa47a19fe3ec476b266efea (patch) | |
| tree | e20d3c86979e41dc301c6e507c04f2f34bc1351b | |
| parent | 4a6f791c359a78535553ccf060615622d27b1ce1 (diff) | |
| parent | 9fe5bf92c30a89631eb1fafe0d9b18e2ba331ebb (diff) | |
| download | linux-fa54ae137a7357310fa47a19fe3ec476b266efea.tar.bz2 | |
Merge tag 'stm32-defconfig-for-v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32 into next/defconfig
Merge "STM32 defconfig updates for v4.6 #1" from Maxime Coquelin:
Highlights:
-----------
- Enable GPIO led driver in stm32_defconfig
- Introduce a config fragment to override RAM base address
* tag 'stm32-defconfig-for-v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32:
ARM: configs: Add new config fragment to change RAM start point
ARM: config: Enable GPIO Led driver in stm32_defconfig
| -rw-r--r-- | arch/arm/configs/dram_0x00000000.config | 1 | ||||
| -rw-r--r-- | arch/arm/configs/stm32_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/dram_0x00000000.config b/arch/arm/configs/dram_0x00000000.config new file mode 100644 index 000000000000..db96dcb420ce --- /dev/null +++ b/arch/arm/configs/dram_0x00000000.config @@ -0,0 +1 @@ +CONFIG_DRAM_BASE=0x00000000 diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig index ec5250547d14..1e5ec2a0e4cf 100644 --- a/arch/arm/configs/stm32_defconfig +++ b/arch/arm/configs/stm32_defconfig @@ -52,6 +52,7 @@ CONFIG_SERIAL_STM32_CONSOLE=y # CONFIG_USB_SUPPORT is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_DMADEVICES=y |