summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbrodkorb@conet.de>2019-06-24 08:25:24 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2019-06-24 08:28:37 (GMT)
commit4daa97016ed8d83b02f2d13509560d4bc098ccab (patch)
treea312a69484f96755669d20b1cc191930cb6288ac
parent46882ea5212f1e54871f1d87ae5017893114adad (diff)
linux: update to 4.19.55
-rw-r--r--mk/image.mk28
-rw-r--r--mk/linux-ver.mk4
-rw-r--r--target/linux/Config.in.kernelversion7
3 files changed, 35 insertions, 4 deletions
diff --git a/mk/image.mk b/mk/image.mk
index 32b32bb..3021fac 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -161,6 +161,32 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}/.adk
$(CPIO) --quiet -o -Hustar --owner=0:0 | $(XZ) -c >$@
${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk
+ifeq ($(ADK_TARGET_LINUX_KERNEL_NEW),y)
+ PATH='${HOST_PATH}' $(BASH) ${LINUX_DIR}/usr/gen_initramfs_list.sh -u squash -g squash \
+ ${TARGET_DIR}/ >$@
+ ( \
+ echo "nod /dev/console 0644 0 0 c 5 1"; \
+ echo "nod /dev/tty 0644 0 0 c 5 0"; \
+ for i in 0 1 2 3 4; do \
+ echo "nod /dev/tty$$i 0644 0 0 c 4 $$$$i"; \
+ done; \
+ echo "nod /dev/null 0644 0 0 c 1 3"; \
+ echo "nod /dev/ram 0655 0 0 b 1 1"; \
+ echo "nod /dev/ttyS0 0660 0 0 c 4 64"; \
+ echo "nod /dev/ttyS1 0660 0 0 c 4 65"; \
+ echo "nod /dev/ttyB0 0660 0 0 c 11 0"; \
+ echo "nod /dev/ttyB1 0660 0 0 c 11 1"; \
+ echo "nod /dev/ttyAMA0 0660 0 0 c 204 64"; \
+ echo "nod /dev/ttyAMA1 0660 0 0 c 204 65"; \
+ echo "nod /dev/ttySC0 0660 0 0 c 204 8"; \
+ echo "nod /dev/ttySC1 0660 0 0 c 204 9"; \
+ echo "nod /dev/ttySC2 0660 0 0 c 204 10"; \
+ echo "nod /dev/ttyBF0 0660 0 0 c 204 64"; \
+ echo "nod /dev/ttyBF1 0660 0 0 c 204 65"; \
+ echo "nod /dev/ttyUL0 0660 0 0 c 204 187"; \
+ echo "nod /dev/ttyUL1 0660 0 0 c 204 188"; \
+ ) >>$@
+else
PATH='${HOST_PATH}' $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
${TARGET_DIR}/ >$@
( \
@@ -185,7 +211,7 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk
echo "nod /dev/ttyUL0 0660 0 0 c 204 187"; \
echo "nod /dev/ttyUL1 0660 0 0 c 204 188"; \
) >>$@
-
+endif
${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index e046527..b16f540 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -16,10 +16,10 @@ KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y)
-KERNEL_FILE_VER:= 4.19.45
+KERNEL_FILE_VER:= 4.19.55
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= eb31e62fbb30aaeedb892cecdd8ac9746d42cbbef2ef2356f9ca8e13514b9d2b
+KERNEL_HASH:= c906f0cba7998c5942aaf7034ef8ea925f04f47a673816da05b203e97360b947
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y)
KERNEL_FILE_VER:= 4.14.121
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index a349987..c808c1a 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -1,6 +1,9 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
+config ADK_TARGET_LINUX_KERNEL_NEW
+ bool
+
choice
prompt "Linux Kernel version" if !ADK_TARGET_CHOOSE_ARCH
depends on ADK_TARGET_OS_LINUX
@@ -21,6 +24,7 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_14
config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
bool "git"
+ select ADK_TARGET_LINUX_KERNEL_NEW
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_NDS32
select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
@@ -30,7 +34,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
config ADK_TARGET_LINUX_KERNEL_VERSION_4_19
- bool "4.19.45"
+ bool "4.19.55"
+ select ADK_TARGET_LINUX_KERNEL_NEW
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_CRIS
depends on !ADK_TARGET_ARCH_CSKY