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 +- scripts/gen_initramfs_list.sh | 328 + target/linux/Config.in.kernelversion | 27 +- .../linux/patches/4.14.200/alpha-remove-coff.patch | 43 - target/linux/patches/4.14.200/arm-nommu.patch | 81 - target/linux/patches/4.14.200/arm-thumb2.patch | 16 - target/linux/patches/4.14.200/h8300.patch | 12 - .../patches/4.14.200/initramfs-nosizelimit.patch | 21 - .../patches/4.14.200/microblaze-sigaltstack.patch | 12 - target/linux/patches/4.14.200/or1k-more-ram.patch | 12 - target/linux/patches/4.14.200/startup.patch | 34 - target/linux/patches/4.14.200/vdso2.patch | 27 - .../linux/patches/4.14.221/alpha-remove-coff.patch | 43 + target/linux/patches/4.14.221/arm-nommu.patch | 81 + target/linux/patches/4.14.221/arm-thumb2.patch | 16 + target/linux/patches/4.14.221/h8300.patch | 12 + .../patches/4.14.221/initramfs-nosizelimit.patch | 21 + .../patches/4.14.221/microblaze-sigaltstack.patch | 12 + target/linux/patches/4.14.221/or1k-more-ram.patch | 12 + target/linux/patches/4.14.221/startup.patch | 34 + target/linux/patches/4.14.221/vdso2.patch | 27 + ...entry-fix-potential-EFA-clobber-when-TIF_.patch | 66 - target/linux/patches/4.19.151/arc.patch | 12 - target/linux/patches/4.19.151/darwin-dtc.patch | 26 - .../linux/patches/4.19.151/darwin-file2alias.patch | 14 - target/linux/patches/4.19.151/fec-coldfire.patch | 118 - target/linux/patches/4.19.151/or1k-more-ram.patch | 12 - target/linux/patches/4.19.151/relocs.patch | 2698 -- target/linux/patches/4.19.151/startup.patch | 34 - target/linux/patches/4.19.151/vdso2.patch | 24 - target/linux/patches/4.19.176/arc.patch | 12 + target/linux/patches/4.19.176/darwin-dtc.patch | 26 + .../linux/patches/4.19.176/darwin-file2alias.patch | 14 + target/linux/patches/4.19.176/fec-coldfire.patch | 118 + target/linux/patches/4.19.176/or1k-more-ram.patch | 12 + target/linux/patches/4.19.176/relocs.patch | 2698 ++ target/linux/patches/4.19.176/startup.patch | 34 + target/linux/patches/4.19.176/vdso2.patch | 24 + .../patches/4.4.238/coldfire-sighandler.patch | 100 - target/linux/patches/4.4.238/crisv32.patch | 33 - .../patches/4.4.238/crisv32_ethernet_driver.patch | 4048 --- target/linux/patches/4.4.238/h8300.patch | 44 - .../patches/4.4.238/initramfs-nosizelimit.patch | 57 - target/linux/patches/4.4.238/ld-or1k.patch | 12 - target/linux/patches/4.4.238/macsonic.patch | 11 - target/linux/patches/4.4.238/mips-xz.patch | 12 - target/linux/patches/4.4.238/patch-realtime | 32735 ------------------- target/linux/patches/4.4.238/startup.patch | 34 - .../linux/patches/4.4.238/use-libgcc-for-sh.patch | 29 - target/linux/patches/4.4.238/versatile-nommu.patch | 16 - .../patches/4.4.257/coldfire-sighandler.patch | 100 + target/linux/patches/4.4.257/crisv32.patch | 33 + .../patches/4.4.257/crisv32_ethernet_driver.patch | 4048 +++ target/linux/patches/4.4.257/h8300.patch | 44 + .../patches/4.4.257/initramfs-nosizelimit.patch | 57 + target/linux/patches/4.4.257/ld-or1k.patch | 12 + target/linux/patches/4.4.257/macsonic.patch | 11 + target/linux/patches/4.4.257/mips-xz.patch | 12 + target/linux/patches/4.4.257/patch-realtime | 32735 +++++++++++++++++++ target/linux/patches/4.4.257/startup.patch | 34 + .../linux/patches/4.4.257/use-libgcc-for-sh.patch | 29 + target/linux/patches/4.4.257/versatile-nommu.patch | 16 + .../linux/patches/4.9.238/alpha-remove-coff.patch | 43 - target/linux/patches/4.9.238/arm-nommu.patch | 80 - target/linux/patches/4.9.238/arm-thumb2.patch | 16 - .../patches/4.9.238/crisv32_ethernet_driver.patch | 4048 --- target/linux/patches/4.9.238/h8300.patch | 44 - .../linux/patches/4.9.238/hppa-remove-debug.patch | 12 - .../patches/4.9.238/initramfs-nosizelimit.patch | 57 - target/linux/patches/4.9.238/ld-or1k.patch | 12 - target/linux/patches/4.9.238/macsonic.patch | 11 - .../patches/4.9.238/microblaze-sigaltstack.patch | 12 - target/linux/patches/4.9.238/or1k-more-ram.patch | 12 - target/linux/patches/4.9.238/patch-realtime | 27718 ---------------- target/linux/patches/4.9.238/sh2.patch | 11 - target/linux/patches/4.9.238/startup.patch | 34 - target/linux/patches/4.9.238/vdso2.patch | 27 - .../linux/patches/4.9.257/alpha-remove-coff.patch | 43 + target/linux/patches/4.9.257/arm-nommu.patch | 80 + target/linux/patches/4.9.257/arm-thumb2.patch | 16 + .../patches/4.9.257/crisv32_ethernet_driver.patch | 4048 +++ target/linux/patches/4.9.257/h8300.patch | 44 + .../linux/patches/4.9.257/hppa-remove-debug.patch | 12 + .../patches/4.9.257/initramfs-nosizelimit.patch | 57 + target/linux/patches/4.9.257/ld-or1k.patch | 12 + target/linux/patches/4.9.257/macsonic.patch | 11 + .../patches/4.9.257/microblaze-sigaltstack.patch | 12 + target/linux/patches/4.9.257/or1k-more-ram.patch | 12 + target/linux/patches/4.9.257/patch-realtime | 27718 ++++++++++++++++ target/linux/patches/4.9.257/sh2.patch | 11 + target/linux/patches/4.9.257/startup.patch | 34 + target/linux/patches/4.9.257/vdso2.patch | 27 + target/linux/patches/5.10.17/arc.patch | 12 + target/linux/patches/5.10.17/darwin-dtc.patch | 26 + .../linux/patches/5.10.17/darwin-file2alias.patch | 14 + target/linux/patches/5.10.17/dtc-noyaml.patch | 16 + target/linux/patches/5.10.17/or1k-more-ram.patch | 12 + target/linux/patches/5.10.17/relocs.patch | 2698 ++ target/linux/patches/5.10.17/startup.patch | 34 + target/linux/patches/5.4.92/arc.patch | 12 - target/linux/patches/5.4.92/arm-thumb2.patch | 11 - target/linux/patches/5.4.92/darwin-dtc.patch | 26 - .../linux/patches/5.4.92/darwin-file2alias.patch | 14 - target/linux/patches/5.4.92/dtc-noyaml.patch | 16 - target/linux/patches/5.4.92/or1k-more-ram.patch | 12 - target/linux/patches/5.4.92/relocs.patch | 2698 -- target/linux/patches/5.4.92/sh4.patch | 11 - target/linux/patches/5.4.92/startup.patch | 1265 - target/linux/patches/5.4.99/arc.patch | 12 + target/linux/patches/5.4.99/arm-thumb2.patch | 11 + target/linux/patches/5.4.99/darwin-dtc.patch | 26 + .../linux/patches/5.4.99/darwin-file2alias.patch | 14 + target/linux/patches/5.4.99/dtc-noyaml.patch | 16 + target/linux/patches/5.4.99/or1k-more-ram.patch | 12 + target/linux/patches/5.4.99/relocs.patch | 2698 ++ target/linux/patches/5.4.99/sh4.patch | 11 + target/linux/patches/5.4.99/startup.patch | 1265 + 118 files changed, 79708 insertions(+), 76645 deletions(-) create mode 100755 scripts/gen_initramfs_list.sh delete mode 100644 target/linux/patches/4.14.200/alpha-remove-coff.patch delete mode 100644 target/linux/patches/4.14.200/arm-nommu.patch delete mode 100644 target/linux/patches/4.14.200/arm-thumb2.patch delete mode 100644 target/linux/patches/4.14.200/h8300.patch delete mode 100644 target/linux/patches/4.14.200/initramfs-nosizelimit.patch delete mode 100644 target/linux/patches/4.14.200/microblaze-sigaltstack.patch delete mode 100644 target/linux/patches/4.14.200/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.14.200/startup.patch delete mode 100644 target/linux/patches/4.14.200/vdso2.patch create mode 100644 target/linux/patches/4.14.221/alpha-remove-coff.patch create mode 100644 target/linux/patches/4.14.221/arm-nommu.patch create mode 100644 target/linux/patches/4.14.221/arm-thumb2.patch create mode 100644 target/linux/patches/4.14.221/h8300.patch create mode 100644 target/linux/patches/4.14.221/initramfs-nosizelimit.patch create mode 100644 target/linux/patches/4.14.221/microblaze-sigaltstack.patch create mode 100644 target/linux/patches/4.14.221/or1k-more-ram.patch create mode 100644 target/linux/patches/4.14.221/startup.patch create mode 100644 target/linux/patches/4.14.221/vdso2.patch delete mode 100644 target/linux/patches/4.19.151/0001-Revert-ARC-entry-fix-potential-EFA-clobber-when-TIF_.patch delete mode 100644 target/linux/patches/4.19.151/arc.patch delete mode 100644 target/linux/patches/4.19.151/darwin-dtc.patch delete mode 100644 target/linux/patches/4.19.151/darwin-file2alias.patch delete mode 100644 target/linux/patches/4.19.151/fec-coldfire.patch delete mode 100644 target/linux/patches/4.19.151/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.19.151/relocs.patch delete mode 100644 target/linux/patches/4.19.151/startup.patch delete mode 100644 target/linux/patches/4.19.151/vdso2.patch create mode 100644 target/linux/patches/4.19.176/arc.patch create mode 100644 target/linux/patches/4.19.176/darwin-dtc.patch create mode 100644 target/linux/patches/4.19.176/darwin-file2alias.patch create mode 100644 target/linux/patches/4.19.176/fec-coldfire.patch create mode 100644 target/linux/patches/4.19.176/or1k-more-ram.patch create mode 100644 target/linux/patches/4.19.176/relocs.patch create mode 100644 target/linux/patches/4.19.176/startup.patch create mode 100644 target/linux/patches/4.19.176/vdso2.patch delete mode 100644 target/linux/patches/4.4.238/coldfire-sighandler.patch delete mode 100644 target/linux/patches/4.4.238/crisv32.patch delete mode 100644 target/linux/patches/4.4.238/crisv32_ethernet_driver.patch delete mode 100644 target/linux/patches/4.4.238/h8300.patch delete mode 100644 target/linux/patches/4.4.238/initramfs-nosizelimit.patch delete mode 100644 target/linux/patches/4.4.238/ld-or1k.patch delete mode 100644 target/linux/patches/4.4.238/macsonic.patch delete mode 100644 target/linux/patches/4.4.238/mips-xz.patch delete mode 100644 target/linux/patches/4.4.238/patch-realtime delete mode 100644 target/linux/patches/4.4.238/startup.patch delete mode 100644 target/linux/patches/4.4.238/use-libgcc-for-sh.patch delete mode 100644 target/linux/patches/4.4.238/versatile-nommu.patch create mode 100644 target/linux/patches/4.4.257/coldfire-sighandler.patch create mode 100644 target/linux/patches/4.4.257/crisv32.patch create mode 100644 target/linux/patches/4.4.257/crisv32_ethernet_driver.patch create mode 100644 target/linux/patches/4.4.257/h8300.patch create mode 100644 target/linux/patches/4.4.257/initramfs-nosizelimit.patch create mode 100644 target/linux/patches/4.4.257/ld-or1k.patch create mode 100644 target/linux/patches/4.4.257/macsonic.patch create mode 100644 target/linux/patches/4.4.257/mips-xz.patch create mode 100644 target/linux/patches/4.4.257/patch-realtime create mode 100644 target/linux/patches/4.4.257/startup.patch create mode 100644 target/linux/patches/4.4.257/use-libgcc-for-sh.patch create mode 100644 target/linux/patches/4.4.257/versatile-nommu.patch delete mode 100644 target/linux/patches/4.9.238/alpha-remove-coff.patch delete mode 100644 target/linux/patches/4.9.238/arm-nommu.patch delete mode 100644 target/linux/patches/4.9.238/arm-thumb2.patch delete mode 100644 target/linux/patches/4.9.238/crisv32_ethernet_driver.patch delete mode 100644 target/linux/patches/4.9.238/h8300.patch delete mode 100644 target/linux/patches/4.9.238/hppa-remove-debug.patch delete mode 100644 target/linux/patches/4.9.238/initramfs-nosizelimit.patch delete mode 100644 target/linux/patches/4.9.238/ld-or1k.patch delete mode 100644 target/linux/patches/4.9.238/macsonic.patch delete mode 100644 target/linux/patches/4.9.238/microblaze-sigaltstack.patch delete mode 100644 target/linux/patches/4.9.238/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.9.238/patch-realtime delete mode 100644 target/linux/patches/4.9.238/sh2.patch delete mode 100644 target/linux/patches/4.9.238/startup.patch delete mode 100644 target/linux/patches/4.9.238/vdso2.patch create mode 100644 target/linux/patches/4.9.257/alpha-remove-coff.patch create mode 100644 target/linux/patches/4.9.257/arm-nommu.patch create mode 100644 target/linux/patches/4.9.257/arm-thumb2.patch create mode 100644 target/linux/patches/4.9.257/crisv32_ethernet_driver.patch create mode 100644 target/linux/patches/4.9.257/h8300.patch create mode 100644 target/linux/patches/4.9.257/hppa-remove-debug.patch create mode 100644 target/linux/patches/4.9.257/initramfs-nosizelimit.patch create mode 100644 target/linux/patches/4.9.257/ld-or1k.patch create mode 100644 target/linux/patches/4.9.257/macsonic.patch create mode 100644 target/linux/patches/4.9.257/microblaze-sigaltstack.patch create mode 100644 target/linux/patches/4.9.257/or1k-more-ram.patch create mode 100644 target/linux/patches/4.9.257/patch-realtime create mode 100644 target/linux/patches/4.9.257/sh2.patch create mode 100644 target/linux/patches/4.9.257/startup.patch create mode 100644 target/linux/patches/4.9.257/vdso2.patch create mode 100644 target/linux/patches/5.10.17/arc.patch create mode 100644 target/linux/patches/5.10.17/darwin-dtc.patch create mode 100644 target/linux/patches/5.10.17/darwin-file2alias.patch create mode 100644 target/linux/patches/5.10.17/dtc-noyaml.patch create mode 100644 target/linux/patches/5.10.17/or1k-more-ram.patch create mode 100644 target/linux/patches/5.10.17/relocs.patch create mode 100644 target/linux/patches/5.10.17/startup.patch delete mode 100644 target/linux/patches/5.4.92/arc.patch delete mode 100644 target/linux/patches/5.4.92/arm-thumb2.patch delete mode 100644 target/linux/patches/5.4.92/darwin-dtc.patch delete mode 100644 target/linux/patches/5.4.92/darwin-file2alias.patch delete mode 100644 target/linux/patches/5.4.92/dtc-noyaml.patch delete mode 100644 target/linux/patches/5.4.92/or1k-more-ram.patch delete mode 100644 target/linux/patches/5.4.92/relocs.patch delete mode 100644 target/linux/patches/5.4.92/sh4.patch delete mode 100644 target/linux/patches/5.4.92/startup.patch create mode 100644 target/linux/patches/5.4.99/arc.patch create mode 100644 target/linux/patches/5.4.99/arm-thumb2.patch create mode 100644 target/linux/patches/5.4.99/darwin-dtc.patch create mode 100644 target/linux/patches/5.4.99/darwin-file2alias.patch create mode 100644 target/linux/patches/5.4.99/dtc-noyaml.patch create mode 100644 target/linux/patches/5.4.99/or1k-more-ram.patch create mode 100644 target/linux/patches/5.4.99/relocs.patch create mode 100644 target/linux/patches/5.4.99/sh4.patch create mode 100644 target/linux/patches/5.4.99/startup.patch 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 diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh new file mode 100755 index 000000000..2bbac73e6 --- /dev/null +++ b/scripts/gen_initramfs_list.sh @@ -0,0 +1,328 @@ +#!/bin/sh +# Copyright (C) Martin Schlemmer +# Copyright (C) 2006 Sam Ravnborg +# +# Released under the terms of the GNU GPL +# +# Generate a cpio packed initramfs. It uses gen_init_cpio to generate +# the cpio archive, and then compresses it. +# The script may also be used to generate the inputfile used for gen_init_cpio +# This script assumes that gen_init_cpio is located in usr/ directory + +# error out on errors +set -e + +usage() { +cat << EOF +Usage: +$0 [-o ] [-u ] [-g ] {-d | } ... + -o Create compressed initramfs file named using + gen_init_cpio and compressor depending on the extension + -u User ID to map to user ID 0 (root). + is only meaningful if is a + directory. "squash" forces all files to uid 0. + -g Group ID to map to group ID 0 (root). + is only meaningful if is a + directory. "squash" forces all files to gid 0. + File list or directory for cpio archive. + If is a .cpio file it will be used + as direct input to initramfs. + -d Output the default cpio list. + +All options except -o and -l may be repeated and are interpreted +sequentially and immediately. -u and -g states are preserved across + options so an explicit "-u 0 -g 0" is required +to reset the root/group mapping. +EOF +} + +# awk style field access +# $1 - field number; rest is argument string +field() { + shift $1 ; echo $1 +} + +list_default_initramfs() { + # echo usr/kinit/kinit + : +} + +default_initramfs() { + cat <<-EOF >> ${output} + # This is a very simple, default initramfs + + dir /dev 0755 0 0 + nod /dev/console 0600 0 0 c 5 1 + dir /root 0700 0 0 + # file /kinit usr/kinit/kinit 0755 0 0 + # slink /init kinit 0755 0 0 + EOF +} + +filetype() { + local argv1="$1" + + # symlink test must come before file test + if [ -L "${argv1}" ]; then + echo "slink" + elif [ -f "${argv1}" ]; then + echo "file" + elif [ -d "${argv1}" ]; then + echo "dir" + elif [ -b "${argv1}" -o -c "${argv1}" ]; then + echo "nod" + elif [ -p "${argv1}" ]; then + echo "pipe" + elif [ -S "${argv1}" ]; then + echo "sock" + else + echo "invalid" + fi + return 0 +} + +list_print_mtime() { + : +} + +print_mtime() { + local my_mtime="0" + + if [ -e "$1" ]; then + my_mtime=$(find "$1" -printf "%T@\n" | sort -r | head -n 1) + fi + + echo "# Last modified: ${my_mtime}" >> ${output} + echo "" >> ${output} +} + +list_parse() { + if [ -L "$1" ]; then + return + fi + echo "$1" | sed 's/:/\\:/g; s/$/ \\/' +} + +# for each file print a line in following format +# +# for links, devices etc the format differs. See gen_init_cpio for details +parse() { + local location="$1" + local name="/${location#${srcdir}}" + # change '//' into '/' + name=$(echo "$name" | sed -e 's://*:/:g') + local mode="$2" + local uid="$3" + local gid="$4" + local ftype=$(filetype "${location}") + # remap uid/gid to 0 if necessary + [ "$root_uid" = "squash" ] && uid=0 || [ "$uid" -eq "$root_uid" ] && uid=0 + [ "$root_gid" = "squash" ] && gid=0 || [ "$gid" -eq "$root_gid" ] && gid=0 + local str="${mode} ${uid} ${gid}" + + [ "${ftype}" = "invalid" ] && return 0 + [ "${location}" = "${srcdir}" ] && return 0 + + case "${ftype}" in + "file") + str="${ftype} ${name} ${location} ${str}" + ;; + "nod") + local dev="`LC_ALL=C ls -l "${location}"`" + local maj=`field 5 ${dev}` + local min=`field 6 ${dev}` + maj=${maj%,} + + [ -b "${location}" ] && dev="b" || dev="c" + + str="${ftype} ${name} ${str} ${dev} ${maj} ${min}" + ;; + "slink") + local target=`readlink "${location}"` + str="${ftype} ${name} ${target} ${str}" + ;; + *) + str="${ftype} ${name} ${str}" + ;; + esac + + echo "${str}" >> ${output} + + return 0 +} + +unknown_option() { + printf "ERROR: unknown option \"$arg\"\n" >&2 + printf "If the filename validly begins with '-', " >&2 + printf "then it must be prefixed\n" >&2 + printf "by './' so that it won't be interpreted as an option." >&2 + printf "\n" >&2 + usage >&2 + exit 1 +} + +list_header() { + : +} + +header() { + printf "\n#####################\n# $1\n" >> ${output} +} + +# process one directory (incl sub-directories) +dir_filelist() { + ${dep_list}header "$1" + + srcdir=$(echo "$1" | sed -e 's://*:/:g') + dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" | LANG=C sort) + + # If $dirlist is only one line, then the directory is empty + if [ "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then + ${dep_list}print_mtime "$1" + + echo "${dirlist}" | \ + while read x; do + ${dep_list}parse ${x} + done + fi +} + +# if only one file is specified and it is .cpio file then use it direct as fs +# if a directory is specified then add all files in given direcotry to fs +# if a regular file is specified assume it is in gen_initramfs format +input_file() { + source="$1" + if [ -f "$1" ]; then + ${dep_list}header "$1" + is_cpio="$(echo "$1" | sed 's/^.*\.cpio\(\..*\)\{0,1\}/cpio/')" + if [ $2 -eq 0 -a ${is_cpio} = "cpio" ]; then + cpio_file=$1 + echo "$1" | grep -q '^.*\.cpio\..*' && is_cpio_compressed="compressed" + [ ! -z ${dep_list} ] && echo "$1" + return 0 + fi + if [ -z ${dep_list} ]; then + print_mtime "$1" >> ${output} + cat "$1" >> ${output} + else + echo "$1 \\" + cat "$1" | while read type dir file perm ; do + if [ "$type" = "file" ]; then + echo "$file \\"; + fi + done + fi + elif [ -d "$1" ]; then + dir_filelist "$1" + else + echo " ${prog}: Cannot open '$1'" >&2 + exit 1 + fi +} + +prog=$0 +root_uid=0 +root_gid=0 +dep_list= +cpio_file= +cpio_list= +output="/dev/stdout" +output_file="" +is_cpio_compressed= +compr="gzip -n -9 -f" + +arg="$1" +case "$arg" in + "-l") # files included in initramfs - used by kbuild + dep_list="list_" + echo "deps_initramfs := $0 \\" + shift + ;; + "-o") # generate compressed cpio image named $1 + shift + output_file="$1" + cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)" + output=${cpio_list} + echo "$output_file" | grep -q "\.gz$" \ + && [ -x "`which gzip 2> /dev/null`" ] \ + && compr="gzip -n -9 -f" + echo "$output_file" | grep -q "\.bz2$" \ + && [ -x "`which bzip2 2> /dev/null`" ] \ + && compr="bzip2 -9 -f" + echo "$output_file" | grep -q "\.lzma$" \ + && [ -x "`which lzma 2> /dev/null`" ] \ + && compr="lzma -9 -f" + echo "$output_file" | grep -q "\.xz$" \ + && [ -x "`which xz 2> /dev/null`" ] \ + && compr="xz --check=crc32 --lzma2=dict=1MiB" + echo "$output_file" | grep -q "\.lzo$" \ + && [ -x "`which lzop 2> /dev/null`" ] \ + && compr="lzop -9 -f" + echo "$output_file" | grep -q "\.lz4$" \ + && [ -x "`which lz4 2> /dev/null`" ] \ + && compr="lz4 -l -9 -f" + echo "$output_file" | grep -q "\.cpio$" && compr="cat" + shift + ;; +esac +while [ $# -gt 0 ]; do + arg="$1" + shift + case "$arg" in + "-u") # map $1 to uid=0 (root) + root_uid="$1" + [ "$root_uid" = "-1" ] && root_uid=$(id -u || echo 0) + shift + ;; + "-g") # map $1 to gid=0 (root) + root_gid="$1" + [ "$root_gid" = "-1" ] && root_gid=$(id -g || echo 0) + shift + ;; + "-d") # display default initramfs list + default_list="$arg" + ${dep_list}default_initramfs + ;; + "-h") + usage + exit 0 + ;; + *) + case "$arg" in + "-"*) + unknown_option + ;; + *) # input file/dir - process it + input_file "$arg" "$#" + ;; + esac + ;; + esac +done + +# If output_file is set we will generate cpio archive and compress it +# we are careful to delete tmp files +if [ ! -z ${output_file} ]; then + if [ -z ${cpio_file} ]; then + timestamp= + if test -n "$KBUILD_BUILD_TIMESTAMP"; then + timestamp="$(date -d"$KBUILD_BUILD_TIMESTAMP" +%s || :)" + if test -n "$timestamp"; then + timestamp="-t $timestamp" + fi + fi + cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)" + usr/gen_init_cpio $timestamp ${cpio_list} > ${cpio_tfile} + else + cpio_tfile=${cpio_file} + fi + rm ${cpio_list} + if [ "${is_cpio_compressed}" = "compressed" ]; then + cat ${cpio_tfile} > ${output_file} + else + (cat ${cpio_tfile} | ${compr} - > ${output_file}) \ + || (rm -f ${output_file} ; false) + fi + [ -z ${cpio_file} ] && rm ${cpio_tfile} +fi +exit 0 diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index bd090841f..48fccb105 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -1,9 +1,6 @@ # 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 @@ -25,8 +22,6 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_CPU_ARM_ARM11MPCORE default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_CPU_ARM_CORTEX_A53 default ADK_TARGET_LINUX_KERNEL_VERSION_4_14 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB default ADK_TARGET_LINUX_KERNEL_VERSION_4_19 if ADK_TARGET_ARCH_ARC -default ADK_TARGET_LINUX_KERNEL_VERSION_4_19 if ADK_TARGET_ARCH_MIPS -default ADK_TARGET_LINUX_KERNEL_VERSION_4_19 if ADK_TARGET_ARCH_MIPS64 default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 config ADK_TARGET_LINUX_KERNEL_VERSION_GIT @@ -40,9 +35,18 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK +config ADK_TARGET_LINUX_KERNEL_VERSION_5_10 + bool "5.10.17" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_BFIN + depends on !ADK_TARGET_ARCH_CRIS + depends on !ADK_TARGET_ARCH_FRV + depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_CPU_ARM_ARM11MPCORE + depends on !ADK_TARGET_CPU_ARM_CORTEX_A53 + config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 - bool "5.4.92" - select ADK_TARGET_LINUX_KERNEL_NEW + bool "5.4.99" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -52,8 +56,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 depends on !ADK_TARGET_CPU_ARM_CORTEX_A53 config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 - bool "4.19.151" - select ADK_TARGET_LINUX_KERNEL_NEW + bool "4.19.176" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -66,7 +69,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 depends on !ADK_TARGET_CPU_ARM_CORTEX_A53 config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 - bool "4.14.200" + bool "4.14.221" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -80,7 +83,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 depends on !ADK_TARGET_CPU_ARM_CORTEX_A53 config ADK_TARGET_LINUX_KERNEL_VERSION_4_9 - bool "4.9.238" + bool "4.9.257" depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_CSKY @@ -92,7 +95,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_9 depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 config ADK_TARGET_LINUX_KERNEL_VERSION_4_4 - bool "4.4.238" + bool "4.4.257" depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_CSKY depends on !ADK_TARGET_ARCH_NDS32 diff --git a/target/linux/patches/4.14.200/alpha-remove-coff.patch b/target/linux/patches/4.14.200/alpha-remove-coff.patch deleted file mode 100644 index 51b7bcc14..000000000 --- a/target/linux/patches/4.14.200/alpha-remove-coff.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Nur linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c linux-4.14.39/arch/alpha/boot/tools/objstrip.c ---- linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c 2018-05-01 21:58:27.000000000 +0200 -+++ linux-4.14.39/arch/alpha/boot/tools/objstrip.c 2018-05-22 12:36:55.166124565 +0200 -@@ -192,38 +192,8 @@ - prog_name, (long) elf_phdr->p_vaddr, - elf_phdr->p_vaddr + fil_size, offset); - } -- } else --#endif -- { -- aout = (struct exec *) buf; -- -- if (!(aout->fh.f_flags & COFF_F_EXEC)) { -- fprintf(stderr, "%s: %s is not in executable format\n", -- prog_name, inname); -- exit(1); -- } -- -- if (aout->fh.f_opthdr != sizeof(aout->ah)) { -- fprintf(stderr, "%s: %s has unexpected optional header size\n", -- prog_name, inname); -- exit(1); -- } -- -- if (N_MAGIC(*aout) != OMAGIC) { -- fprintf(stderr, "%s: %s is not an OMAGIC file\n", -- prog_name, inname); -- exit(1); -- } -- offset = N_TXTOFF(*aout); -- fil_size = aout->ah.tsize + aout->ah.dsize; -- mem_size = fil_size + aout->ah.bsize; -- -- if (verbose) { -- fprintf(stderr, "%s: extracting %#016lx-%#016lx (at %lx)\n", -- prog_name, aout->ah.text_start, -- aout->ah.text_start + fil_size, offset); -- } - } -+#endif - - if (lseek(fd, offset, SEEK_SET) != offset) { - perror("lseek"); diff --git a/target/linux/patches/4.14.200/arm-nommu.patch b/target/linux/patches/4.14.200/arm-nommu.patch deleted file mode 100644 index b91aaf712..000000000 --- a/target/linux/patches/4.14.200/arm-nommu.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Nur linux-4.14.30.orig/arch/arm/Kconfig linux-4.14.30/arch/arm/Kconfig ---- linux-4.14.30.orig/arch/arm/Kconfig 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/Kconfig 2018-04-01 04:14:15.989043313 +0100 -@@ -363,6 +363,17 @@ - select SPARSE_IRQ - select USE_OF - -+config ARM_SINGLE_ARCH_VERSATILE -+ bool "ARM Ltd. Versatile family" -+ depends on !MMU -+ select AUTO_ZRELADDR -+ select CLKSRC_OF -+ select COMMON_CLK -+ select GENERIC_CLOCKEVENTS -+ select GPIOLIB -+ select SPARSE_IRQ -+ select USE_OF -+ - config ARCH_EBSA110 - bool "EBSA-110" - select ARCH_USES_GETTIMEOFFSET -diff -Nur linux-4.14.30.orig/arch/arm/Kconfig.debug linux-4.14.30/arch/arm/Kconfig.debug ---- linux-4.14.30.orig/arch/arm/Kconfig.debug 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/Kconfig.debug 2018-04-01 04:14:15.990043300 +0100 -@@ -1777,7 +1777,8 @@ - config UNCOMPRESS_INCLUDE - string - default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ -- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M -+ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ -+ ARM_SINGLE_ARCH_VERSATILE - default "mach/uncompress.h" - - config EARLY_PRINTK -diff -Nur linux-4.14.30.orig/arch/arm/include/asm/mach/map.h linux-4.14.30/arch/arm/include/asm/mach/map.h ---- linux-4.14.30.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/include/asm/mach/map.h 2018-04-01 04:14:15.991043288 +0100 -@@ -62,6 +62,7 @@ - #else - #define iotable_init(map,num) do { } while (0) - #define vm_reserve_area_early(a,s,c) do { } while (0) -+#define debug_ll_io_init() do { } while (0) - #endif - - #endif -diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig linux-4.14.30/arch/arm/mach-versatile/Kconfig ---- linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/mach-versatile/Kconfig 2018-04-01 04:14:15.992043275 +0100 -@@ -1,7 +1,8 @@ - # SPDX-License-Identifier: GPL-2.0 - config ARCH_VERSATILE -- bool "ARM Ltd. Versatile family" -- depends on ARCH_MULTI_V5 -+ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 -+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE -+ default y if ARM_SINGLE_ARCH_VERSATILE - select ARM_AMBA - select ARM_TIMER_SP804 - select ARM_VIC -diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot linux-4.14.30/arch/arm/mach-versatile/Makefile.boot ---- linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.14.30/arch/arm/mach-versatile/Makefile.boot 2018-04-01 04:14:15.992043275 +0100 -@@ -0,0 +1,3 @@ -+# Empty file waiting for deletion once Makefile.boot isn't needed any more. -+# Patch waits for application at -+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . -diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c ---- linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 04:14:15.992043275 +0100 -@@ -37,7 +37,11 @@ - #include - - /* macro to get at MMIO space when running virtually */ -+#ifdef CONFIG_MMU - #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) -+#else -+#define IO_ADDRESS(x) (x) -+#endif - #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) - - /* diff --git a/target/linux/patches/4.14.200/arm-thumb2.patch b/target/linux/patches/4.14.200/arm-thumb2.patch deleted file mode 100644 index d8d1f4984..000000000 --- a/target/linux/patches/4.14.200/arm-thumb2.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur linux-4.14.34.orig/arch/arm/include/asm/assembler.h linux-4.14.34/arch/arm/include/asm/assembler.h ---- linux-4.14.34.orig/arch/arm/include/asm/assembler.h 2018-04-12 11:32:27.000000000 +0100 -+++ linux-4.14.34/arch/arm/include/asm/assembler.h 2018-04-21 17:29:06.424606334 +0100 -@@ -194,10 +194,9 @@ - */ - .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo - .macro badr\c, rd, sym --#ifdef CONFIG_THUMB2_KERNEL -- adr\c \rd, \sym + 1 --#else - adr\c \rd, \sym -+#ifdef CONFIG_THUMB2_KERNEL -+ orr\c \rd, \rd, 1 - #endif - .endm - .endr diff --git a/target/linux/patches/4.14.200/h8300.patch b/target/linux/patches/4.14.200/h8300.patch deleted file mode 100644 index 836a414e5..000000000 --- a/target/linux/patches/4.14.200/h8300.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.13.2.orig/arch/h8300/Kconfig.cpu linux-4.13.2/arch/h8300/Kconfig.cpu ---- linux-4.13.2.orig/arch/h8300/Kconfig.cpu 2017-09-13 23:21:49.000000000 +0200 -+++ linux-4.13.2/arch/h8300/Kconfig.cpu 2017-09-16 18:32:15.263759679 +0200 -@@ -96,4 +96,8 @@ - hex "Load offset" - default 0 - -+config RAMBASE -+ hex "RAM base address" -+ default 0x400000 -+ - endmenu diff --git a/target/linux/patches/4.14.200/initramfs-nosizelimit.patch b/target/linux/patches/4.14.200/initramfs-nosizelimit.patch deleted file mode 100644 index 0e524c1d9..000000000 --- a/target/linux/patches/4.14.200/initramfs-nosizelimit.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur linux-4.14.24.orig/init/do_mounts.c linux-4.14.24/init/do_mounts.c ---- linux-4.14.24.orig/init/do_mounts.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/do_mounts.c 2018-03-08 02:32:01.136927457 +0100 -@@ -604,6 +604,7 @@ - } - - static bool is_tmpfs; -+static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0"; - static struct dentry *rootfs_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, void *data) - { -@@ -616,6 +617,9 @@ - if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs) - fill = shmem_fill_super; - -+ if (is_tmpfs) -+ data = tmpfs_rootflags; -+ - return mount_nodev(fs_type, flags, data, fill); - } - diff --git a/target/linux/patches/4.14.200/microblaze-sigaltstack.patch b/target/linux/patches/4.14.200/microblaze-sigaltstack.patch deleted file mode 100644 index 80413890a..000000000 --- a/target/linux/patches/4.14.200/microblaze-sigaltstack.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S linux-4.14.39/arch/microblaze/kernel/syscall_table.S ---- linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S 2018-05-01 21:58:27.000000000 +0200 -+++ linux-4.14.39/arch/microblaze/kernel/syscall_table.S 2018-05-06 21:16:14.830349827 +0200 -@@ -187,7 +187,7 @@ - .long sys_getcwd - .long sys_capget - .long sys_capset /* 185 */ -- .long sys_ni_syscall /* sigaltstack */ -+ .long sys_sigaltstack - .long sys_sendfile - .long sys_ni_syscall /* reserved for streams1 */ - .long sys_ni_syscall /* reserved for streams2 */ diff --git a/target/linux/patches/4.14.200/or1k-more-ram.patch b/target/linux/patches/4.14.200/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/4.14.200/or1k-more-ram.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts ---- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 -+++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 -@@ -11,7 +11,7 @@ - - memory@0 { - device_type = "memory"; -- reg = <0x00000000 0x02000000>; -+ reg = <0x00000000 0x04000000>; - }; - - cpus { diff --git a/target/linux/patches/4.14.200/startup.patch b/target/linux/patches/4.14.200/startup.patch deleted file mode 100644 index bac354728..000000000 --- a/target/linux/patches/4.14.200/startup.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur linux-4.14.24.orig/init/initramfs.c linux-4.14.24/init/initramfs.c ---- linux-4.14.24.orig/init/initramfs.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/initramfs.c 2018-03-08 06:51:14.808479805 +0100 -@@ -659,6 +659,9 @@ - * us a chance to load before device_initcalls. - */ - load_default_modules(); -+#ifdef CONFIG_DEVTMPFS_MOUNT -+ devtmpfs_mount("dev"); -+#endif - - return 0; - } -diff -Nur linux-4.14.24.orig/init/main.c linux-4.14.24/init/main.c ---- linux-4.14.24.orig/init/main.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/main.c 2018-03-08 06:15:19.961419100 +0100 -@@ -1069,6 +1069,8 @@ - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - pr_err("Warning: unable to open an initial console.\n"); - -+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); -+ - (void) sys_dup(0); - (void) sys_dup(0); - /* -@@ -1077,7 +1079,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { - ramdisk_execute_command = NULL; diff --git a/target/linux/patches/4.14.200/vdso2.patch b/target/linux/patches/4.14.200/vdso2.patch deleted file mode 100644 index b6c32f31b..000000000 --- a/target/linux/patches/4.14.200/vdso2.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c linux-4.14.44/arch/x86/entry/vdso/vdso2c.c ---- linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c 2018-05-25 16:18:02.000000000 +0200 -+++ linux-4.14.44/arch/x86/entry/vdso/vdso2c.c 2018-05-31 02:09:00.000000000 +0200 -@@ -64,7 +64,15 @@ - #include - - #include -+#ifdef __linux__ - #include -+#else -+typedef _Bool bool; -+enum { -+ false = 0, -+ true = 1 -+}; -+#endif - - const char *outfilename; - -@@ -86,6 +94,7 @@ - sym_hvclock_page, - }; - -+ - struct vdso_sym { - const char *name; - bool export; diff --git a/target/linux/patches/4.14.221/alpha-remove-coff.patch b/target/linux/patches/4.14.221/alpha-remove-coff.patch new file mode 100644 index 000000000..51b7bcc14 --- /dev/null +++ b/target/linux/patches/4.14.221/alpha-remove-coff.patch @@ -0,0 +1,43 @@ +diff -Nur linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c linux-4.14.39/arch/alpha/boot/tools/objstrip.c +--- linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c 2018-05-01 21:58:27.000000000 +0200 ++++ linux-4.14.39/arch/alpha/boot/tools/objstrip.c 2018-05-22 12:36:55.166124565 +0200 +@@ -192,38 +192,8 @@ + prog_name, (long) elf_phdr->p_vaddr, + elf_phdr->p_vaddr + fil_size, offset); + } +- } else +-#endif +- { +- aout = (struct exec *) buf; +- +- if (!(aout->fh.f_flags & COFF_F_EXEC)) { +- fprintf(stderr, "%s: %s is not in executable format\n", +- prog_name, inname); +- exit(1); +- } +- +- if (aout->fh.f_opthdr != sizeof(aout->ah)) { +- fprintf(stderr, "%s: %s has unexpected optional header size\n", +- prog_name, inname); +- exit(1); +- } +- +- if (N_MAGIC(*aout) != OMAGIC) { +- fprintf(stderr, "%s: %s is not an OMAGIC file\n", +- prog_name, inname); +- exit(1); +- } +- offset = N_TXTOFF(*aout); +- fil_size = aout->ah.tsize + aout->ah.dsize; +- mem_size = fil_size + aout->ah.bsize; +- +- if (verbose) { +- fprintf(stderr, "%s: extracting %#016lx-%#016lx (at %lx)\n", +- prog_name, aout->ah.text_start, +- aout->ah.text_start + fil_size, offset); +- } + } ++#endif + + if (lseek(fd, offset, SEEK_SET) != offset) { + perror("lseek"); diff --git a/target/linux/patches/4.14.221/arm-nommu.patch b/target/linux/patches/4.14.221/arm-nommu.patch new file mode 100644 index 000000000..b91aaf712 --- /dev/null +++ b/target/linux/patches/4.14.221/arm-nommu.patch @@ -0,0 +1,81 @@ +diff -Nur linux-4.14.30.orig/arch/arm/Kconfig linux-4.14.30/arch/arm/Kconfig +--- linux-4.14.30.orig/arch/arm/Kconfig 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/Kconfig 2018-04-01 04:14:15.989043313 +0100 +@@ -363,6 +363,17 @@ + select SPARSE_IRQ + select USE_OF + ++config ARM_SINGLE_ARCH_VERSATILE ++ bool "ARM Ltd. Versatile family" ++ depends on !MMU ++ select AUTO_ZRELADDR ++ select CLKSRC_OF ++ select COMMON_CLK ++ select GENERIC_CLOCKEVENTS ++ select GPIOLIB ++ select SPARSE_IRQ ++ select USE_OF ++ + config ARCH_EBSA110 + bool "EBSA-110" + select ARCH_USES_GETTIMEOFFSET +diff -Nur linux-4.14.30.orig/arch/arm/Kconfig.debug linux-4.14.30/arch/arm/Kconfig.debug +--- linux-4.14.30.orig/arch/arm/Kconfig.debug 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/Kconfig.debug 2018-04-01 04:14:15.990043300 +0100 +@@ -1777,7 +1777,8 @@ + config UNCOMPRESS_INCLUDE + string + default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ +- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M ++ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ ++ ARM_SINGLE_ARCH_VERSATILE + default "mach/uncompress.h" + + config EARLY_PRINTK +diff -Nur linux-4.14.30.orig/arch/arm/include/asm/mach/map.h linux-4.14.30/arch/arm/include/asm/mach/map.h +--- linux-4.14.30.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/include/asm/mach/map.h 2018-04-01 04:14:15.991043288 +0100 +@@ -62,6 +62,7 @@ + #else + #define iotable_init(map,num) do { } while (0) + #define vm_reserve_area_early(a,s,c) do { } while (0) ++#define debug_ll_io_init() do { } while (0) + #endif + + #endif +diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig linux-4.14.30/arch/arm/mach-versatile/Kconfig +--- linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/mach-versatile/Kconfig 2018-04-01 04:14:15.992043275 +0100 +@@ -1,7 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + config ARCH_VERSATILE +- bool "ARM Ltd. Versatile family" +- depends on ARCH_MULTI_V5 ++ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 ++ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE ++ default y if ARM_SINGLE_ARCH_VERSATILE + select ARM_AMBA + select ARM_TIMER_SP804 + select ARM_VIC +diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot linux-4.14.30/arch/arm/mach-versatile/Makefile.boot +--- linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.14.30/arch/arm/mach-versatile/Makefile.boot 2018-04-01 04:14:15.992043275 +0100 +@@ -0,0 +1,3 @@ ++# Empty file waiting for deletion once Makefile.boot isn't needed any more. ++# Patch waits for application at ++# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . +diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c +--- linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 04:14:15.992043275 +0100 +@@ -37,7 +37,11 @@ + #include + + /* macro to get at MMIO space when running virtually */ ++#ifdef CONFIG_MMU + #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) ++#else ++#define IO_ADDRESS(x) (x) ++#endif + #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) + + /* diff --git a/target/linux/patches/4.14.221/arm-thumb2.patch b/target/linux/patches/4.14.221/arm-thumb2.patch new file mode 100644 index 000000000..d8d1f4984 --- /dev/null +++ b/target/linux/patches/4.14.221/arm-thumb2.patch @@ -0,0 +1,16 @@ +diff -Nur linux-4.14.34.orig/arch/arm/include/asm/assembler.h linux-4.14.34/arch/arm/include/asm/assembler.h +--- linux-4.14.34.orig/arch/arm/include/asm/assembler.h 2018-04-12 11:32:27.000000000 +0100 ++++ linux-4.14.34/arch/arm/include/asm/assembler.h 2018-04-21 17:29:06.424606334 +0100 +@@ -194,10 +194,9 @@ + */ + .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo + .macro badr\c, rd, sym +-#ifdef CONFIG_THUMB2_KERNEL +- adr\c \rd, \sym + 1 +-#else + adr\c \rd, \sym ++#ifdef CONFIG_THUMB2_KERNEL ++ orr\c \rd, \rd, 1 + #endif + .endm + .endr diff --git a/target/linux/patches/4.14.221/h8300.patch b/target/linux/patches/4.14.221/h8300.patch new file mode 100644 index 000000000..836a414e5 --- /dev/null +++ b/target/linux/patches/4.14.221/h8300.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.13.2.orig/arch/h8300/Kconfig.cpu linux-4.13.2/arch/h8300/Kconfig.cpu +--- linux-4.13.2.orig/arch/h8300/Kconfig.cpu 2017-09-13 23:21:49.000000000 +0200 ++++ linux-4.13.2/arch/h8300/Kconfig.cpu 2017-09-16 18:32:15.263759679 +0200 +@@ -96,4 +96,8 @@ + hex "Load offset" + default 0 + ++config RAMBASE ++ hex "RAM base address" ++ default 0x400000 ++ + endmenu diff --git a/target/linux/patches/4.14.221/initramfs-nosizelimit.patch b/target/linux/patches/4.14.221/initramfs-nosizelimit.patch new file mode 100644 index 000000000..0e524c1d9 --- /dev/null +++ b/target/linux/patches/4.14.221/initramfs-nosizelimit.patch @@ -0,0 +1,21 @@ +diff -Nur linux-4.14.24.orig/init/do_mounts.c linux-4.14.24/init/do_mounts.c +--- linux-4.14.24.orig/init/do_mounts.c 2018-03-03 10:24:39.000000000 +0100 ++++ linux-4.14.24/init/do_mounts.c 2018-03-08 02:32:01.136927457 +0100 +@@ -604,6 +604,7 @@ + } + + static bool is_tmpfs; ++static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0"; + static struct dentry *rootfs_mount(struct file_system_type *fs_type, + int flags, const char *dev_name, void *data) + { +@@ -616,6 +617,9 @@ + if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs) + fill = shmem_fill_super; + ++ if (is_tmpfs) ++ data = tmpfs_rootflags; ++ + return mount_nodev(fs_type, flags, data, fill); + } + diff --git a/target/linux/patches/4.14.221/microblaze-sigaltstack.patch b/target/linux/patches/4.14.221/microblaze-sigaltstack.patch new file mode 100644 index 000000000..80413890a --- /dev/null +++ b/target/linux/patches/4.14.221/microblaze-sigaltstack.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S linux-4.14.39/arch/microblaze/kernel/syscall_table.S +--- linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S 2018-05-01 21:58:27.000000000 +0200 ++++ linux-4.14.39/arch/microblaze/kernel/syscall_table.S 2018-05-06 21:16:14.830349827 +0200 +@@ -187,7 +187,7 @@ + .long sys_getcwd + .long sys_capget + .long sys_capset /* 185 */ +- .long sys_ni_syscall /* sigaltstack */ ++ .long sys_sigaltstack + .long sys_sendfile + .long sys_ni_syscall /* reserved for streams1 */ + .long sys_ni_syscall /* reserved for streams2 */ diff --git a/target/linux/patches/4.14.221/or1k-more-ram.patch b/target/linux/patches/4.14.221/or1k-more-ram.patch new file mode 100644 index 000000000..de848c838 --- /dev/null +++ b/target/linux/patches/4.14.221/or1k-more-ram.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts +--- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 ++++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 +@@ -11,7 +11,7 @@ + + memory@0 { + device_type = "memory"; +- reg = <0x00000000 0x02000000>; ++ reg = <0x00000000 0x04000000>; + }; + + cpus { diff --git a/target/linux/patches/4.14.221/startup.patch b/target/linux/patches/4.14.221/startup.patch new file mode 100644 index 000000000..bac354728 --- /dev/null +++ b/target/linux/patches/4.14.221/startup.patch @@ -0,0 +1,34 @@ +diff -Nur linux-4.14.24.orig/init/initramfs.c linux-4.14.24/init/initramfs.c +--- linux-4.14.24.orig/init/initramfs.c 2018-03-03 10:24:39.000000000 +0100 ++++ linux-4.14.24/init/initramfs.c 2018-03-08 06:51:14.808479805 +0100 +@@ -659,6 +659,9 @@ + * us a chance to load before device_initcalls. + */ + load_default_modules(); ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + + return 0; + } +diff -Nur linux-4.14.24.orig/init/main.c linux-4.14.24/init/main.c +--- linux-4.14.24.orig/init/main.c 2018-03-03 10:24:39.000000000 +0100 ++++ linux-4.14.24/init/main.c 2018-03-08 06:15:19.961419100 +0100 +@@ -1069,6 +1069,8 @@ + if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) + pr_err("Warning: unable to open an initial console.\n"); + ++ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); ++ + (void) sys_dup(0); + (void) sys_dup(0); + /* +@@ -1077,7 +1079,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { + ramdisk_execute_command = NULL; diff --git a/target/linux/patches/4.14.221/vdso2.patch b/target/linux/patches/4.14.221/vdso2.patch new file mode 100644 index 000000000..b6c32f31b --- /dev/null +++ b/target/linux/patches/4.14.221/vdso2.patch @@ -0,0 +1,27 @@ +diff -Nur linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c linux-4.14.44/arch/x86/entry/vdso/vdso2c.c +--- linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c 2018-05-25 16:18:02.000000000 +0200 ++++ linux-4.14.44/arch/x86/entry/vdso/vdso2c.c 2018-05-31 02:09:00.000000000 +0200 +@@ -64,7 +64,15 @@ + #include + + #include ++#ifdef __linux__ + #include ++#else ++typedef _Bool bool; ++enum { ++ false = 0, ++ true = 1 ++}; ++#endif + + const char *outfilename; + +@@ -86,6 +94,7 @@ + sym_hvclock_page, + }; + ++ + struct vdso_sym { + const char *name; + bool export; diff --git a/target/linux/patches/4.19.151/0001-Revert-ARC-entry-fix-potential-EFA-clobber-when-TIF_.patch b/target/linux/patches/4.19.151/0001-Revert-ARC-entry-fix-potential-EFA-clobber-when-TIF_.patch deleted file mode 100644 index 1215bb6d0..000000000 --- a/target/linux/patches/4.19.151/0001-Revert-ARC-entry-fix-potential-EFA-clobber-when-TIF_.patch +++ /dev/null @@ -1,66 +0,0 @@ -From af5e43cd88d4b7d59260de6bdacbf715e2a7ff5d Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 16 Oct 2020 01:17:24 +0200 -Subject: [PATCH] Revert "ARC: entry: fix potential EFA clobber when - TIF_SYSCALL_TRACE" - -This reverts commit 01b636cbc4c39c7073c02c2f1dfbe8c36c11938f. - -Signed-off-by: Waldemar Brodkorb ---- - arch/arc/kernel/entry.S | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S -index 705a68208423..85d9ea4a0acc 100644 ---- a/arch/arc/kernel/entry.S -+++ b/arch/arc/kernel/entry.S -@@ -156,6 +156,7 @@ END(EV_Extension) - tracesys: - ; save EFA in case tracer wants the PC of traced task - ; using ERET won't work since next-PC has already committed -+ lr r12, [efa] - GET_CURR_TASK_FIELD_PTR TASK_THREAD, r11 - st r12, [r11, THREAD_FAULT_ADDR] ; thread.fault_address - -@@ -198,9 +199,15 @@ tracesys_exit: - ; Breakpoint TRAP - ; --------------------------------------------- - trap_with_param: -- mov r0, r12 ; EFA in case ptracer/gdb wants stop_pc -+ -+ ; stop_pc info by gdb needs this info -+ lr r0, [efa] - mov r1, sp - -+ ; Now that we have read EFA, it is safe to do "fake" rtie -+ ; and get out of CPU exception mode -+ FAKE_RET_FROM_EXCPN -+ - ; Save callee regs in case gdb wants to have a look - ; SP will grow up by size of CALLEE Reg-File - ; NOTE: clobbers r12 -@@ -227,10 +234,6 @@ ENTRY(EV_Trap) - - EXCEPTION_PROLOGUE - -- lr r12, [efa] -- -- FAKE_RET_FROM_EXCPN -- - ;============ TRAP 1 :breakpoints - ; Check ECR for trap with arg (PROLOGUE ensures r9 has ECR) - bmsk.f 0, r9, 7 -@@ -238,6 +241,9 @@ ENTRY(EV_Trap) - - ;============ TRAP (no param): syscall top level - -+ ; First return from Exception to pure K mode (Exception/IRQs renabled) -+ FAKE_RET_FROM_EXCPN -+ - ; If syscall tracing ongoing, invoke pre-post-hooks - GET_CURR_THR_INFO_FLAGS r10 - btst r10, TIF_SYSCALL_TRACE --- -2.11.0 - diff --git a/target/linux/patches/4.19.151/arc.patch b/target/linux/patches/4.19.151/arc.patch deleted file mode 100644 index 20810ce64..000000000 --- a/target/linux/patches/4.19.151/arc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile ---- linux-4.17.1.orig/arch/arc/boot/Makefile 2018-06-11 22:43:19.000000000 +0200 -+++ linux-4.17.1/arch/arc/boot/Makefile 2018-06-16 18:28:02.000000000 +0200 -@@ -7,7 +7,7 @@ - - OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S - --LINUX_START_TEXT = $$(readelf -h vmlinux | \ -+LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ - grep "Entry point address" | grep -o 0x.*) - - UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.19.151/darwin-dtc.patch b/target/linux/patches/4.19.151/darwin-dtc.patch deleted file mode 100644 index 0cdc23ab4..000000000 --- a/target/linux/patches/4.19.151/darwin-dtc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur linux-4.19.132.orig/scripts/dtc/dtc.h linux-4.19.132/scripts/dtc/dtc.h ---- linux-4.19.132.orig/scripts/dtc/dtc.h 2020-07-09 09:37:13.000000000 +0200 -+++ linux-4.19.132/scripts/dtc/dtc.h 2020-07-15 02:38:00.000000000 +0200 -@@ -33,8 +33,8 @@ - #include - #include - --#include --#include -+#include "libfdt/libfdt_env.h" -+#include "libfdt/fdt.h" - - #include "util.h" - -diff -Nur linux-4.19.132.orig/scripts/dtc/util.c linux-4.19.132/scripts/dtc/util.c ---- linux-4.19.132.orig/scripts/dtc/util.c 2020-07-09 09:37:13.000000000 +0200 -+++ linux-4.19.132/scripts/dtc/util.c 2020-07-15 02:38:18.000000000 +0200 -@@ -32,7 +32,7 @@ - #include - #include - --#include "libfdt.h" -+#include "libfdt/libfdt.h" - #include "util.h" - #include "version_gen.h" - diff --git a/target/linux/patches/4.19.151/darwin-file2alias.patch b/target/linux/patches/4.19.151/darwin-file2alias.patch deleted file mode 100644 index fdbc598a8..000000000 --- a/target/linux/patches/4.19.151/darwin-file2alias.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur linux-5.4.42.orig/scripts/mod/file2alias.c linux-5.4.42/scripts/mod/file2alias.c ---- linux-5.4.42.orig/scripts/mod/file2alias.c 2020-05-20 08:20:41.000000000 +0200 -+++ linux-5.4.42/scripts/mod/file2alias.c 2020-06-06 20:14:59.000000000 +0200 -@@ -10,6 +10,10 @@ - * of the GNU General Public License, incorporated herein by reference. - */ - -+/* workaround for Darwin */ -+#define _UUID_T -+#define __GETHOSTUUID_H -+ - #include "modpost.h" - #include "devicetable-offsets.h" - diff --git a/target/linux/patches/4.19.151/fec-coldfire.patch b/target/linux/patches/4.19.151/fec-coldfire.patch deleted file mode 100644 index 09d8ad047..000000000 --- a/target/linux/patches/4.19.151/fec-coldfire.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -Nur linux-4.19.75.orig/drivers/net/ethernet/freescale/fec_main.c linux-4.19.75/drivers/net/ethernet/freescale/fec_main.c ---- linux-4.19.75.orig/drivers/net/ethernet/freescale/fec_main.c 2019-09-21 07:17:15.000000000 +0200 -+++ linux-4.19.75/drivers/net/ethernet/freescale/fec_main.c 2019-10-10 01:17:45.284188283 +0200 -@@ -156,7 +156,7 @@ - module_param_array(macaddr, byte, NULL, 0); - MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); - --#if defined(CONFIG_M5272) -+#if defined(CONFIG_COLDFIRE) - /* - * Some hardware gets it MAC address out of local flash memory. - * if this is non-zero then assume it is the address to get MAC from. -@@ -174,7 +174,7 @@ - #else - #define FEC_FLASHMAC 0 - #endif --#endif /* CONFIG_M5272 */ -+#endif /* CONFIG_COLDFIRE */ - - /* The FEC stores dest/src/type/vlan, data, and checksum for receive packets. - * -@@ -958,7 +958,7 @@ - /* Set MII speed */ - writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED); - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - if (fep->quirks & FEC_QUIRK_HAS_RACC) { - val = readl(fep->hwp + FEC_RACC); - /* align IP header */ -@@ -1027,7 +1027,7 @@ - #endif - } - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - /* enable pause frame*/ - if ((fep->pause_flag & FEC_PAUSE_FLAG_ENABLE) || - ((fep->pause_flag & FEC_PAUSE_FLAG_AUTONEG) && -@@ -1045,13 +1045,13 @@ - } else { - rcntl &= ~FEC_ENET_FCE; - } --#endif /* !defined(CONFIG_M5272) */ -+#endif /* !defined(CONFIG_COLDFIRE) */ - - writel(rcntl, fep->hwp + FEC_R_CNTRL); - - /* Setup multicast filter. */ - set_multicast_list(ndev); --#ifndef CONFIG_M5272 -+#ifndef CONFIG_COLDFIRE - writel(0, fep->hwp + FEC_HASH_TABLE_HIGH); - writel(0, fep->hwp + FEC_HASH_TABLE_LOW); - #endif -@@ -1066,7 +1066,7 @@ - if (fep->bufdesc_ex) - ecntl |= (1 << 4); - --#ifndef CONFIG_M5272 -+#ifndef CONFIG_COLDFIRE - /* Enable the MIB statistic event counters */ - writel(0 << 31, fep->hwp + FEC_MIB_CTRLSTAT); - #endif -@@ -1664,7 +1664,7 @@ - * 3) from flash or fuse (via platform data) - */ - if (!is_valid_ether_addr(iap)) { --#ifdef CONFIG_M5272 -+#ifdef CONFIG_COLDFIRE - if (FEC_FLASHMAC) - iap = (unsigned char *)FEC_FLASHMAC; - #else -@@ -1943,7 +1943,7 @@ - if (fep->quirks & FEC_QUIRK_HAS_GBIT) { - phy_dev->supported &= PHY_GBIT_FEATURES; - phy_dev->supported &= ~SUPPORTED_1000baseT_Half; --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - phy_dev->supported |= SUPPORTED_Pause; - #endif - } -@@ -2199,7 +2199,7 @@ - } - } - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - - static void fec_enet_get_pauseparam(struct net_device *ndev, - struct ethtool_pauseparam *pause) -@@ -2391,7