summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-03-08 07:11:26 -0500
committerTom Rini <trini@konsulko.com>2021-03-08 07:41:40 -0500
commitb0a75dda7e542c9ddea685ceb2251118638829d5 (patch)
treee08d4455441a4c1391264f3def8d71354510633a /include
parent90964ab5acb29ec6617a9ff340886230b2fce8c7 (diff)
parent9773ebcfbca23c7d6fe1dc202913b005bc23cc89 (diff)
downloadu-boot-b0a75dda7e542c9ddea685ceb2251118638829d5.tar.gz
u-boot-b0a75dda7e542c9ddea685ceb2251118638829d5.tar.xz
u-boot-b0a75dda7e542c9ddea685ceb2251118638829d5.zip
Merge branch 'v2021.04-rc4' of https://github.com/lftan/u-boot
- Add VAB support
Diffstat (limited to 'include')
-rw-r--r--include/configs/socfpga_soc64_common.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index fdcd7d3e9a..1cfa190047 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -79,19 +79,13 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
#endif /* CONFIG_CADENCE_QSPI */
/*
- * Boot arguments passed to the boot command. The value of
- * CONFIG_BOOTARGS goes into the environment value "bootargs".
- * Do note the value will override also the chosen node in FDT blob.
+ * Environment variable
*/
#ifdef CONFIG_FIT
#define CONFIG_BOOTFILE "kernel.itb"
-#define CONFIG_BOOTCOMMAND "run fatscript; run mmcfitload;run linux_qspi_enable;" \
- "run mmcfitboot"
#else
#define CONFIG_BOOTFILE "Image"
-#define CONFIG_BOOTCOMMAND "run fatscript; run mmcload;run linux_qspi_enable;" \
- "run mmcboot"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -200,7 +194,7 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);
* 0x8000_0000 ...... End of SDRAM_1 (assume 2GB)
*
*/
-#define CONFIG_SPL_TARGET "spl/u-boot-spl.hex"
+#define CONFIG_SPL_TARGET "spl/u-boot-spl-dtb.hex"
#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE
#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR
#define CONFIG_SPL_BSS_MAX_SIZE 0x100000 /* 1 MB */