| Message ID | 20180910172849.16420-4-dwesterg@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Simon Goldschmidt |
| Headers | show |
| Series | add optional hex output of u-boot-spl | expand |
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
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 */
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(-)