ppc4xx: remove booke-wdt watchdog package
authorChristian Lamparter <chunkeey@googlemail.com>
Wed, 20 Jul 2016 13:44:49 +0000 (15:44 +0200)
committerFelix Fietkau <nbd@nbd.name>
Fri, 22 Jul 2016 07:48:12 +0000 (09:48 +0200)
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
target/linux/mpc85xx/Makefile
target/linux/mpc85xx/config-4.4
target/linux/ppc40x/config-3.18
target/linux/ppc44x/config-3.18

index a1fce48..3f7a3ee 100644 (file)
@@ -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
index a32be90..efd48d7 100644 (file)
@@ -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.
index 90bde4f..06b8870 100644 (file)
@@ -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
index bf59bf1..85bbe0c 100644 (file)
@@ -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
index b18edbf..842d898 100644 (file)
@@ -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