summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2016-11-25 11:14:20 +0530
committerTom Rini <trini@konsulko.com>2016-12-04 13:54:54 -0500
commitf7f9f6be95bc1f484ec118714defd3d6f6f10d4a (patch)
treee8ca2d8588f7d4dcffa8bbfa2ad367be961d0c8d /board
parentbf43ce6ca65355d8ad262d7bd55f5d05dbf55e25 (diff)
downloadu-boot-imx-f7f9f6be95bc1f484ec118714defd3d6f6f10d4a.zip
u-boot-imx-f7f9f6be95bc1f484ec118714defd3d6f6f10d4a.tar.gz
u-boot-imx-f7f9f6be95bc1f484ec118714defd3d6f6f10d4a.tar.bz2
board: ti: am57xx: Add support for detection of X15 revb1
BeagleBoard-X15 Rev B1 with SR1.1 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 B1 variants. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board')
-rw-r--r--board/ti/am57xx/board.c26
1 files changed, 19 insertions, 7 deletions
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index fd15ba1..125e965 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -35,6 +35,8 @@
#include "mux_data.h"
#define board_is_x15() board_ti_is("BBRDX15_")
+#define board_is_x15_revb1() (board_ti_is("BBRDX15_") && \
+ (strncmp("B.10", board_ti_get_rev(), 3) <= 0))
#define board_is_am572x_evm() board_ti_is("AM572PM_")
#define board_is_am572x_evm_reva3() \
(board_ti_is("AM572PM_") && \
@@ -394,7 +396,10 @@ static void setup_board_eeprom_env(void)
goto invalid_eeprom;
if (board_is_x15()) {
- name = "beagle_x15";
+ if (board_is_x15_revb1())
+ name = "beagle_x15_revb1";
+ else
+ name = "beagle_x15";
} else if (board_is_am572x_evm()) {
if (board_is_am572x_evm_reva3())
name = "am57xx_evm_reva3";
@@ -790,14 +795,21 @@ int ft_board_setup(void *blob, bd_t *bd)
#ifdef CONFIG_SPL_LOAD_FIT
int board_fit_config_name_match(const char *name)
{
- if (board_is_x15() && !strcmp(name, "am57xx-beagle-x15"))
- return 0;
- else if (board_is_am572x_evm() && !strcmp(name, "am57xx-beagle-x15"))
+ if (board_is_x15()) {
+ if (board_is_x15_revb1()) {
+ if (!strcmp(name, "am57xx-beagle-x15-revb1"))
+ return 0;
+ } else if (!strcmp(name, "am57xx-beagle-x15")) {
+ return 0;
+ }
+ } else if (board_is_am572x_evm() &&
+ !strcmp(name, "am57xx-beagle-x15")) {
return 0;
- else if (board_is_am572x_idk() && !strcmp(name, "am572x-idk"))
+ } else if (board_is_am572x_idk() && !strcmp(name, "am572x-idk")) {
return 0;
- else
- return -1;
+ }
+
+ return -1;
}
#endif