diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:34 +0100 |
| commit | e809777b9539405f2e74ea39849c57b1a65a2f02 (patch) | |
| tree | 57c5362707bf885a2b77d6e85e59b94a02fdf9e2 /arch/arm/configs | |
| parent | 1d8493e63b13954cb16d0304285271dfac208758 (diff) | |
| parent | 48921a46eb70e369cec41c76e5e54baa55980cd0 (diff) | |
| download | barebox-e809777b9539405f2e74ea39849c57b1a65a2f02.tar.gz barebox-e809777b9539405f2e74ea39849c57b1a65a2f02.tar.xz | |
Merge branch 'for-next/am335x'
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/am335x_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/am335x_defconfig b/arch/arm/configs/am335x_defconfig index 9563865065..7cf48b841a 100644 --- a/arch/arm/configs/am335x_defconfig +++ b/arch/arm/configs/am335x_defconfig @@ -75,9 +75,11 @@ CONFIG_CMD_FLASH=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_LED=y +CONFIG_CMD_NANDTEST=y CONFIG_CMD_SPI=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_USBGADGET=y +CONFIG_CMD_WD=y CONFIG_CMD_BAREBOX_UPDATE=y CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y @@ -123,6 +125,8 @@ CONFIG_LED_GPIO=y CONFIG_LED_GPIO_OF=y CONFIG_LED_TRIGGERS=y CONFIG_EEPROM_AT24=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_OMAP=y CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_PINCTRL_SINGLE=y CONFIG_BUS_OMAP_GPMC=y |