From d7ea2b218402fd4b4a5ecfff07a3edf4c13d38df Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 27 Jun 2024 10:59:49 +0000 Subject: [PATCH] u-boot: update Amlogic patches to fix Odroid N2 boot Signed-off-by: Christian Hewitt --- ...son64-prevent-stdout-stderr-on-video.patch | 2 +- ...gic-odroid-n2-remove-amlogic-prefix-.patch | 29 +++++++++++++++++++ ...net-Add-Amlogic-GXL-MDIO-Mux-driver.patch} | 4 +-- ...ts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch} | 4 +-- ...ogic-fix-buffler-overflow-in-serial.patch} | 6 ++-- ...dts-fix-Ethernet-on-WeTek-Hub-Play2.patch} | 4 +-- ...ogic-add-meson_generate_serial_etha.patch} | 4 +-- 7 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch rename projects/Amlogic/patches/u-boot/{u-boot-0002-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch => u-boot-0003-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch} (97%) rename projects/Amlogic/patches/u-boot/{u-boot-0003-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch => u-boot-0004-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch} (99%) rename projects/Amlogic/patches/u-boot/{u-boot-0004-FROMGIT-board-amlogic-fix-buffler-overflow-in-serial.patch => u-boot-0005-FROMGIT-board-amlogic-fix-buffler-overflow-in-serial.patch} (98%) rename projects/Amlogic/patches/u-boot/{u-boot-0005-FROMGIT-ARM-dts-fix-Ethernet-on-WeTek-Hub-Play2.patch => u-boot-0006-FROMGIT-ARM-dts-fix-Ethernet-on-WeTek-Hub-Play2.patch} (92%) rename projects/Amlogic/patches/u-boot/{u-boot-0006-FROMGIT-board-amlogic-add-meson_generate_serial_etha.patch => u-boot-0007-FROMGIT-board-amlogic-add-meson_generate_serial_etha.patch} (87%) diff --git a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch index 947bad2859..fb803737ea 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch @@ -1,7 +1,7 @@ From db00d83004cdd497b491ce348f1ccd53f1394c9a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 13 Nov 2020 02:09:36 +0000 -Subject: [PATCH 1/6] LOCAL: configs: meson64: prevent stdout/stderr on +Subject: [PATCH 1/7] LOCAL: configs: meson64: prevent stdout/stderr on videoconsole Several devices have CONFIG_VIDEO enabled which causes stdout/stderr diff --git a/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch new file mode 100644 index 0000000000..717be4118e --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch @@ -0,0 +1,29 @@ +From 80acdb7f8b027db8953b7067d29ee2283bde42bb Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 3 Aug 2021 18:42:55 +0000 +Subject: [PATCH 2/7] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ prefix + for dtb path + +Remove the /amlogic/ prefix to align with current LE dtb locations. + +Signed-off-by: Christian Hewitt +--- + board/amlogic/odroid-n2/odroid-n2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c +index 2135457edd9..ec1f4efc113 100644 +--- a/board/amlogic/odroid-n2/odroid-n2.c ++++ b/board/amlogic/odroid-n2/odroid-n2.c +@@ -63,7 +63,7 @@ static void odroid_set_fdtfile(char *soc, char *variant) + { + char s[128]; + +- snprintf(s, sizeof(s), "amlogic/meson-%s-odroid-%s.dtb", soc, variant); ++ snprintf(s, sizeof(s), "meson-%s-odroid-%s.dtb", soc, variant); + env_set("fdtfile", s); + } + +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0002-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch b/projects/Amlogic/patches/u-boot/u-boot-0003-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch similarity index 97% rename from projects/Amlogic/patches/u-boot/u-boot-0002-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch rename to projects/Amlogic/patches/u-boot/u-boot-0003-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch index 58c6cfed47..839080b545 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0002-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0003-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch @@ -1,7 +1,7 @@ -From 5bf96e879251fdbce4cab01c1efb1157070f6ffc Mon Sep 17 00:00:00 2001 +From 91a49a0d363d5437b8e2f2dc4757e89cb7f46d94 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Wed, 13 Dec 2023 10:30:12 +0100 -Subject: [PATCH 2/6] FROMGIT: net: Add Amlogic GXL MDIO Mux driver +Subject: [PATCH 3/7] FROMGIT: net: Add Amlogic GXL MDIO Mux driver Port the mdio-mux-meson-gxl.c Linux driver introduced in [1], and adapt it to U-Boot. diff --git a/projects/Amlogic/patches/u-boot/u-boot-0003-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch b/projects/Amlogic/patches/u-boot/u-boot-0004-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch similarity index 99% rename from projects/Amlogic/patches/u-boot/u-boot-0003-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch rename to projects/Amlogic/patches/u-boot/u-boot-0004-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch index b1bd91adec..b880018c5a 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0003-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0004-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch @@ -1,7 +1,7 @@ -From f7cb3ada3688afbc79598b02c59a2e9c561fec7f Mon Sep 17 00:00:00 2001 +From 0e5c2f955fb3029a9bd2194bd4d87fa56601e573 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Wed, 13 Dec 2023 10:30:13 +0100 -Subject: [PATCH 3/6] FROMGIT: ARM: dts: sync Amlogic GX DT to Linux v6.4 +Subject: [PATCH 4/7] FROMGIT: ARM: dts: sync Amlogic GX DT to Linux v6.4 Sync Amlogic GXBB, GXL & GXM DTs from Linux v6.4, and also switch to GXL MDIO MUX driver to adapt to DT change, diff --git a/projects/Amlogic/patches/u-boot/u-boot-0004-FROMGIT-board-amlogic-fix-buffler-overflow-in-serial.patch b/projects/Amlogic/patches/u-boot/u-boot-0005-FROMGIT-board-amlogic-fix-buffler-overflow-in-serial.patch similarity index 98% rename from projects/Amlogic/patches/u-boot/u-boot-0004-FROMGIT-board-amlogic-fix-buffler-overflow-in-serial.patch rename to projects/Amlogic/patches/u-boot/u-boot-0005-FROMGIT-board-amlogic-fix-buffler-overflow-in-serial.patch index f201006c21..c2814918ae 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0004-FROMGIT-board-amlogic-fix-buffler-overflow-in-serial.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0005-FROMGIT-board-amlogic-fix-buffler-overflow-in-serial.patch @@ -1,7 +1,7 @@ -From f1ef120a45f47ce8f2a2fd554e4fa9d9a14ed42e Mon Sep 17 00:00:00 2001 +From 5feaed938c81cff592dbb7843fecba98a24ed105 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Wed, 20 Mar 2024 09:46:11 +0100 -Subject: [PATCH 4/6] FROMGIT: board: amlogic: fix buffler overflow in serial, +Subject: [PATCH 5/7] FROMGIT: board: amlogic: fix buffler overflow in serial, mac & usid read While meson_sm_read_efuse() doesn't overflow, the string is not @@ -107,7 +107,7 @@ index 185880de139..0b781666e98 100644 env_set("usid", usid); } diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c -index 2135457edd9..a4bcc62174a 100644 +index ec1f4efc113..f840afbfd67 100644 --- a/board/amlogic/odroid-n2/odroid-n2.c +++ b/board/amlogic/odroid-n2/odroid-n2.c @@ -107,7 +107,7 @@ static int odroid_detect_variant(void) diff --git a/projects/Amlogic/patches/u-boot/u-boot-0005-FROMGIT-ARM-dts-fix-Ethernet-on-WeTek-Hub-Play2.patch b/projects/Amlogic/patches/u-boot/u-boot-0006-FROMGIT-ARM-dts-fix-Ethernet-on-WeTek-Hub-Play2.patch similarity index 92% rename from projects/Amlogic/patches/u-boot/u-boot-0005-FROMGIT-ARM-dts-fix-Ethernet-on-WeTek-Hub-Play2.patch rename to projects/Amlogic/patches/u-boot/u-boot-0006-FROMGIT-ARM-dts-fix-Ethernet-on-WeTek-Hub-Play2.patch index 01e405ff8e..ef3f2d3905 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0005-FROMGIT-ARM-dts-fix-Ethernet-on-WeTek-Hub-Play2.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0006-FROMGIT-ARM-dts-fix-Ethernet-on-WeTek-Hub-Play2.patch @@ -1,7 +1,7 @@ -From 20c327bd28ce28a81bb8524b68c23c029b6df96d Mon Sep 17 00:00:00 2001 +From 8c848d4d2cf809d94c5cde3feafe156a4d4f6faf Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 7 Mar 2024 16:11:17 +0000 -Subject: [PATCH 5/6] FROMGIT: ARM: dts: fix Ethernet on WeTek Hub/Play2 +Subject: [PATCH 6/7] FROMGIT: ARM: dts: fix Ethernet on WeTek Hub/Play2 Placing the snps,reset content needed for Ethernet to probe in a common uboot.dtsi results in the content not being used and broken Ethernet. Fix this by creating two diff --git a/projects/Amlogic/patches/u-boot/u-boot-0006-FROMGIT-board-amlogic-add-meson_generate_serial_etha.patch b/projects/Amlogic/patches/u-boot/u-boot-0007-FROMGIT-board-amlogic-add-meson_generate_serial_etha.patch similarity index 87% rename from projects/Amlogic/patches/u-boot/u-boot-0006-FROMGIT-board-amlogic-add-meson_generate_serial_etha.patch rename to projects/Amlogic/patches/u-boot/u-boot-0007-FROMGIT-board-amlogic-add-meson_generate_serial_etha.patch index c9e16713fa..8fb448500e 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0006-FROMGIT-board-amlogic-add-meson_generate_serial_etha.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0007-FROMGIT-board-amlogic-add-meson_generate_serial_etha.patch @@ -1,7 +1,7 @@ -From a915f25cf7f89f056dd2d0cdcbc2f1f1787ae5c0 Mon Sep 17 00:00:00 2001 +From 860810facd7b4cdeb212edbd915d00c848f4d966 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 23 Mar 2024 09:59:30 +0000 -Subject: [PATCH 6/6] FROMGIT: board: amlogic: add +Subject: [PATCH 7/7] FROMGIT: board: amlogic: add meson_generate_serial_ethaddr fallback to p200 Add a fall-back method to generate ethaddr from CPU serial on p200 boards