| Message ID | 20170823060907.5264-2-lokeshvutla@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Aug 23, 2017 at 11:39:06AM +0530, Lokesh Vutla wrote: > Add support for selecting proper dtb for > am57xx BeagleBoard X15 revC u-boot from FIT > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On Wed, Aug 23, 2017 at 11:39:06AM +0530, Lokesh Vutla wrote: > Add support for selecting proper dtb for > am57xx BeagleBoard X15 revC u-boot from FIT > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> > --- > arch/arm/dts/Makefile | 1 + > board/ti/am57xx/board.c | 3 +++ > configs/am57xx_evm_defconfig | 2 +- > configs/am57xx_hs_evm_defconfig | 2 +- > 4 files changed, 6 insertions(+), 2 deletions(-) am57xx-beagle-x15-revc.dts isn't included, what series brings that in? Thanks!
On Mon, Aug 28, 2017 at 6:19 AM, Tom Rini <trini@konsulko.com> wrote: > On Wed, Aug 23, 2017 at 11:39:06AM +0530, Lokesh Vutla wrote: > >> Add support for selecting proper dtb for >> am57xx BeagleBoard X15 revC u-boot from FIT >> >> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> >> Reviewed-by: Tom Rini <trini@konsulko.com> >> --- >> arch/arm/dts/Makefile | 1 + >> board/ti/am57xx/board.c | 3 +++ >> configs/am57xx_evm_defconfig | 2 +- >> configs/am57xx_hs_evm_defconfig | 2 +- >> 4 files changed, 6 insertions(+), 2 deletions(-) > > am57xx-beagle-x15-revc.dts isn't included, what series brings that in? > Thanks! it's pretty small, so got buried in: "arm: dts: dra7: sync DT with latest Linux" https://patchwork.ozlabs.org/patch/803942/ Regards,
On Wed, Aug 23, 2017 at 11:39:06AM +0530, Lokesh Vutla wrote: > Add support for selecting proper dtb for > am57xx BeagleBoard X15 revC u-boot from FIT > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index f1dbdce9be..174c1c3f11 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -178,6 +178,7 @@ dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb \ dra72-evm-revc.dtb dra71-evm.dtb dra76-evm.dtb dtb-$(CONFIG_TARGET_AM57XX_EVM) += am57xx-beagle-x15.dtb \ am57xx-beagle-x15-revb1.dtb \ + am57xx-beagle-x15-revc.dtb \ am572x-idk.dtb \ am571x-idk.dtb dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 3d15cb1dbf..f79aefd400 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -1063,6 +1063,9 @@ int board_fit_config_name_match(const char *name) if (board_is_x15_revb1()) { if (!strcmp(name, "am57xx-beagle-x15-revb1")) return 0; + } else if (board_is_x15_revc()) { + if (!strcmp(name, "am57xx-beagle-x15-revc")) + return 0; } else if (!strcmp(name, "am57xx-beagle-x15")) { return 0; } diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 11be1ad27f..f3fcda7b61 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -40,7 +40,7 @@ CONFIG_CMD_SPL=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am572x-idk am571x-idk" +CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am572x-idk am571x-idk" CONFIG_DM=y CONFIG_SPL_DM=y # CONFIG_BLK is not set diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 91baa2b53e..d322c37326 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -43,7 +43,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am572x-idk am571x-idk" +CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am572x-idk am571x-idk" CONFIG_DM=y CONFIG_SPL_DM=y # CONFIG_BLK is not set
Add support for selecting proper dtb for am57xx BeagleBoard X15 revC u-boot from FIT Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- arch/arm/dts/Makefile | 1 + board/ti/am57xx/board.c | 3 +++ configs/am57xx_evm_defconfig | 2 +- configs/am57xx_hs_evm_defconfig | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-)