From c3c48556ae484f9d95bb19ef98da5425f146bdc0 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 3 Sep 2021 13:44:42 +0200 Subject: [PATCH] Linux: Update kernel 5.10.61 for ODROID-N2 (#1512) (#1528) * Linux: Update kernel 5.10.61 for ODROID-N2 (#1512) Update the kernel to 5.10.61 for ODROID-N2 and fix the update script to update kernel for ODROID-N2 next time too. * Move ODROID kernel patches to non-kernel version specific directory --- ...1-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch | 0 .../0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch | 0 ...03-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch | 0 .../0004-arm64-dts-meson-g12b-add-power-button-support.patch | 0 .../0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch | 0 ...6-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch | 0 .../{5.10.53 => }/0007-arm64-dts-meson-add-uart_A-node.patch | 0 .../0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch | 0 ...9-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch | 0 .../linux/{5.10.45 => }/board-odroidc2-add-uartA-uartC.patch | 0 .../linux/{5.10.45 => }/general-meson64-i2cX-missing-pins.patch | 0 .../hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch | 0 .../hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch | 0 buildroot-external/configs/odroid_n2_defconfig | 2 +- scripts/update-kernel-upstream.sh | 2 +- 15 files changed, 2 insertions(+), 2 deletions(-) rename buildroot-external/board/hardkernel/patches/linux/{5.10.53 => }/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.53 => }/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.53 => }/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.53 => }/0004-arm64-dts-meson-g12b-add-power-button-support.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.53 => }/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.53 => }/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.53 => }/0007-arm64-dts-meson-add-uart_A-node.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.53 => }/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.53 => }/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.45 => }/board-odroidc2-add-uartA-uartC.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.45 => }/general-meson64-i2cX-missing-pins.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.45 => }/hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch (100%) rename buildroot-external/board/hardkernel/patches/linux/{5.10.45 => }/hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch (100%) diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.53/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch rename to buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.53/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch rename to buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.53/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch rename to buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0004-arm64-dts-meson-g12b-add-power-button-support.patch b/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12b-add-power-button-support.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.53/0004-arm64-dts-meson-g12b-add-power-button-support.patch rename to buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12b-add-power-button-support.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch b/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.53/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch rename to buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch b/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.53/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch rename to buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0007-arm64-dts-meson-add-uart_A-node.patch b/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-add-uart_A-node.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.53/0007-arm64-dts-meson-add-uart_A-node.patch rename to buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-add-uart_A-node.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.53/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch rename to buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch b/buildroot-external/board/hardkernel/patches/linux/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.53/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch rename to buildroot-external/board/hardkernel/patches/linux/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.45/board-odroidc2-add-uartA-uartC.patch b/buildroot-external/board/hardkernel/patches/linux/board-odroidc2-add-uartA-uartC.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.45/board-odroidc2-add-uartA-uartC.patch rename to buildroot-external/board/hardkernel/patches/linux/board-odroidc2-add-uartA-uartC.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.45/general-meson64-i2cX-missing-pins.patch b/buildroot-external/board/hardkernel/patches/linux/general-meson64-i2cX-missing-pins.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.45/general-meson64-i2cX-missing-pins.patch rename to buildroot-external/board/hardkernel/patches/linux/general-meson64-i2cX-missing-pins.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.45/hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch b/buildroot-external/board/hardkernel/patches/linux/hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.45/hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch rename to buildroot-external/board/hardkernel/patches/linux/hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.45/hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch b/buildroot-external/board/hardkernel/patches/linux/hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/5.10.45/hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch rename to buildroot-external/board/hardkernel/patches/linux/hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index 0254e4c43..71c791175 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.53" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.61" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config" diff --git a/scripts/update-kernel-upstream.sh b/scripts/update-kernel-upstream.sh index 909cf0479..0b163fbbd 100755 --- a/scripts/update-kernel-upstream.sh +++ b/scripts/update-kernel-upstream.sh @@ -6,7 +6,7 @@ if [ -z "$1" ]; then exit 1 fi -defconfigs=(buildroot-external/configs/{generic_x86_64,ova,tinker,odroid_c*,odroid_xu4}_defconfig) +defconfigs=(buildroot-external/configs/{generic_x86_64,ova,tinker,odroid_*}_defconfig) sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" "${defconfigs[@]}" sed -i "s/| \(Open Virtual Appliance\|Generic x86-64\|Tinker Board\|Odroid-.*\) | .* |/| \1 | $1 |/g" Documentation/kernel.md git commit -m "Linux: Update kernel $1" "${defconfigs[@]}" Documentation/kernel.md