From a8428de05cd6ad86dba8444de78a64294d4ddb5e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 2 May 2015 15:24:16 -0500 Subject: update kernel versions, add separate modules-.mk files to abstract patch name changes --- mk/kernel-ver.mk | 40 +++++++++++++++++++++++----------------- mk/modules-3.12.mk | 5 +++++ mk/modules-3.14.mk | 5 +++++ mk/modules-3.18.mk | 5 +++++ mk/modules-3.19.mk | 6 ++++++ mk/modules.mk | 39 +++++++++++++++------------------------ 6 files changed, 59 insertions(+), 41 deletions(-) create mode 100644 mk/modules-3.12.mk create mode 100644 mk/modules-3.14.mk create mode 100644 mk/modules-3.18.mk create mode 100644 mk/modules-3.19.mk (limited to 'mk') diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 757fe9f33..69251a346 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,38 +1,44 @@ -ifeq ($(ADK_KERNEL_VERSION_3_19_1),y) -KERNEL_VERSION:= 3.19.1 +ifeq ($(ADK_KERNEL_VERSION_4_0_1),y) +KERNEL_VERSION:= 4.0.1 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_HASH:= 717f36a65735bdd7afcb452578cc221c7fde8f6a0073e2feb62473466bdfa763 endif -ifeq ($(ADK_KERNEL_VERSION_3_18_10),y) -KERNEL_VERSION:= 3.18.10 +ifeq ($(ADK_KERNEL_VERSION_3_19_5),y) +KERNEL_VERSION:= 3.19.5 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_HASH:= d03015f01235ae046d9d39c0a70ad21a7a97fec0620741ea2d8306289707b04e +KERNEL_HASH:= 3d36d9d3643f3dd8e395a192c112dcde55732734e52185a4131fe819a68f5e68 endif -ifeq ($(ADK_KERNEL_VERSION_3_14_35),y) -KERNEL_VERSION:= 3.14.35 +ifeq ($(ADK_KERNEL_VERSION_3_18_12),y) +KERNEL_VERSION:= 3.18.12 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_HASH:= c8d7d23a434688db94e9faed2e73b31e8b9722d7ffc6fbce2b0f6d1f91a825b4 +KERNEL_HASH:= 82eab56bd3e416b12771908edbe000a8bf58d78da88457f716aab00dc07b8e1b endif -ifeq ($(ADK_KERNEL_VERSION_3_12_38),y) -KERNEL_VERSION:= 3.12.38 +ifeq ($(ADK_KERNEL_VERSION_3_14_40),y) +KERNEL_VERSION:= 3.14.40 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_HASH:= 930dcae882f402015b21a3c2e73ef84352b46ae58a9e5348b3a46343bfdc9b6f +KERNEL_HASH:= 2a89cce6ca7c574f17d44dcb541036d29725a102dd047963b850ede2ed28b2f0 endif -ifeq ($(ADK_KERNEL_VERSION_3_10_71),y) -KERNEL_VERSION:= 3.10.71 +ifeq ($(ADK_KERNEL_VERSION_3_12_40),y) +KERNEL_VERSION:= 3.12.40 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_HASH:= 1b2ef99de33bf5d8c6aaba202dd951f2c13277a8efa7522d3f331c7aee32dac0 +KERNEL_HASH:= 85c3f531a1607f5b21dfe5fb6db324e2a31a01880c0dcc853f056460c3deb1b1 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_106),y) -KERNEL_VERSION:= 3.4.106 +ifeq ($(ADK_KERNEL_VERSION_3_10_75),y) +KERNEL_VERSION:= 3.10.75 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_HASH:= 4ca37aad495d7a670c9f4435a98460d795fbdb8675f0613c1541824feb1433d0 +KERNEL_HASH:= 18987c2e9a8f5e2583b1ac5c2bed52777b8730ab29612a5b70c94fa17c659803 +endif +ifeq ($(ADK_KERNEL_VERSION_3_4_107),y) +KERNEL_VERSION:= 3.4.107 +KERNEL_MOD_VERSION:= $(KERNEL_VERSION) +KERNEL_RELEASE:= 1 +KERNEL_HASH:= 18decdeec4d7f3c0a8874d49b6b1c4980fcb92b5f62e13889ce35bd674ec75f8 endif ifeq ($(ADK_KERNEL_VERSION_3_2_68),y) KERNEL_VERSION:= 3.2.68 diff --git a/mk/modules-3.12.mk b/mk/modules-3.12.mk new file mode 100644 index 000000000..f00746f4c --- /dev/null +++ b/mk/modules-3.12.mk @@ -0,0 +1,5 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +USBMODULES:=drivers/usb/usb-common drivers/usb/core/usbcore +USBUDC:=gadget/udc diff --git a/mk/modules-3.14.mk b/mk/modules-3.14.mk new file mode 100644 index 000000000..f00746f4c --- /dev/null +++ b/mk/modules-3.14.mk @@ -0,0 +1,5 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +USBMODULES:=drivers/usb/usb-common drivers/usb/core/usbcore +USBUDC:=gadget/udc diff --git a/mk/modules-3.18.mk b/mk/modules-3.18.mk new file mode 100644 index 000000000..a4f7f84b3 --- /dev/null +++ b/mk/modules-3.18.mk @@ -0,0 +1,5 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +USBMODULES:=drivers/usb/common/usb-common drivers/usb/core/usbcore +USBUDC:=gadget/udc diff --git a/mk/modules-3.19.mk b/mk/modules-3.19.mk new file mode 100644 index 000000000..425c180ac --- /dev/null +++ b/mk/modules-3.19.mk @@ -0,0 +1,6 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +USBMODULES+=drivers/usb/common/usb-common +USBMODULES+=drivers/usb/core/usbcore +USBUDC:=gadget/udc diff --git a/mk/modules.mk b/mk/modules.mk index 3bf580ec1..764dbb01d 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1,9 +1,21 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -KERNEL_BASE:=$(word 1,$(subst ., ,$(ADK_KERNEL_VERSION))) -KERNEL_MAJ:=$(word 2,$(subst ., ,$(ADK_KERNEL_VERSION))) -KERNEL_MIN:=$(word 3,$(subst ., ,$(ADK_KERNEL_VERSION))) +ifeq ($(ADK_KERNEL_VERSION_3_19),y) +include $(ADK_TOPDIR)/mk/modules-3.19.mk +endif + +ifeq ($(ADK_KERNEL_VERSION_3_18),y) +include $(ADK_TOPDIR)/mk/modules-3.18.mk +endif + +ifeq ($(ADK_KERNEL_VERSION_3_14),y) +include $(ADK_TOPDIR)/mk/modules-3.14.mk +endif + +ifeq ($(ADK_KERNEL_VERSION_3_12),y) +include $(ADK_TOPDIR)/mk/modules-3.12.mk +endif # # Virtualization @@ -1217,27 +1229,6 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\ # # USB # - -USBMODULES:= -USBMODULES+=drivers/usb/usb-common -USBMODULES+=drivers/usb/core/usbcore -USBUDC:=gadget - -ifeq ($(KERNEL_BASE),3) -ifeq ($(KERNEL_MAJ),18) -USBMODULES:= -USBMODULES+=drivers/usb/common/usb-common -USBMODULES+=drivers/usb/core/usbcore -USBUDC:=gadget/udc -endif -ifeq ($(KERNEL_MAJ),19) -USBMODULES:= -USBMODULES+=drivers/usb/common/usb-common -USBMODULES+=drivers/usb/core/usbcore -USBUDC:=gadget/udc -endif -endif - $(eval $(call KMOD_template,USB,usb,\ $(foreach mod, $(USBMODULES),$(MODULES_DIR)/kernel/$(mod)) \ ,50)) -- cgit v1.2.3