diff --git a/patches/openwrt/5.15-kernel-configuration/0022-mvebu-cortexa53-create-specific-config-for-kernel-5..patch b/patches/openwrt/5.15-kernel-configuration/0022-mvebu-cortexa53-create-specific-config-for-kernel-5..patch deleted file mode 100644 index e54e88a8abc20b3664bb97d374bd3e17e3792e67..0000000000000000000000000000000000000000 --- a/patches/openwrt/5.15-kernel-configuration/0022-mvebu-cortexa53-create-specific-config-for-kernel-5..patch +++ /dev/null @@ -1,27 +0,0 @@ -From 462446e0715618ddfa1e7ba49718d1bc16edc77a Mon Sep 17 00:00:00 2001 -From: Josef Schlehofer <pepe.schlehofer@gmail.com> -Date: Wed, 27 Jul 2022 13:48:41 +0200 -Subject: [PATCH] mvebu: cortexa53: create specific config for kernel 5.15 - -Fixes: -https://gitlab.nic.cz/turris/os/build/-/issues/348 ---- - target/linux/mvebu/cortexa53/config-5.15 | 6 ++++++ - 1 file changed, 6 insertions(+) - create mode 100644 target/linux/mvebu/cortexa53/config-5.15 - -diff --git a/target/linux/mvebu/cortexa53/config-5.15 b/target/linux/mvebu/cortexa53/config-5.15 -new file mode 100644 -index 0000000000..79a7743089 ---- /dev/null -+++ b/target/linux/mvebu/cortexa53/config-5.15 -@@ -0,0 +1,6 @@ -+#Enable Earlyprintk for easier UART debugging -+#https://gitlab.nic.cz/turris/os/build/-/issues/348 -+ -+CONFIG_CMDLINE="earlycon=ar3700_uart,0xd0012000 console=ttyMV0,115200" -+CONFIG_CMDLINE_FROM_BOOTLOADER=y -+CONFIG_SERIAL_EARLYCON=y --- -2.34.1 - diff --git a/patches/openwrt/to-upstream/0048-mvebu-cortexa53-enable-earlyprintk.patch b/patches/openwrt/to-upstream/0048-mvebu-cortexa53-enable-earlyprintk.patch new file mode 100644 index 0000000000000000000000000000000000000000..8387f06ed16baefce765d3cae4e55a4c59548b70 --- /dev/null +++ b/patches/openwrt/to-upstream/0048-mvebu-cortexa53-enable-earlyprintk.patch @@ -0,0 +1,23 @@ +From f7512dcf9406e017a7bfdd19b87e552fc482339e Mon Sep 17 00:00:00 2001 +From: Josef Schlehofer <pepe.schlehofer@gmail.com> +Date: Wed, 27 Jul 2022 14:04:21 +0200 +Subject: [PATCH] mvebu: cortexa53: enable earlyprintk + +--- + target/linux/mvebu/cortexa53/config-5.15 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/target/linux/mvebu/cortexa53/config-5.15 b/target/linux/mvebu/cortexa53/config-5.15 +index 955570cd54..c29a13ce73 100644 +--- a/target/linux/mvebu/cortexa53/config-5.15 ++++ b/target/linux/mvebu/cortexa53/config-5.15 +@@ -98,3 +98,6 @@ CONFIG_CRYPTO_SHA256_ARM64=y + CONFIG_CRYPTO_SHA2_ARM64_CE=y + CONFIG_CRYPTO_SHA512_ARM64=y + CONFIG_CRYPTO_CHACHA20_NEON=y ++CONFIG_CMDLINE="earlycon=ar3700_uart,0xd0012000 console=ttyMV0,115200" ++CONFIG_CMDLINE_FROM_BOOTLOADER=y ++CONFIG_SERIAL_EARLYCON=y +-- +2.34.1 +