[PATCH 1/2] arm: dts: soc64: Add U-boot script in FIT Image
From: Yau Wai Gan yau.wai.gan@intel.com
HSD #1509829545-1: Build u-boot script in FIT image format to align with binman usage.
Signed-off-by: Yau Wai Gan yau.wai.gan@intel.com Signed-off-by: Jit Loon Lim jit.loon.lim@intel.com --- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+)
diff --git a/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi b/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi index 84b91e8df0..d72855ea47 100644 --- a/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi +++ b/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi @@ -14,6 +14,29 @@ };
&binman { + u-boot-script { + filename = "u-boot.scr"; + fit { + description = "FIT image for u-boot script"; + #address-cells = <1>; + + images { + script { + description = "U-Boot script"; + type = "script"; + compression = "none"; + data: blob-ext { + filename = "u-boot.txt"; + }; + + hash { + algo = "crc32"; + }; + }; + }; + }; + }; + u-boot { filename = "u-boot.itb"; fit {
From: Yau Wai Gan yau.wai.gan@intel.com
HSD #1509829545-2: U-boot script is in FIT image, this requires to update the source command to supply the FIT subimage name.
Signed-off-by: Yau Wai Gan yau.wai.gan@intel.com Signed-off-by: Jit Loon Lim jit.loon.lim@intel.com --- include/configs/socfpga_soc64_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 552a922e39..5939f13231 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -91,7 +91,7 @@ "scriptaddr=0x02100000\0" \ "scriptfile=u-boot.scr\0" \ "fatscript=if fatload mmc 0:1 ${scriptaddr} ${scriptfile};" \ - "then source ${scriptaddr}; fi\0" \ + "then source ${scriptaddr}:script; fi\0" \ "nandfitboot=setenv bootargs " CONFIG_BOOTARGS \ " root=${nandroot} rw rootwait rootfstype=jffs2; " \ "bootm ${loadaddr}\0" \
participants (1)
-
Jit Loon Lim