projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[platform/kernel/u-boot.git]
/
configs
/
bcm963158_ram_defconfig
diff --git
a/configs/bcm963158_ram_defconfig
b/configs/bcm963158_ram_defconfig
index
6e3b688
..
fc55e98
100644
(file)
--- a/
configs/bcm963158_ram_defconfig
+++ b/
configs/bcm963158_ram_defconfig
@@
-36,5
+36,6
@@
CONFIG_DM_SERIAL=y
CONFIG_SERIAL_SEARCH_ALL=y
CONFIG_PL01X_SERIAL=y
CONFIG_SYSRESET=y
-CONFIG_REGEX=y
+CONFIG_SYSRESET_WATCHDOG=y
+CONFIG_WDT_BCM6345=y
# CONFIG_GENERATE_SMBIOS_TABLE is not set