| Message ID | 20180326075703.5834-2-vigneshr@ti.com |
|---|---|
| State | Accepted |
| Commit | 5375a9b566d1515eaf674640dbc47c99d1d50cf0 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | AM437x: Add runtime DTB selection for QSPI Boot | expand |
On Monday 26 March 2018 01:27 PM, Vignesh R wrote: > AM437x QSPI boot is a single stage boot and hence needs runtime DTB > selection to support AM437x-SK and AM437x-IDK with DM enabled. This is > required to move am43xx_evm_qspiboot_defconfig to use DM/DT. > > Signed-off-by: Vignesh R <vigneshr@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Thanks and regards, Lokesh > --- > board/ti/am43xx/board.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c > index 715960a596e9..38af1673273b 100644 > --- a/board/ti/am43xx/board.c > +++ b/board/ti/am43xx/board.c > @@ -852,10 +852,14 @@ int ft_board_setup(void *blob, bd_t *bd) > } > #endif > > -#ifdef CONFIG_SPL_LOAD_FIT > +#if defined(CONFIG_SPL_LOAD_FIT) || defined(CONFIG_DTB_RESELECT) > int board_fit_config_name_match(const char *name) > { > - if (board_is_evm() && !strcmp(name, "am437x-gp-evm")) > + bool eeprom_read = board_ti_was_eeprom_read(); > + > + if (!strcmp(name, "am4372-generic") && !eeprom_read) > + return 0; > + else if (board_is_evm() && !strcmp(name, "am437x-gp-evm")) > return 0; > else if (board_is_sk() && !strcmp(name, "am437x-sk-evm")) > return 0; > @@ -868,6 +872,16 @@ int board_fit_config_name_match(const char *name) > } > #endif > > +#ifdef CONFIG_DTB_RESELECT > +int embedded_dtb_select(void) > +{ > + do_board_detect(); > + fdtdec_setup(); > + > + return 0; > +} > +#endif > + > #ifdef CONFIG_TI_SECURE_DEVICE > void board_fit_image_post_process(void **p_image, size_t *p_size) > { >
On Mon, Mar 26, 2018 at 01:27:01PM +0530, Vignesh R wrote: > AM437x QSPI boot is a single stage boot and hence needs runtime DTB > selection to support AM437x-SK and AM437x-IDK with DM enabled. This is > required to move am43xx_evm_qspiboot_defconfig to use DM/DT. > > Signed-off-by: Vignesh R <vigneshr@ti.com> > Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Applied to u-boot/master, thanks!
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 715960a596e9..38af1673273b 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -852,10 +852,14 @@ int ft_board_setup(void *blob, bd_t *bd) } #endif -#ifdef CONFIG_SPL_LOAD_FIT +#if defined(CONFIG_SPL_LOAD_FIT) || defined(CONFIG_DTB_RESELECT) int board_fit_config_name_match(const char *name) { - if (board_is_evm() && !strcmp(name, "am437x-gp-evm")) + bool eeprom_read = board_ti_was_eeprom_read(); + + if (!strcmp(name, "am4372-generic") && !eeprom_read) + return 0; + else if (board_is_evm() && !strcmp(name, "am437x-gp-evm")) return 0; else if (board_is_sk() && !strcmp(name, "am437x-sk-evm")) return 0; @@ -868,6 +872,16 @@ int board_fit_config_name_match(const char *name) } #endif +#ifdef CONFIG_DTB_RESELECT +int embedded_dtb_select(void) +{ + do_board_detect(); + fdtdec_setup(); + + return 0; +} +#endif + #ifdef CONFIG_TI_SECURE_DEVICE void board_fit_image_post_process(void **p_image, size_t *p_size) {
AM437x QSPI boot is a single stage boot and hence needs runtime DTB selection to support AM437x-SK and AM437x-IDK with DM enabled. This is required to move am43xx_evm_qspiboot_defconfig to use DM/DT. Signed-off-by: Vignesh R <vigneshr@ti.com> --- board/ti/am43xx/board.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)