[U-Boot] [PATCH 0/3] add optional hex output of u-boot-spl
This patch set adds a possible hex output of the u-boot-spl elf and enables said output for the Intel Stratix10 device. Stratix10 requires a hex output of the elf for creating the secure device manager configuration bitstream.
Dalon Westergreen (3): common: add spl/u-boot-spl.hex target arm: socfpga: stratix10: add CONFIG_SPL_TARGET arm; socfpga: stratix10: Add CONFIG_OF_EMBED
Makefile | 5 +++++ configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)
Some devices, namely Intel's stratix10 SoC, require u-boot-spl in a hex format. This patch adds spl/u-boot-spl.hex as a possible target.
Signed-off-by: Dalon Westergreen dwesterg@gmail.com --- Makefile | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/Makefile b/Makefile index f30dd8e9b7..133d7ac773 100644 --- a/Makefile +++ b/Makefile @@ -985,6 +985,11 @@ spl/u-boot-spl.srec: spl/u-boot-spl FORCE OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec)
+OBJCOPYFLAGS_u-boot-spl.hex = $(OBJCOPYFLAGS_u-boot.hex) + +spl/u-boot-spl.hex: spl/u-boot-spl FORCE + $(call if_changed,objcopy) + binary_size_check: u-boot-nodtb.bin FORCE @file_size=$(shell wc -c u-boot-nodtb.bin | awk '{print $$1}') ; \ map_size=$(shell cat u-boot.map | \
On 09/10/2018 07:28 PM, Dalon Westergreen wrote:
Some devices, namely Intel's stratix10 SoC, require u-boot-spl in a hex format. This patch adds spl/u-boot-spl.hex as a possible target.
Signed-off-by: Dalon Westergreen dwesterg@gmail.com
Makefile | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/Makefile b/Makefile index f30dd8e9b7..133d7ac773 100644 --- a/Makefile +++ b/Makefile @@ -985,6 +985,11 @@ spl/u-boot-spl.srec: spl/u-boot-spl FORCE OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec)
+OBJCOPYFLAGS_u-boot-spl.hex = $(OBJCOPYFLAGS_u-boot.hex)
+spl/u-boot-spl.hex: spl/u-boot-spl FORCE
- $(call if_changed,objcopy)
binary_size_check: u-boot-nodtb.bin FORCE @file_size=$(shell wc -c u-boot-nodtb.bin | awk '{print $$1}') ; \ map_size=$(shell cat u-boot.map | \
Applied to socfpga/master, thanks
Stratix10 combines the u-boot-spl image into the fpga configuration bitstream so that the SDM can load the processors memory. This process requires a hex format of the u-boot-spl image. CONFIG_SPL_TARGET is set to "spl/u-boot-spl.hex"
Signed-off-by: Dalon Westergreen dwesterg@gmail.com --- include/configs/socfpga_stratix10_socdk.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index b58f478004..91315a0031 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -202,6 +202,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_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR
On 09/10/2018 07:28 PM, Dalon Westergreen wrote:
Stratix10 combines the u-boot-spl image into the fpga configuration bitstream so that the SDM can load the processors memory. This process requires a hex format of the u-boot-spl image. CONFIG_SPL_TARGET is set to "spl/u-boot-spl.hex"
Signed-off-by: Dalon Westergreen dwesterg@gmail.com
include/configs/socfpga_stratix10_socdk.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index b58f478004..91315a0031 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -202,6 +202,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_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR
Applied to socfpga/master, thanks
The dtb should be embedded in the u-boot-spl image so that the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it.
This also affects the main u-boot image, so adjust CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now also includes the dtb.
Signed-off-by: Dalon Westergreen dwesterg@gmail.com --- configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index c27985ad43..b6d804f38e 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y +CONFIG_OF_EMBED=y diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 91315a0031..e190b3d988 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);
/* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif /* __CONFIG_H */
On 10.09.2018 19:28, Dalon Westergreen wrote:
The dtb should be embedded in the u-boot-spl image so that the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it.
This also affects the main u-boot image, so adjust CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now
Tiny typo: replace comma by dot. Although this side effect seems a little unwanted...?
also includes the dtb.
Signed-off-by: Dalon Westergreen dwesterg@gmail.com
configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index c27985ad43..b6d804f38e 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y +CONFIG_OF_EMBED=y diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 91315a0031..e190b3d988 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);
/* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif /* __CONFIG_H */
On Mon, 2018-09-10 at 20:14 +0200, Simon Goldschmidt wrote:
On 10.09.2018 19:28, Dalon Westergreen wrote: The dtb should be embedded in the u-boot-spl image so that the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it.
This also affects the main u-boot image, so adjust CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now
Tiny typo: replace comma by dot.
Thanks
Although this side effect seems a little unwanted...?
I would love to think of a use case where this would matter?
also includes the dtb.
Signed-off-by: Dalon Westergreen dwesterg@gmail.com
configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index c27985ad43..b6d804f38e 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y +CONFIG_OF_EMBED=y diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 91315a0031..e190b3d988 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);
/* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif /* __CONFIG_H */
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
On 10.09.2018 20:21, Dalon L Westergreen wrote:
On Mon, 2018-09-10 at 20:14 +0200, Simon Goldschmidt wrote:
On 10.09.2018 19:28, Dalon Westergreen wrote: The dtb should be embedded in the u-boot-spl image so that the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it. This also affects the main u-boot image, so adjust CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now Tiny typo: replace comma by dot.
Thanks
Although this side effect seems a little unwanted...?
I would love to think of a use case where this would matter?
Well, on upgrade, the name of the U-Boot image on MMC changes, doesn't it? Or is there no upgrade scenario? (I'm not familiar with the current status of mainline U-Boot on Stratix 10).
Anyway, this is not your fault. I rather guess this is an inconsistency in U-Boot overall that the name of the binary changes with
CONFIG_OF_EMBED...
Simon
also includes the dtb. Signed-off-by: Dalon Westergreen <dwesterg@gmail.com mailto:dwesterg@gmail.com>
configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index c27985ad43..b6d804f38e 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y +CONFIG_OF_EMBED=y diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 91315a0031..e190b3d988 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);
/* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif /* __CONFIG_H */ _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de mailto:U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
On 09/10/2018 07:28 PM, Dalon Westergreen wrote:
The dtb should be embedded in the u-boot-spl image so that the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it.
This also affects the main u-boot image, so adjust CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now also includes the dtb.
Signed-off-by: Dalon Westergreen dwesterg@gmail.com
configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index c27985ad43..b6d804f38e 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y +CONFIG_OF_EMBED=y
Did make savedefconfig put this here ?
I am fine with this patch, but if Simon has any objections, let's hear them.
diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 91315a0031..e190b3d988 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);
/* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif /* __CONFIG_H */
On Tue, 2018-09-11 at 23:55 +0200, Marek Vasut wrote:
On 09/10/2018 07:28 PM, Dalon Westergreen wrote: The dtb should be embedded in the u-boot-spl image so thatthe CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it. This also affects the main u-boot image, so adjustCONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which nowalso includes the dtb. Signed-off-by: Dalon Westergreen dwesterg@gmail.com--- configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfigindex c27985ad43..b6d804f38e 100644--- a/configs/socfpga_stratix10_defconfig+++ b/configs/socfpga_stratix10_defconfig@@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y+CONFIG_OF_EMBED=y Did make savedefconfig put this here ?
No, i put it there myself
I am fine with this patch, but if Simon has any objections, let's hear them.
great!
diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.hindex 91315a0031..e190b3d988 100644--- a/include/configs/socfpga_stratix10_socdk.h+++ b/include/configs/socfpga_stratix10_socdk.h@@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void); /* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img"+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #endif /* __CONFIG_H */
On 09/12/2018 01:55 AM, Dalon L Westergreen wrote:
On Tue, 2018-09-11 at 23:55 +0200, Marek Vasut wrote:
On 09/10/2018 07:28 PM, Dalon Westergreen wrote: The dtb should be embedded in the u-boot-spl image so that the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it.
This also affects the main u-boot image, so adjust CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now also includes the dtb.
Signed-off-by: Dalon Westergreen <dwesterg@gmail.com mailto:dwesterg@gmail.com>
configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index c27985ad43..b6d804f38e 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y +CONFIG_OF_EMBED=y
Did make savedefconfig put this here ?
No, i put it there myself
You should always run make savedefconfig to update the defconfig instead of ad-hoc hacking the value at random place.
I am fine with this patch, but if Simon has any objections, let's hear them.
great!
diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 91315a0031..e190b3d988 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);
/* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif /* __CONFIG_H */
On Wed, 2018-09-12 at 02:03 +0200, Marek Vasut wrote:
On 09/12/2018 01:55 AM, Dalon L Westergreen wrote: On Tue, 2018-09-11 at 23:55 +0200, Marek Vasut wrote: On 09/10/2018 07:28 PM, Dalon Westergreen wrote:The dtb should be embedded in the u-boot-spl image so thatthe CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it. This also affects the main u-boot image, so adjustCONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which nowalso includes the dtb. Signed-off-by: Dalon Westergreen <dwesterg@gmail.com mailto: dwesterg@gmail.com>--- configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfigindex c27985ad43..b6d804f38e 100644--- a/configs/socfpga_stratix10_defconfig+++ b/configs/socfpga_stratix10_defconfig@@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y+CONFIG_OF_EMBED=y Did make savedefconfig put this here ? No, i put it there myself You should always run make savedefconfig to update the defconfig insteadof ad- hoc hacking the value at random place.
i'll fix it and send a new patch. You already accepted patch 1 & 2 from the series, so i will just sendthe one.
I am fine with this patch, but if Simon has any objections, let's hear them. great!
diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.hindex 91315a0031..e190b3d988 100644--- a/include/configs/socfpga_stratix10_socdk.h+++ b/include/configs/socfpga_stratix10_socdk.h@@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void); /* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img"+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #endif /* __CONFIG_H */
On 09/12/2018 02:05 AM, Dalon L Westergreen wrote:
On Wed, 2018-09-12 at 02:03 +0200, Marek Vasut wrote:
On 09/12/2018 01:55 AM, Dalon L Westergreen wrote: On Tue, 2018-09-11 at 23:55 +0200, Marek Vasut wrote: On 09/10/2018 07:28 PM, Dalon Westergreen wrote: The dtb should be embedded in the u-boot-spl image so that the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it.
This also affects the main u-boot image, so adjust CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now also includes the dtb.
Signed-off-by: Dalon Westergreen <dwesterg@gmail.com mailto:dwesterg@gmail.com <mailto:dwesterg@gmail.com mailto:dwesterg@gmail.com>>
configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index c27985ad43..b6d804f38e 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y +CONFIG_OF_EMBED=y
Did make savedefconfig put this here ?
No, i put it there myself
You should always run make savedefconfig to update the defconfig instead of ad-hoc hacking the value at random place.
i'll fix it and send a new patch. You already accepted patch 1 & 2 from the series, so i will just send the one.
Also fix the ; and , bits Simon pointed out. And check with him if he has some further feedback.
Marek Vasut marex@denx.de schrieb am Mi., 12. Sep. 2018, 02:07:
On 09/12/2018 02:05 AM, Dalon L Westergreen wrote:
On Wed, 2018-09-12 at 02:03 +0200, Marek Vasut wrote:
On 09/12/2018 01:55 AM, Dalon L Westergreen wrote: On Tue, 2018-09-11 at 23:55 +0200, Marek Vasut wrote: On 09/10/2018 07:28 PM, Dalon Westergreen wrote: The dtb should be embedded in the u-boot-spl image so that the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it.
This also affects the main u-boot image, so adjust CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now also includes the dtb.
Signed-off-by: Dalon Westergreen <dwesterg@gmail.com <mailto:
dwesterg@gmail.com> <mailto:dwesterg@gmail.com <mailto:dwesterg@gmail.com
configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/socfpga_stratix10_defconfig
b/configs/socfpga_stratix10_defconfig
index c27985ad43..b6d804f38e 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -56,3 +56,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USE_TINY_PRINTF=y +CONFIG_OF_EMBED=y
Did make savedefconfig put this here ?
No, i put it there myself
You should always run make savedefconfig to update the defconfig instead of ad-hoc hacking the value at random place.
i'll fix it and send a new patch. You already accepted patch 1 & 2 from the series, so i will just send the one.
Also fix the ; and , bits Simon pointed out. And check with him if he has some further feedback.
No, after discussing this, I'm fine with the change as is. I'll need something similar for gen5, I guess...
So: Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail..com>
-- Best regards, Marek Vasut
On 09/12/2018 06:36 AM, Simon Goldschmidt wrote:
Marek Vasut <marex@denx.de mailto:marex@denx.de> schrieb am Mi., 12. Sep. 2018, 02:07:
On 09/12/2018 02:05 AM, Dalon L Westergreen wrote: > On Wed, 2018-09-12 at 02:03 +0200, Marek Vasut wrote: >> On 09/12/2018 01:55 AM, Dalon L Westergreen wrote: >> On Tue, 2018-09-11 at 23:55 +0200, Marek Vasut wrote: >> On 09/10/2018 07:28 PM, Dalon Westergreen wrote: >> The dtb should be embedded in the u-boot-spl image so that >> the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it. >> >> This also affects the main u-boot image, so adjust >> CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now >> also includes the dtb. >> >> Signed-off-by: Dalon Westergreen <dwesterg@gmail.com <mailto:dwesterg@gmail.com> <mailto:dwesterg@gmail.com <mailto:dwesterg@gmail.com>> <mailto:dwesterg@gmail.com <mailto:dwesterg@gmail.com> <mailto:dwesterg@gmail.com <mailto:dwesterg@gmail.com>>>> >> --- >> configs/socfpga_stratix10_defconfig | 1 + >> include/configs/socfpga_stratix10_socdk.h | 2 +- >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig >> index c27985ad43..b6d804f38e 100644 >> --- a/configs/socfpga_stratix10_defconfig >> +++ b/configs/socfpga_stratix10_defconfig >> @@ -56,3 +56,4 @@ CONFIG_DM_USB=y >> CONFIG_USB_DWC2=y >> CONFIG_USB_STORAGE=y >> CONFIG_USE_TINY_PRINTF=y >> +CONFIG_OF_EMBED=y >> >> Did make savedefconfig put this here ? >> >> No, i put it there myself >> >> You should always run make savedefconfig to update the defconfig instead >> of ad-hoc hacking the value at random place. > > i'll fix it and send a new patch. You already accepted patch 1 & 2 from > the series, so i will just send > the one. Also fix the ; and , bits Simon pointed out. And check with him if he has some further feedback.No, after discussing this, I'm fine with the change as is. I'll need something similar for gen5, I guess...
So: Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail..com>
OK, thanks
Also, can you both fix your mailer so it does generate proper text email reply, with zero tabs/spaces between quote markers ('>') ?
On Wed, Sep 12, 2018 at 10:42 AM Marek Vasut marex@denx.de wrote:
On 09/12/2018 06:36 AM, Simon Goldschmidt wrote:
Marek Vasut <marex@denx.de mailto:marex@denx.de> schrieb am Mi., 12. Sep. 2018, 02:07:
On 09/12/2018 02:05 AM, Dalon L Westergreen wrote: > On Wed, 2018-09-12 at 02:03 +0200, Marek Vasut wrote: >> On 09/12/2018 01:55 AM, Dalon L Westergreen wrote: >> On Tue, 2018-09-11 at 23:55 +0200, Marek Vasut wrote: >> On 09/10/2018 07:28 PM, Dalon Westergreen wrote: >> The dtb should be embedded in the u-boot-spl image so that >> the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it. >> >> This also affects the main u-boot image, so adjust >> CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot,img which now >> also includes the dtb. >> >> Signed-off-by: Dalon Westergreen <dwesterg@gmail.com <mailto:dwesterg@gmail.com> <mailto:dwesterg@gmail.com <mailto:dwesterg@gmail.com>> <mailto:dwesterg@gmail.com <mailto:dwesterg@gmail.com> <mailto:dwesterg@gmail.com <mailto:dwesterg@gmail.com>>>> >> --- >> configs/socfpga_stratix10_defconfig | 1 + >> include/configs/socfpga_stratix10_socdk.h | 2 +- >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig >> index c27985ad43..b6d804f38e 100644 >> --- a/configs/socfpga_stratix10_defconfig >> +++ b/configs/socfpga_stratix10_defconfig >> @@ -56,3 +56,4 @@ CONFIG_DM_USB=y >> CONFIG_USB_DWC2=y >> CONFIG_USB_STORAGE=y >> CONFIG_USE_TINY_PRINTF=y >> +CONFIG_OF_EMBED=y >> >> Did make savedefconfig put this here ? >> >> No, i put it there myself >> >> You should always run make savedefconfig to update the defconfig instead >> of ad-hoc hacking the value at random place. > > i'll fix it and send a new patch. You already accepted patch 1 & 2 from > the series, so i will just send > the one. Also fix the ; and , bits Simon pointed out. And check with him if he has some further feedback.No, after discussing this, I'm fine with the change as is. I'll need something similar for gen5, I guess...
So: Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail..com>
OK, thanks
Also, can you both fix your mailer so it does generate proper text email reply, with zero tabs/spaces between quote markers ('>') ?
Hmm, it seems it's always broken when using the gmail app on my mobile :-( I'll have to try and see what I can do about it.
-- Best regards, Marek Vasut
On 10.09.2018 19:28, Dalon Westergreen wrote:
This patch set adds a possible hex output of the u-boot-spl elf and enables said output for the Intel Stratix10 device. Stratix10 requires a hex output of the elf for creating the secure device manager configuration bitstream.
I don't use Stratix10 but Cyclone5, but as I need a .hex to boot from FPGA, I want to know how to solve this best.
So to understand this, again a question: is this the only way to boot Stratix10? Or one of the possible boot methods? Because reading "Intel® Stratix® 10 SoC FPGA Boot User Guide", it seems like you would need the hex for "FPGA Configuration First Mode", but not for "HPS Boot First Mode"?
If so, it would make Stratix10 and Cyclone5 more alike and a configuration option (like "Boot from FPGA") could be used to control CONFIG_OF_EMBED and enable creating the hex file for SPL.
I *am* working on fixing the "boot from FPGA" case for Cyclone5, so I'd appreaciate it if we could share as much as possible between those sub-architectures.
Simon
Dalon Westergreen (3): common: add spl/u-boot-spl.hex target arm: socfpga: stratix10: add CONFIG_SPL_TARGET arm; socfpga: stratix10: Add CONFIG_OF_EMBED
Makefile | 5 +++++ configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)
On Mon, 2018-09-10 at 20:06 +0200, Simon Goldschmidt wrote:
On 10.09.2018 19:28, Dalon Westergreen wrote: This patch set adds a possible hex output of the u-boot-spl elf and enables said output for the Intel Stratix10 device. Stratix10 requires a hex output of the elf for creating the secure device manager configuration bitstream.
I don't use Stratix10 but Cyclone5, but as I need a .hex to boot from FPGA, I want to know how to solve this best.
So to understand this, again a question: is this the only way to boot Stratix10? Or one of the possible boot methods? Because reading "Intel® Stratix® 10 SoC FPGA Boot User Guide", it seems like you would need the hex for "FPGA Configuration First Mode", but not for "HPS Boot First Mode"?
Stratix 10 always requires this for boot. The configuration method in s10 is very different. The SDM, which is a security processor, copies the u-boot-spl data to the S10 HPS onchip memory. After this is done, the SDM releases the hps from reset. This is regardless of the HPS boot media, which could be SDMMC, etc, etc.
If so, it would make Stratix10 and Cyclone5 more alike and a configuration option (like "Boot from FPGA") could be used to control CONFIG_OF_EMBED and enable creating the hex file for SPL.
I looked into how i could enable CONFIG_OF_EMBED only for the SPL build and found no easy way. It was suggested to add something like CONFIG_SPL_OF_EMBED but it still seemed this would require touching a bunch of code. In the end, i really see no reason in socfpga to have the devicetree separated from u-boot / spl.
I *am* working on fixing the "boot from FPGA" case for Cyclone5, so I'd appreaciate it if we could share as much as possible between those sub-architectures.
What difficulties are you having?
Simon
Dalon Westergreen (3): common: add spl/u-boot-spl.hex target arm: socfpga: stratix10: add CONFIG_SPL_TARGET arm; socfpga: stratix10: Add CONFIG_OF_EMBED
Makefile | 5 +++++ configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
On 10.09.2018 20:18, Dalon L Westergreen wrote:
On Mon, 2018-09-10 at 20:06 +0200, Simon Goldschmidt wrote:
On 10.09.2018 19:28, Dalon Westergreen wrote: This patch set adds a possible hex output of the u-boot-spl elf and enables said output for the Intel Stratix10 device. Stratix10 requires a hex output of the elf for creating the secure device manager configuration bitstream. I don't use Stratix10 but Cyclone5, but as I need a .hex to boot from FPGA, I want to know how to solve this best. So to understand this, again a question: is this the only way to boot Stratix10? Or one of the possible boot methods? Because reading "Intel® Stratix® 10 SoC FPGA Boot User Guide", it seems like you would need the hex for "FPGA Configuration First Mode", but not for "HPS Boot First Mode"?
Stratix 10 always requires this for boot. The configuration method in s10 is very different. The SDM, which is a security processor, copies the u-boot-spl data to the S10 HPS onchip memory. After this is done, the SDM releases the hps from reset. This is regardless of the HPS boot media, which could be SDMMC, etc, etc.
OK, reading the PDF I referenced in more detail, I think I can follow you ;-)
If so, it would make Stratix10 and Cyclone5 more alike and a configuration option (like "Boot from FPGA") could be used to control CONFIG_OF_EMBED and enable creating the hex file for SPL.
I looked into how i could enable CONFIG_OF_EMBED only for the SPL build and found no easy way. It was suggested to add something like CONFIG_SPL_OF_EMBED but it still seemed this would require touching a bunch of code. In the end, i really see no reason in socfpga to have the devicetree separated from u-boot / spl.
We're planning multi-board support with one binary and multiple devicetrees, but CONFIG_MULTI_DTB_FIT might also work for that... The only thing that looks bad is that the U-Boot image file name changes...
I *am* working on fixing the "boot from FPGA" case for Cyclone5, so I'd appreaciate it if we could share as much as possible between those sub-architectures.
What difficulties are you having?
Time, mostly ;-) But seriously speaking, Cyclone5 executes the SPL from FPGA onchip RAM in this boot mode, and the bridges got disabled. That was the main problem, I think. I've had patches sent, but they weren't clean enough for 2018.09. I'll hope to find the time to work on them in the next couple of weeks...
And I hope to find the time to test your patchsets on gen5, as well.
Simon
Simon Dalon Westergreen (3): common: add spl/u-boot-spl.hex target arm: socfpga: stratix10: add CONFIG_SPL_TARGET arm; socfpga: stratix10: Add CONFIG_OF_EMBED Makefile | 5 +++++ configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de mailto:U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
participants (4)
-
Dalon L Westergreen -
Dalon Westergreen -
Marek Vasut -
Simon Goldschmidt