diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-01 08:00:25 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-01 08:00:25 +0000 |
| commit | 0be01c2456f7e3a1752aa243aee1d6d257d01502 (patch) | |
| tree | b94bc983596f720ae87c59dc4743fc1d33e4f484 | |
| parent | 9d2b3add2a5d7fce77952c77332101b53640a3a4 (diff) | |
| download | master-187ad058-0be01c2456f7e3a1752aa243aee1d6d257d01502.tar.gz master-187ad058-0be01c2456f7e3a1752aa243aee1d6d257d01502.tar.bz2 master-187ad058-0be01c2456f7e3a1752aa243aee1d6d257d01502.zip | |
move CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT to the target configs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31547 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/modules/other.mk | 4 | ||||
| -rw-r--r-- | target/linux/mpc85xx/config-3.3 | 1 | ||||
| -rw-r--r-- | target/linux/mpc85xx/config-default | 1 | ||||
| -rw-r--r-- | target/linux/ppc40x/config-3.3 | 1 | ||||
| -rw-r--r-- | target/linux/ppc44x/config-default | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 0a467f92fd..06f1f78d3f 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 56aefb5c0f..51be9d639d 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 269c30ff2e..4eb9824c2a 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 35f47d23f7..0356b49a71 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 85edef075d..8575d2b6af 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 |