diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-25 19:19:01 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-25 19:19:01 +0200 |
| commit | c6847d3f5be31fd644d6a41de147b4604852966e (patch) | |
| tree | 192129bb2c530fe17fa7ab2339cff505d54f5029 /mk | |
| parent | d0b360fab8b74eb5ae912e4841ef0403dbabb981 (diff) | |
| parent | 67e2da6a84f50c0b0e43f4d4fb9eae91671e81ad (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-ver.mk | 6 | ||||
| -rw-r--r-- | mk/modules-4.0.mk | 6 | ||||
| -rw-r--r-- | mk/modules.mk | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index aae245026..437c9986d 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -16,11 +16,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_HASH:= 82eab56bd3e416b12771908edbe000a8bf58d78da88457f716aab00dc07b8e1b endif -ifeq ($(ADK_KERNEL_VERSION_3_14_40),y) -KERNEL_VERSION:= 3.14.40 +ifeq ($(ADK_KERNEL_VERSION_3_14_43),y) +KERNEL_VERSION:= 3.14.43 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_HASH:= 2a89cce6ca7c574f17d44dcb541036d29725a102dd047963b850ede2ed28b2f0 +KERNEL_HASH:= 6ecfa347c78b31b96a2ad282e2835315bc94d4ec52955e2e11b51be2dc6fafd4 endif ifeq ($(ADK_KERNEL_VERSION_3_12_40),y) KERNEL_VERSION:= 3.12.40 diff --git a/mk/modules-4.0.mk b/mk/modules-4.0.mk new file mode 100644 index 000000000..425c180ac --- /dev/null +++ b/mk/modules-4.0.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 91b31f0dd..0b14a5443 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1,6 +1,10 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +ifeq ($(ADK_KERNEL_VERSION_4_0),y) +include $(ADK_TOPDIR)/mk/modules-4.0.mk +endif + ifeq ($(ADK_KERNEL_VERSION_3_19),y) include $(ADK_TOPDIR)/mk/modules-3.19.mk endif |