aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-rcar_gen3-plat-Do-not-panic-on-unrecognized-boards.patch
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-10-04 11:43:39 -0400
committerScott Murray <scott.murray@konsulko.com>2021-10-27 11:29:29 -0400
commit92da06f999511ebf5f871ec40dffd3cb456be55f (patch)
tree9c914eb058ba06839ca3f4d76b89789711dd049e /meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-rcar_gen3-plat-Do-not-panic-on-unrecognized-boards.patch
parentc79268a6d2d2a5445e8fdfd4bb7af536cdab7115 (diff)
Changes: - Kernel patches updated for the 5.10.41 linux-renesas kernel, most changes are for the upstream rename of the non-engineering sample H3 from r8a7795 to r8a77951. - The kernel patches have been renamed to match git format-patch / devtool naming conventions to be a bit more consistent and hopefully simplify future updates. - To maintain consistency with the other rcar3 boards, as part of the kernel patch updates the reference hardware devicetree has been renamed to r8a77951-agl-refhw, which does result in a user visible change in the .dtb name. - The upstreamed, then reverted upstream patch to arm-trusted-firmware to disable FDT generation has been replaced with a simpler patch to just put "renesas,unknown" in the compatible string instead of panic-ing. This should be easier to carry forward. - Documentation updated for new branch & tag. Bug-AGL: SPEC-4103 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I48b2cce5d55df3fff49e556821b27b8f516b98e1
Diffstat (limited to 'meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-rcar_gen3-plat-Do-not-panic-on-unrecognized-boards.patch')
-rw-r--r--meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-rcar_gen3-plat-Do-not-panic-on-unrecognized-boards.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-rcar_gen3-plat-Do-not-panic-on-unrecognized-boards.patch b/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-rcar_gen3-plat-Do-not-panic-on-unrecognized-boards.patch
new file mode 100644
index 0000000..4b51f37
--- /dev/null
+++ b/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-rcar_gen3-plat-Do-not-panic-on-unrecognized-boards.patch
@@ -0,0 +1,36 @@
+From 61ffc5ec5ad1755d5d22b4386f8ad027bb59e1d5 Mon Sep 17 00:00:00 2001
+From: Scott Murray <scott.murray@konsulko.com>
+Date: Tue, 5 Oct 2021 12:10:23 -0400
+Subject: [PATCH] rcar_gen3: plat: Do not panic on unrecognized boards
+
+Replace the panic in bl2_populate_compatible_string with just putting
+"unknown" into the compatible string for the FDT. This allows us to
+boot on the AGL reference hardware where the board type seems
+unavailable.
+
+Upstream-Status: Inappropriate [board specific usecase]
+
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+---
+ plat/renesas/rcar/bl2_plat_setup.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/plat/renesas/rcar/bl2_plat_setup.c b/plat/renesas/rcar/bl2_plat_setup.c
+index bf077c483..7fcc75a13 100644
+--- a/plat/renesas/rcar/bl2_plat_setup.c
++++ b/plat/renesas/rcar/bl2_plat_setup.c
+@@ -489,8 +489,9 @@ static void bl2_populate_compatible_string(void *dt)
+ "renesas,draak");
+ break;
+ default:
+- NOTICE("BL2: Cannot set compatible string, board unsupported\n");
+- panic();
++ ret = fdt_setprop_string(dt, 0, "compatible",
++ "renesas,unknown");
++ break;
+ }
+
+ if (ret < 0) {
+--
+2.31.1
+