From: Nishanth Menon nm@ti.com
AM57xx evm Rev A3 with SR2.0 platform have incompatible changes for HDMI GPIO requiring new dtb support. This implies we have to properly identify the platform now as well. Hence provide a different board name for the Rev A3 variations.
Signed-off-by: Nishanth Menon nm@ti.com Signed-off-by: Lokesh Vutla lokeshvutla@ti.com --- board/ti/am57xx/board.c | 17 ++++++++++++----- include/configs/ti_omap5_common.h | 2 ++ 2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 7aee28e..bf092e7 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -36,6 +36,9 @@
#define board_is_x15() board_ti_is("BBRDX15_") #define board_is_am572x_evm() board_ti_is("AM572PM_") +#define board_is_am572x_evm_reva3() \ + (board_ti_is("AM572PM_") && \ + (strncmp("A.30", board_ti_get_rev(), 3) <= 0)) #define board_is_am572x_idk() board_ti_is("AM572IDK")
#ifdef CONFIG_DRIVER_TI_CPSW @@ -390,15 +393,19 @@ static void setup_board_eeprom_env(void) if (rc) goto invalid_eeprom;
- if (board_is_x15()) + if (board_is_x15()) { name = "beagle_x15"; - else if (board_is_am572x_evm()) - name = "am57xx_evm"; - else if (board_is_am572x_idk()) + } else if (board_is_am572x_evm()) { + if (board_is_am572x_evm_reva3()) + name = "am57xx_evm_reva3"; + else + name = "am57xx_evm"; + } else if (board_is_am572x_idk()) { name = "am572x_idk"; - else + } else { printf("Unidentified board claims %s in eeprom header\n", board_ti_get_name()); + }
invalid_eeprom: set_board_info_env(name); diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 3bc7bf9..51608d2 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -106,6 +106,8 @@ "setenv fdtfile am572x-idk.dtb; fi;" \ "if test $board_name = am57xx_evm; then " \ "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \ + "if test $board_name = am57xx_evm_reva3; then " \ + "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \