]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: socfpga: fix 3 boards missing env var "socfpga_legacy_reset_compat"
authorSimon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Wed, 10 Jul 2019 20:09:14 +0000 (22:09 +0200)
committerMarek Vasut <marex@denx.de>
Sun, 21 Jul 2019 10:45:01 +0000 (12:45 +0200)
This fixes 3 boards that don't use CONFIG_EXTRA_ENV_SETTINGS from
socfpga_common.h. They need to enable reset manager compatibility
mode unless all peripheral drivers in Linux support reset handling.

Fixes: commit 4b2e32efa4e7 ("arm: socfpga: gen5: deassert peripheral reset by default")
Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Reported-by: Wolfgang Grandegger <wg@aries-embedded.de>
include/configs/socfpga_dbm_soc1.h
include/configs/socfpga_stratix10_socdk.h
include/configs/socfpga_vining_fpga.h

index b36d7e56fb154bd7c310deaf724a72beca161588..fc1db2442eeabade2df877bb9e3a0c1227647e70 100644 (file)
@@ -87,7 +87,8 @@
                        "echo Running bootscript... ; "                 \
                        "source ${kernel_addr_r} ; "                    \
                "fi ; "                                                 \
-               "fi\0"
+               "fi\0"                                                  \
+       "socfpga_legacy_reset_compat=1\0"
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
index 8d2971c6e231de6f4314c99551fed13d1a3a3b99..90ad8172e22baf2c4b161c65b5f7d28f66fff360 100644 (file)
@@ -113,7 +113,8 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
        "scriptaddr=0x02100000\0" \
        "scriptfile=u-boot.scr\0" \
        "fatscript=if fatload mmc 0:1 ${scriptaddr} ${scriptfile};" \
-                  "then source ${scriptaddr}; fi\0"
+                  "then source ${scriptaddr}; fi\0" \
+       "socfpga_legacy_reset_compat=1\0"
 
 /*
  * Generic Interrupt Controller Definitions
index 29a92b91468701bdede9729151abf5c170f0cef1..5416c4b170085ce1ab696f94312d053bdea1835b 100644 (file)
                        "run ubi_ubi ; "                                \
                "else echo \"Unsupported boot mode: \"${bootmode} ; "   \
                "fi\0"                                                  \
+               "socfpga_legacy_reset_compat=1\0"
 
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE