Re: [U-Boot] [RESEND PATCH v3 2/2] ARM: socfpga: stratix10: Remove CONFIG_OF_EMBED
On Wed, Oct 9, 2019 at 2:56 PM Dalon L Westergreen wrote: > > On Sat, 2019-10-05 at 21:41 +0200, Simon Goldschmidt wrote: > > Am 27.09.2019 um 20:27 schrieb Dalon Westergreen: > > From: Dalon Westergreen < > > dalon.westergr...@intel.com > > > > > > CONFIG_OF_EMBED was primarily enabled to support the stratix10 > > spl hex file requirements. Since this option now produces a > > warning during build, and the spl hex can be created using > > alternate methods, CONFIG_OF_EMBED is no longer needed. > > > Signed-off-by: Dalon Westergreen < > > dalon.westergr...@intel.com > > > > > --- > > configs/socfpga_stratix10_defconfig | 1 - > > include/configs/socfpga_stratix10_socdk.h | 2 +- > > 2 files changed, 1 insertion(+), 2 deletions(-) > > > diff --git a/configs/socfpga_stratix10_defconfig > b/configs/socfpga_stratix10_defconfig > > index 5ae53a4db9..ae1b9bead1 100644 > > --- a/configs/socfpga_stratix10_defconfig > > +++ b/configs/socfpga_stratix10_defconfig > > @@ -27,7 +27,6 @@ CONFIG_CMD_CACHE=y > > CONFIG_CMD_EXT4=y > > CONFIG_CMD_FAT=y > > CONFIG_CMD_FS_GENERIC=y > > -CONFIG_OF_EMBED=y > > CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" > > CONFIG_ENV_IS_IN_MMC=y > > CONFIG_NET_RANDOM_ETHADDR=y > > diff --git a/include/configs/socfpga_stratix10_socdk.h > b/include/configs/socfpga_stratix10_socdk.h > > index 7b55dd14da..f9ecf9d2df 100644 > > --- a/include/configs/socfpga_stratix10_socdk.h > > +++ b/include/configs/socfpga_stratix10_socdk.h > > @@ -204,6 +204,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.img" > > +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" > > > Didn't we have this before? The payload name "u-boot.img" is correct for > > all configurations. Without CONFIG_OF_EMBED the two above are the same, > > but changing the name should not be necessary. > > > Regards, > > Simon > > > Correct, but it seems convention is to just use u-boot.img and i would like > all the socfpga devices > to do the same thing. Right. 'u-boot.img' is the one to use. Why do you change it to 'u-boot-dtb.img' then in this patch? Regards, Simon > > --dalon > > > > > #endif /* __CONFIG_H */ > > > ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [RESEND PATCH v3 2/2] ARM: socfpga: stratix10: Remove CONFIG_OF_EMBED
On Sat, 2019-10-05 at 21:41 +0200, Simon Goldschmidt wrote: > Am 27.09.2019 um 20:27 schrieb Dalon Westergreen: > > From: Dalon Westergreen > > CONFIG_OF_EMBED was primarily enabled to support the stratix10spl hex file > > requirements. Since this option now produces awarning during build, and the > > spl hex can be created usingalternate methods, CONFIG_OF_EMBED is no longer > > needed. > > Signed-off-by: Dalon Westergreen > > --- configs/socfpga_stratix10_defconfig | 1 > > - include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 1 > > insertion(+), 2 deletions(-) > > diff --git a/configs/socfpga_stratix10_defconfig > > b/configs/socfpga_stratix10_defconfigindex 5ae53a4db9..ae1b9bead1 100644--- > > a/configs/socfpga_stratix10_defconfig+++ > > b/configs/socfpga_stratix10_defconfig@@ -27,7 +27,6 @@ > > CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENER > > IC=y- > > CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" CON > > FIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=ydiff --git > > a/include/configs/socfpga_stratix10_socdk.h > > b/include/configs/socfpga_stratix10_socdk.hindex 7b55dd14da..f9ecf9d2df > > 100644--- a/include/configs/socfpga_stratix10_socdk.h+++ > > b/include/configs/socfpga_stratix10_socdk.h@@ -204,6 +204,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.img"+#define > > CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" > > Didn't we have this before? The payload name "u-boot.img" is correct for all > configurations. Without CONFIG_OF_EMBED the two above are the same, but > changing the name should not be necessary. > Regards,Simon Correct, but it seems convention is to just use u-boot.img and i would like all the socfpga devicesto do the same thing. --dalon > > #endif /* __CONFIG_H */ ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [RESEND PATCH v3 2/2] ARM: socfpga: stratix10: Remove CONFIG_OF_EMBED
Am 27.09.2019 um 20:27 schrieb Dalon Westergreen: From: Dalon Westergreen CONFIG_OF_EMBED was primarily enabled to support the stratix10 spl hex file requirements. Since this option now produces a warning during build, and the spl hex can be created using alternate methods, CONFIG_OF_EMBED is no longer needed. Signed-off-by: Dalon Westergreen --- configs/socfpga_stratix10_defconfig | 1 - include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index 5ae53a4db9..ae1b9bead1 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -27,7 +27,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 7b55dd14da..f9ecf9d2df 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -204,6 +204,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void); /* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME"u-boot.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME"u-boot-dtb.img" Didn't we have this before? The payload name "u-boot.img" is correct for all configurations. Without CONFIG_OF_EMBED the two above are the same, but changing the name should not be necessary. Regards, Simon #endif /* __CONFIG_H */ ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [RESEND PATCH v3 2/2] ARM: socfpga: stratix10: Remove CONFIG_OF_EMBED
From: Dalon Westergreen CONFIG_OF_EMBED was primarily enabled to support the stratix10 spl hex file requirements. Since this option now produces a warning during build, and the spl hex can be created using alternate methods, CONFIG_OF_EMBED is no longer needed. Signed-off-by: Dalon Westergreen --- configs/socfpga_stratix10_defconfig | 1 - include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index 5ae53a4db9..ae1b9bead1 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -27,7 +27,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 7b55dd14da..f9ecf9d2df 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -204,6 +204,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.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME"u-boot-dtb.img" #endif /* __CONFIG_H */ -- 2.21.0 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [RESEND PATCH v3 2/2] ARM: socfpga: stratix10: Remove CONFIG_OF_EMBED
From: Dalon Westergreen CONFIG_OF_EMBED was primarily enabled to support the stratix10 spl hex file requirements. Since this option now produces a warning during build, and the spl hex can be created using alternate methods, CONFIG_OF_EMBED is no longer needed. Signed-off-by: Dalon Westergreen --- Changes in v3: -> Revert to u-boot.img for SPL payload name Changes in v2: -> Change CONFIG_SPL_TARGET back to u-boot-spl.hex --- configs/socfpga_stratix10_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index fbab388b43..f27180385d 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y -- 2.21.0 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
