Message ID | 20220801125012.9757-1-pali@kernel.org |
---|---|
State | Accepted |
Commit | 33043b396cae4d6b464592dd17bba075c9215826 |
Delegated to: | Marek Behun |
Headers | show |
Series | [v2] board: freescale: p1_p2_rdb_pc: Calculate offsets for eSDHC boot sector | expand |
On Monday 01 August 2022 14:50:12 Pali Rohár wrote: > Correctly calculate offsets between SPL and proper U-Boot when new config > option CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR for generating eSDHC boot sector > is enabled. Otherwise SPL would not be able to boot proper U-Boot. > > Signed-off-by: Pali Rohár <pali@kernel.org> > --- > Changes in v2: > * rebase on top of master branch, commit 85eb5ac6efee878f3c2ab3269286250e187ca10c PING? Are we going to wait until this patch does not apply anymore again?? > --- > include/configs/p1_p2_rdb_pc.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > index ba04029df8d8..d2787136681b 100644 > --- a/include/configs/p1_p2_rdb_pc.h > +++ b/include/configs/p1_p2_rdb_pc.h > @@ -80,7 +80,11 @@ > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > #define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > #define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > +#ifdef CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR > +#define CONFIG_SYS_MMC_U_BOOT_OFFS (CONFIG_SPL_PAD_TO - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA*512) > +#else > #define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > +#endif > #elif defined(CONFIG_SPIFLASH) > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > -- > 2.20.1 >
On 8/18/2022 5:03 AM, Pali Rohár wrote: > On Monday 01 August 2022 14:50:12 Pali Rohár wrote: >> Correctly calculate offsets between SPL and proper U-Boot when new config >> option CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR for generating eSDHC boot sector >> is enabled. Otherwise SPL would not be able to boot proper U-Boot. >> >> Signed-off-by: Pali Rohár <pali@kernel.org> >> --- >> Changes in v2: >> * rebase on top of master branch, commit 85eb5ac6efee878f3c2ab3269286250e187ca10c > > PING? Are we going to wait until this patch does not apply anymore again?? Applied, sorry for late. Thanks, Peng. > >> --- >> include/configs/p1_p2_rdb_pc.h | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h >> index ba04029df8d8..d2787136681b 100644 >> --- a/include/configs/p1_p2_rdb_pc.h >> +++ b/include/configs/p1_p2_rdb_pc.h >> @@ -80,7 +80,11 @@ >> #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) >> #define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE >> #define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE >> +#ifdef CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR >> +#define CONFIG_SYS_MMC_U_BOOT_OFFS (CONFIG_SPL_PAD_TO - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA*512) >> +#else >> #define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO >> +#endif >> #elif defined(CONFIG_SPIFLASH) >> #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) >> #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE >> -- >> 2.20.1 >>
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index ba04029df8d8..d2787136681b 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -80,7 +80,11 @@ #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE +#ifdef CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR +#define CONFIG_SYS_MMC_U_BOOT_OFFS (CONFIG_SPL_PAD_TO - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA*512) +#else #define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO +#endif #elif defined(CONFIG_SPIFLASH) #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE
Correctly calculate offsets between SPL and proper U-Boot when new config option CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR for generating eSDHC boot sector is enabled. Otherwise SPL would not be able to boot proper U-Boot. Signed-off-by: Pali Rohár <pali@kernel.org> --- Changes in v2: * rebase on top of master branch, commit 85eb5ac6efee878f3c2ab3269286250e187ca10c --- include/configs/p1_p2_rdb_pc.h | 4 ++++ 1 file changed, 4 insertions(+)