| Message ID | e7eb55375f21eae8dde329038c4b0cadf552db80.1469021226.git.chunkeey@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
On 07/20/2016 06:44 AM, Christian Lamparter wrote: > This patch gets rid of the booke watchdog kmod package. > Instead the affected boards will enable it in their > kernel configs. You are not really explaining why this is better, is booke-wdt required for e.g: system reboot on some platforms?
On Friday, July 22, 2016 12:00:53 PM CEST Florian Fainelli wrote: > On 07/20/2016 06:44 AM, Christian Lamparter wrote: > > This patch gets rid of the booke watchdog kmod package. > > Instead the affected boards will enable it in their > > kernel configs. > > You are not really explaining why this is better, is booke-wdt required > for e.g: system reboot on some platforms? > I made this change because of this post from Felix: <http://lists.infradead.org/pipermail/lede-dev/2016-July/001879.html> There's no good reason for APM821xx (and probably all other ppc platforms) to have it as a separate module as it's part of the platform. Most other prominent archs (ar71xx, lantiq, ramips, mvebu, ...) have enabled their platform watchdog in the default kernel configuration as well. Do you want it back? If so, what's your good reason behind it? Regards, Christian
On 07/22/2016 01:38 PM, Christian Lamparter wrote: > On Friday, July 22, 2016 12:00:53 PM CEST Florian Fainelli wrote: >> On 07/20/2016 06:44 AM, Christian Lamparter wrote: >>> This patch gets rid of the booke watchdog kmod package. >>> Instead the affected boards will enable it in their >>> kernel configs. >> >> You are not really explaining why this is better, is booke-wdt required >> for e.g: system reboot on some platforms? >> > I made this change because of this post from Felix: > <http://lists.infradead.org/pipermail/lede-dev/2016-July/001879.html> > > There's no good reason for APM821xx (and probably all other ppc platforms) > to have it as a separate module as it's part of the platform. Most > other prominent archs (ar71xx, lantiq, ramips, mvebu, ...) have enabled > their platform watchdog in the default kernel configuration as well. > > Do you want it back? If so, what's your good reason behind it? You just need to indicate why this is desirable, that's all I was asking for, anyway, not critical.
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index a1fce48..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_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/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
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 <chunkeey@gmail.com> --- package/kernel/linux/modules/other.mk | 16 ---------------- 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 + 5 files changed, 4 insertions(+), 18 deletions(-)