Skip to content

Commit

Permalink
Merge tag 'stm32-defconfig-for-v4.6-1' of git://git.kernel.org/pub/sc…
Browse files Browse the repository at this point in the history
…m/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
  • Loading branch information
Arnd Bergmann committed Mar 2, 2016
2 parents 4a6f791 + 9fe5bf9 commit fa54ae1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/configs/dram_0x00000000.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_DRAM_BASE=0x00000000
1 change: 1 addition & 0 deletions arch/arm/configs/stm32_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fa54ae1

Please sign in to comment.