On Thursday, July 14, 2016 12:25:58 PM CEST Felix Fietkau wrote:
> On 2016-07-13 21:23, Christian Lamparter wrote:
> > From: Chris Blake <chrisrblak...@gmail.com>
> >
> > This adds a new target for PowerPC APM82181 and APM82161
> > (464-based) boards, as well as adds support for the booke-wdt
> > watchdog package.
> >
> > Signed-off-by: Chris Blake <chrisrblak...@gmail.com>
> > ---
> > [...]
> > diff --git a/package/kernel/linux/modules/other.mk
> > b/package/kernel/linux/modules/other.mk
> > index a1fce48..ee1ee06 100644
> > --- a/package/kernel/linux/modules/other.mk
> > +++ b/package/kernel/linux/modules/other.mk
> > @@ -517,7 +517,7 @@ $(eval $(call KernelPackage,wdt-orion))
> > define KernelPackage/booke-wdt
> > SUBMENU:=$(OTHER_MENU)
> > TITLE:=PowerPC Book-E Watchdog Timer
> > - DEPENDS:=@(TARGET_mpc85xx||TARGET_ppc40x||TARGET_ppc44x)
> > + DEPENDS:=@(TARGET_apm821xx||TARGET_mpc85xx||TARGET_ppc40x||TARGET_ppc44x)
> > KCONFIG:=CONFIG_BOOKE_WDT
> > FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/booke_wdt.ko
> > AUTOLOAD:=$(call AutoLoad,50,booke_wdt,1)
> Is there any reason to keep this as module? Unless there's a good reason
> to do it this way, I would like to make this built-in in the kernel
> config on all relevant targets and get rid of the kmod package.
Probably not [0]. I've made a patch which removes the module and
enables the watchdog in the kernel configs for the affected boards.
Regards,
Christian
[0] One issue I can think of: limited "kernel image" space in the
mtd partition. The only apm821xx board which could develop a problem
would be the WNDR4700. Netgear's uboot has fixed the kernel partition
to 2M and the lzma -9 compressed kernel image with 4.4.15 is 1.5M.
The MR24 has proper ubi support in the bootloader, so the kernel can
be as big as needed. For the WD MyBook Live Series this isn't a issue
either since the kernel is loaded from the HDD (boot partition, still
there is plenty of space there).
---
>From a7aaadfe488d806efe1f3aa58f45fe8c2afa3423 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunk...@gmail.com>
Date: Thu, 14 Jul 2016 16:22:51 +0200
Subject: [PATCH] ppc4xx: remove booke-wdt watchdog package
This patch gets rid of the booke watchdog kmod package.
Instead the affected boards will enable it in their
kernel configs.
Signed-off-by: Christian Lamparter <chunk...@gmail.com>
---
package/kernel/linux/modules/other.mk | 16 ----------------
target/linux/apm821xx/Makefile | 2 +-
target/linux/apm821xx/config-4.4 | 1 +
target/linux/mpc85xx/Makefile | 3 +--
target/linux/mpc85xx/config-4.4 | 1 +
target/linux/ppc40x/config-3.18 | 1 +
target/linux/ppc44x/config-3.18 | 1 +
7 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/package/kernel/linux/modules/other.mk
b/package/kernel/linux/modules/other.mk
index ee1ee06..3f7a3ee 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -514,22 +514,6 @@ endef
$(eval $(call KernelPackage,wdt-orion))
-define KernelPackage/booke-wdt
- SUBMENU:=$(OTHER_MENU)
- TITLE:=PowerPC Book-E Watchdog Timer
- DEPENDS:=@(TARGET_apm821xx||TARGET_mpc85xx||TARGET_ppc40x||TARGET_ppc44x)
- KCONFIG:=CONFIG_BOOKE_WDT
- FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/booke_wdt.ko
- AUTOLOAD:=$(call AutoLoad,50,booke_wdt,1)
-endef
-
-define KernelPackage/booke-wdt/description
- Kernel module for PowerPC Book-E Watchdog Timer
-endef
-
-$(eval $(call KernelPackage,booke-wdt))
-
-
define KernelPackage/rtc-ds1307
SUBMENU:=$(OTHER_MENU)
TITLE:=Dallas/Maxim DS1307 (and compatible) RTC support
diff --git a/target/linux/apm821xx/Makefile b/target/linux/apm821xx/Makefile
index f8246c4..d52829e 100644
--- a/target/linux/apm821xx/Makefile
+++ b/target/linux/apm821xx/Makefile
@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/target.mk
KERNELNAME:=uImage
DEFAULT_PACKAGES += \
- kmod-leds-gpio kmod-booke-wdt kmod-i2c-core kmod-gpio-button-hotplug
+ kmod-leds-gpio kmod-i2c-core kmod-gpio-button-hotplug
define Target/Description
Build images for AppliedMicro APM821xx based boards.
diff --git a/target/linux/apm821xx/config-4.4 b/target/linux/apm821xx/config-4.4
index 858952c..1515dda 100644
--- a/target/linux/apm821xx/config-4.4
+++ b/target/linux/apm821xx/config-4.4
@@ -36,6 +36,7 @@ CONFIG_AUDIT_ARCH=y
CONFIG_BCH=y
# CONFIG_BLUESTONE is not set
CONFIG_BOOKE=y
+CONFIG_BOOKE_WDT=y
CONFIG_BOUNCE=y
# CONFIG_CANYONLANDS is not set
# CONFIG_IKAREM is not set
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index a32be90..efd48d7 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -25,8 +25,7 @@ endif
DEFAULT_PACKAGES += \
kmod-input-core kmod-input-gpio-keys kmod-button-hotplug \
- kmod-leds-gpio kmod-booke-wdt \
- swconfig kmod-ath9k wpad-mini
+ kmod-leds-gpio swconfig kmod-ath9k wpad-mini
define Target/Description
Build images for the Freescale MPC85xx based boards.
diff --git a/target/linux/mpc85xx/config-4.4 b/target/linux/mpc85xx/config-4.4
index 90bde4f..06b8870 100644
--- a/target/linux/mpc85xx/config-4.4
+++ b/target/linux/mpc85xx/config-4.4
@@ -28,6 +28,7 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_AUDIT_ARCH=y
CONFIG_BOOKE=y
+CONFIG_BOOKE_WDT=y
CONFIG_BOUNCE=y
# CONFIG_BSC9131_RDB is not set
# CONFIG_BSC9132_QDS is not set
diff --git a/target/linux/ppc40x/config-3.18 b/target/linux/ppc40x/config-3.18
index bf59bf1..85bbe0c 100644
--- a/target/linux/ppc40x/config-3.18
+++ b/target/linux/ppc40x/config-3.18
@@ -25,6 +25,7 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_AUDIT_ARCH=y
+CONFIG_BOOKE_WDT=y
CONFIG_BOUNCE=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CLONE_BACKWARDS=y
diff --git a/target/linux/ppc44x/config-3.18 b/target/linux/ppc44x/config-3.18
index b18edbf..842d898 100644
--- a/target/linux/ppc44x/config-3.18
+++ b/target/linux/ppc44x/config-3.18
@@ -31,6 +31,7 @@ CONFIG_AUDIT_ARCH=y
# CONFIG_BAMBOO is not set
# CONFIG_BLUESTONE is not set
CONFIG_BOOKE=y
+CONFIG_BOOKE_WDT=y
CONFIG_BOUNCE=y
CONFIG_CANYONLANDS=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
--
2.8.1
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
