From 6f8b31b2d01c65a3100eadacc4ee7da3f5c669b8 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 27 Jun 2024 10:50:28 +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 | 4 +-- ...gic-odroid-n2-remove-amlogic-prefix-.patch | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch 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..32f798a931 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 0d04eb6409191d48adc9e1d347a94af06d84351e 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/2] 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..1988f1e9ed --- /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 e4e38f7442b36cba26eae9edc69f7804e87a6a36 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 3 Aug 2021 18:42:55 +0000 +Subject: [PATCH 2/2] 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 a4bcc62174a..f840afbfd67 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 +