]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board: fix compatible property Milk-V Mars CM
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Fri, 19 Jul 2024 23:11:58 +0000 (01:11 +0200)
committerLeo Yu-Chi Liang <ycliang@andestech.com>
Tue, 10 Sep 2024 02:10:43 +0000 (10:10 +0800)
For the Milk-V Mars CM (lite) we have only been copying sizeof(void *)
bytes to the compatible property instead of the whole string list.

Fixes: de3229599d4f ("board: add support for Milk-V Mars CM")
Reported-by: E Shattow <lucent@gmail.com>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
board/starfive/visionfive2/spl.c

index b794b73b6bd7969f5fd0816397c903ced9c31776..f55c6b5d34cb289bc5a53652a56e5d0f09229c92 100644 (file)
@@ -170,23 +170,32 @@ void spl_fdt_fixup_mars_cm(void *fdt)
 {
        const char *compat;
        const char *model;
+       int compat_size;
 
        spl_fdt_fixup_mars(fdt);
 
        if (!get_mmc_size_from_eeprom()) {
                int offset;
+               static const char
+               compat_cm_lite[] = "milkv,mars-cm-lite\0starfive,jh7110";
 
                model = "Milk-V Mars CM Lite";
-               compat = "milkv,mars-cm-lite\0starfive,jh7110";
+               compat = compat_cm_lite;
+               compat_size = sizeof(compat_cm_lite);
 
                offset = fdt_path_offset(fdt, "/soc/pinctrl/mmc0-pins/mmc0-pins-rest");
                /* GPIOMUX(22, GPOUT_SYS_SDIO0_RST, GPOEN_ENABLE, GPI_NONE) */
                fdt_setprop_u32(fdt, offset, "pinmux", 0xff130016);
        } else {
+               static const char
+               compat_cm[] = "milkv,mars-cm\0starfive,jh7110";
+
                model = "Milk-V Mars CM";
-               compat = "milkv,mars-cm\0starfive,jh7110";
+               compat = compat_cm;
+               compat_size = sizeof(compat_cm);
        }
-       fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat));
+       fdt_setprop(fdt, fdt_path_offset(fdt, "/"),
+                   "compatible", compat, compat_size);
        fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", model);
 }