aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-07-14 12:59:00 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-07-14 12:59:00 +0000
commitef0b9be95e18795c9eabdec012a73c70bca70ac5 (patch)
treee97daaff283f18b3dcb6896a648c652bdf705b74
parent656d47504330936d80e80c918b25d8a4f7eb3675 (diff)
downloadupstream-ef0b9be95e18795c9eabdec012a73c70bca70ac5.tar.gz
upstream-ef0b9be95e18795c9eabdec012a73c70bca70ac5.tar.bz2
upstream-ef0b9be95e18795c9eabdec012a73c70bca70ac5.zip
brcm47xx: do not load the kernel modules needed for Ethernet manually
add the boot flag to make the kernel modules needed for Ethernet and diag load on startup. SVN-Revision: 37284
-rw-r--r--package/kernel/broadcom-diag/Makefile5
-rw-r--r--package/kernel/linux/modules/hwmon.mk2
-rw-r--r--package/kernel/linux/modules/netdevices.mk4
-rw-r--r--package/kernel/linux/modules/other.mk4
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm8
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm7
6 files changed, 10 insertions, 20 deletions
diff --git a/package/kernel/broadcom-diag/Makefile b/package/kernel/broadcom-diag/Makefile
index 61b35290fc..939b1cb5fc 100644
--- a/package/kernel/broadcom-diag/Makefile
+++ b/package/kernel/broadcom-diag/Makefile
@@ -18,6 +18,11 @@ define KernelPackage/diag
DEPENDS:=@TARGET_brcm47xx
TITLE:=Driver for router LEDs and Buttons
FILES:=$(PKG_BUILD_DIR)/diag.ko
+ AUTOLOAD:=$(call AutoLoad,5,diag,1)
+endef
+
+define KernelPackage/diag/description
+ Kernel modules for Broadcom LED and Button driver
endef
define Build/Prepare
diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index 969e8fa3aa..3df70f47bf 100644
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -15,7 +15,7 @@ define KernelPackage/hwmon-core
CONFIG_HWMON_DEBUG_CHIP=n
FILES:= \
$(LINUX_DIR)/drivers/hwmon/hwmon.ko
- AUTOLOAD:=$(call AutoLoad,40,hwmon)
+ AUTOLOAD:=$(call AutoLoad,17,hwmon,1)
endef
define KernelPackage/hwmon-core/description
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 3dec19e3c0..4ae2a28160 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -422,7 +422,7 @@ define KernelPackage/b44
DEPENDS:=@PCI_SUPPORT +!TARGET_brcm47xx:kmod-ssb
SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko
- AUTOLOAD:=$(call AutoLoad,50,b44)
+ AUTOLOAD:=$(call AutoLoad,19,b44,1)
endef
define KernelPackage/b44/description
@@ -476,7 +476,7 @@ define KernelPackage/tg3
DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +(LINUX_3_8||LINUX_3_9||LINUX_3_10):kmod-ptp
SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
- AUTOLOAD:=$(call AutoLoad,50,tg3)
+ AUTOLOAD:=$(call AutoLoad,19,tg3,1)
endef
define KernelPackage/tg3/description
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 94bf5dd6cf..03cfbc16f5 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -640,7 +640,7 @@ define KernelPackage/pps
TITLE:=PPS support
KCONFIG:=CONFIG_PPS
FILES:=$(LINUX_DIR)/drivers/pps/pps_core.ko
- AUTOLOAD:=$(call AutoLoad,20,pps_core)
+ AUTOLOAD:=$(call AutoLoad,17,pps_core,1)
endef
define KernelPacakge/pps/description
@@ -658,7 +658,7 @@ define KernelPackage/ptp
DEPENDS:=+kmod-pps
KCONFIG:=CONFIG_PTP_1588_CLOCK
FILES:=$(LINUX_DIR)/drivers/ptp/ptp.ko
- AUTOLOAD:=$(call AutoLoad,25,ptp)
+ AUTOLOAD:=$(call AutoLoad,18,ptp,1)
endef
define KernelPacakge/ptp/description
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
index 04992dee16..ac18e0baf2 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
@@ -3,14 +3,6 @@
set_preinit_iface() {
ifname=eth0
- insmod diag
- insmod hwmon
- insmod pps_core
- insmod ptp
- insmod tg3
- insmod b44
- insmod bgmac
-
# hardware specific overrides
case "$(cat /proc/diag/model)" in
"Linksys WAP54G V1") ifname=eth1;;
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm
deleted file mode 100644
index 5aa7bc0b1d..0000000000
--- a/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-enable_reset_button() {
- insmod diag
-}
-
-boot_hook_add preinit_main enable_reset_button