From 009336f7557ef8a74873f6bddcaa31399eede451 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 25 Feb 2021 09:20:38 +0100 Subject: linux: update kernels --- mk/image.mk | 36 ++++++++---------------------------- mk/linux-ver.mk | 26 ++++++++++++++++---------- 2 files changed, 24 insertions(+), 38 deletions(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 1cd343701..72c7cdaa7 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -161,8 +161,7 @@ ${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 \ + PATH='${HOST_PATH}' $(BASH) ${ADK_TOPDIR}/scripts/gen_initramfs_list.sh -u squash -g squash \ ${TARGET_DIR}/ >$@ ( \ echo "nod /dev/console 0644 0 0 c 5 1"; \ @@ -186,32 +185,6 @@ ifeq ($(ADK_TARGET_LINUX_KERNEL_NEW),y) 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}/ >$@ - ( \ - 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"; \ - ) >>$@ -endif ${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list ${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \ @@ -269,6 +242,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_XZ),y) echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_XZ=y" >> ${LINUX_DIR}/.config + echo "CONFIG_RD_ZSTD=n" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_XZ=y" >> ${LINUX_DIR}/.config echo "CONFIG_XZ_DEC_X86=n" >> ${LINUX_DIR}/.config echo "CONFIG_XZ_DEC_POWERPC=n" >> ${LINUX_DIR}/.config @@ -285,6 +259,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_LZ4),y) echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZ4=y" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config + echo "CONFIG_RD_ZSTD=n" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_LZ4=y" >> ${LINUX_DIR}/.config endif ifeq ($(ADK_LINUX_KERNEL_COMP_LZMA),y) @@ -294,6 +269,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_LZMA),y) echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZMA=y" >> ${LINUX_DIR}/.config + echo "CONFIG_RD_ZSTD=n" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_LZMA=y" >> ${LINUX_DIR}/.config endif ifeq ($(ADK_LINUX_KERNEL_COMP_LZO),y) @@ -303,6 +279,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_LZO),y) echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZO=y" >> ${LINUX_DIR}/.config + echo "CONFIG_RD_ZSTD=n" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_LZO=y" >> ${LINUX_DIR}/.config endif ifeq ($(ADK_LINUX_KERNEL_COMP_GZIP),y) @@ -312,6 +289,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_GZIP),y) echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=y" >> ${LINUX_DIR}/.config + echo "CONFIG_RD_ZSTD=n" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_GZIP=y" >> ${LINUX_DIR}/.config endif ifeq ($(ADK_LINUX_KERNEL_COMP_BZIP2),y) @@ -321,6 +299,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_BZIP2),y) echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config + echo "CONFIG_RD_ZSTD=n" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config endif ifeq ($(ADK_LINUX_KERNEL_COMPRESS_NONE),y) @@ -330,6 +309,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMPRESS_NONE),y) echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config + echo "CONFIG_RD_ZSTD=n" >> ${LINUX_DIR}/.config endif @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index a6b69dc0a..c57b9211f 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,35 +15,41 @@ KERNEL_FILE_VER:= $(ADK_TARGET_LINUX_KERNEL_GIT) KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_10),y) +KERNEL_FILE_VER:= 5.10.17 +KERNEL_RELEASE:= 1 +KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) +KERNEL_HASH:= e84e623ce8bb2446ec026b62eafa3b18480aa6fb6ae9c86cd8f18651324d4814 +endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y) -KERNEL_FILE_VER:= 5.4.92 +KERNEL_FILE_VER:= 5.4.99 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= c0937ff98824c4b14cfea68a04340e0beb3c00f1cc02984daf2f3bdf542394fd +KERNEL_HASH:= 5bdad12c69253d30d836dd51e0b2a9a04a6749cc6b4b2412561a1efcb1351a27 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) -KERNEL_FILE_VER:= 4.19.151 +KERNEL_FILE_VER:= 4.19.176 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= c7b134c6d45f77df0909c225300e64379d7f9d69abd9ad73ff6a289aa2b6a36e +KERNEL_HASH:= e1c3b8d21ba31bd5c50bb3b2a741f62958eb2a116bf13fa0e14f1656c4826073 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y) -KERNEL_FILE_VER:= 4.14.200 +KERNEL_FILE_VER:= 4.14.221 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 5d404a0224a34b5379f1871cc46825487d557c2660459d2b5c3cd4871d699a38 +KERNEL_HASH:= ce2254075ff4846f13380c1cf4bec1e351e5996a7dd109c200e222e49fd2c7e9 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_9),y) -KERNEL_FILE_VER:= 4.9.238 +KERNEL_FILE_VER:= 4.9.257 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= b1eaf60b771ec4df0546d2b7539e164355008ea2f680a0642ae430e9cb134a3f +KERNEL_HASH:= 95e780fffc81de8217a31a3e6e212b69643f5344e9ba0dabaa6e426126f6d64f endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_4),y) -KERNEL_FILE_VER:= 4.4.238 +KERNEL_FILE_VER:= 4.4.257 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 067814035c17e77dee84076dcc06a95eb675344cd926b7b79a16b80fee593364 +KERNEL_HASH:= 3e067c5625b6a1201325c45c9b9e75f87e768cfbb9426f5f173dee73dc234b5a endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_3_16),y) KERNEL_FILE_VER:= 3.16.81 -- cgit v1.2.3