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 | 70322ba3d1a897e1ff1c5d8c117a332815e7649e (patch) | |
| tree | 4a14192461523cfcc8ec7b9dd467da318dc6a269 | |
| parent | 880de62f91bcffe7f1c7f16c9463e10853fa2524 (diff) | |
| download | mtk-20170518-70322ba3d1a897e1ff1c5d8c117a332815e7649e.zip mtk-20170518-70322ba3d1a897e1ff1c5d8c117a332815e7649e.tar.gz mtk-20170518-70322ba3d1a897e1ff1c5d8c117a332815e7649e.tar.bz2 | |
move CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT to the target configs
SVN-Revision: 31547
| -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 0a467f9..06f1f78 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 56aefb5..51be9d6 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 269c30f..4eb9824 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 35f47d2..0356b49 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 85edef0..8575d2b 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 |