diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 15:22:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 15:22:22 +0100 |
| commit | 51ef23fb3b2a262ffa4a6b305fd76aaa9a3b1da1 (patch) | |
| tree | e5b251f3082a619bbc01ae3523cafe776569e4f6 /mk | |
| parent | f3e1c3cf993b0ba54afa0ff9552ffefd39828b23 (diff) | |
| parent | 435cff735f24278f53678abda61b950a4a478895 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/modules.mk | 24 | ||||
| -rw-r--r-- | mk/vars.mk | 1 |
3 files changed, 20 insertions, 6 deletions
diff --git a/mk/build.mk b/mk/build.mk index abf2d4a7c..986d66cd7 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -26,7 +26,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \ - ADK_PACKAGE_OPENJDK=n \ ADK_PACKAGE_OPENJDK7=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GRUB=n \ diff --git a/mk/modules.mk b/mk/modules.mk index ae38b5f90..22afead3b 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -108,20 +108,36 @@ $(eval $(call KMOD_template,P54_USB,p54-usb,\ $(eval $(call KMOD_template,RT2X00,rt2x00,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \ - $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \ ,17)) +$(eval $(call KMOD_template,RT2X00_LIB_PCI,rt2x00pci,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \ +,18)) + +$(eval $(call KMOD_template,RT2X00_LIB_USB,rt2x00usb,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00usb \ +,18)) + $(eval $(call KMOD_template,RT2400PCI,rt2400pci,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2400pci \ -,20, kmod-leds-class kmod-rt2x00)) +,20, kmod-leds-class kmod-rt2x00 rt2x00pci)) $(eval $(call KMOD_template,RT2500PCI,rt2500pci,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2500pci \ -,20, kmod-leds-class kmod-rt2x00)) +,20, kmod-leds-class kmod-rt2x00 kmod-rt2x00pci)) + +$(eval $(call KMOD_template,RT2800USB,rt2800usb,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2800lib \ + $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2800usb \ +,20, kmod-rt2x00 kmod-rt2x00usb)) $(eval $(call KMOD_template,RT61PCI,rt61pci,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt61pci \ -,20, kmod-leds-class kmod-rt2x00)) +,20, kmod-leds-class kmod-rt2x00 rt2x00pci)) + +$(eval $(call KMOD_template,RTL8192CU,rtl8192cu,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/rtl8192cu/8192cu \ +,20)) # # Networking diff --git a/mk/vars.mk b/mk/vars.mk index 0525f5129..657d44ae5 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -136,7 +136,6 @@ FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh SED:= sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux -LINUX_HEADER_DIR:= $(STAGING_DIR)/linux-header KERNEL_MODULE_FLAGS:= ARCH=${ARCH} KERNELVERSION="2.6" \ KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ |