diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 0a467f92fda3b52b39c5f80ff6ebfca9135ed1d4..06f1f78d3fb5bcd511b85d014e1253be4f2ccc0a 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -724,9 +724,7 @@ define KernelPackage/booke-wdt SUBMENU:=$(OTHER_MENU) TITLE:=PowerPC Book-E Watchdog Timer DEPENDS:=@(TARGET_mpc85xx||TARGET_ppc40x||TARGET_ppc44x) - KCONFIG:=\ - CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=38 \ - CONFIG_BOOKE_WDT + KCONFIG:=CONFIG_BOOKE_WDT FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/booke_wdt.ko AUTOLOAD:=$(call AutoLoad,50,booke_wdt) endef diff --git a/target/linux/mpc85xx/config-3.3 b/target/linux/mpc85xx/config-3.3 index 56aefb5c0fd76cafa28df78a23e500f5d0ef36c4..51be9d639dd289a6715dd71835b2b2cb5e43e689 100644 --- a/target/linux/mpc85xx/config-3.3 +++ b/target/linux/mpc85xx/config-3.3 @@ -20,6 +20,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_AUDIT_ARCH=y CONFIG_BCMA_POSSIBLE=y CONFIG_BOOKE=y +CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=38 CONFIG_BOUNCE=y CONFIG_CMDLINE="console=ttyS0,115200" CONFIG_CMDLINE_BOOL=y diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default index 269c30ff2ed2ef765b5edc143d0ae16d8713559a..4eb9824c2a6925ffd3375012a63b8412f8a81bad 100644 --- a/target/linux/mpc85xx/config-default +++ b/target/linux/mpc85xx/config-default @@ -20,6 +20,7 @@ CONFIG_AUDIT_ARCH=y # CONFIG_AUTO_IRQ_AFFINITY is not set CONFIG_BKL=y CONFIG_BOOKE=y +CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=38 CONFIG_BOUNCE=y CONFIG_CMDLINE="console=ttyS0,115200" CONFIG_CMDLINE_BOOL=y diff --git a/target/linux/ppc40x/config-3.3 b/target/linux/ppc40x/config-3.3 index 35f47d23f721c815efe8aa8c9c6c0843591c8eb7..0356b49a718938e9ef06be4131b43467fe132f32 100644 --- a/target/linux/ppc40x/config-3.3 +++ b/target/linux/ppc40x/config-3.3 @@ -23,6 +23,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_AUDIT_ARCH=y CONFIG_BCMA_POSSIBLE=y +CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3 CONFIG_BOUNCE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd" diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default index 85edef075da6b4d4181b7dcd2ed69ab43fd2bec8..8575d2b6af67f8df140607b39358cde61eb73d35 100644 --- a/target/linux/ppc44x/config-default +++ b/target/linux/ppc44x/config-default @@ -23,6 +23,7 @@ CONFIG_AUDIT_ARCH=y # CONFIG_BAMBOO is not set CONFIG_BITREVERSE=y CONFIG_BOOKE=y +CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3 CONFIG_BOUNCE=y # CONFIG_BLUESTONE is not set CONFIG_CANYONLANDS=y