leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board: ti: am57xx: Add support for detection of X15 revb1

Browse Source 
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>
This commit is contained in:
Lokesh Vutla 2016-11-25 11:14:20 +05:30 committed by Tom Rini
parent bf43ce6ca6
commit f7f9f6be95
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
board/ti/am57xx/board.c
View File

@ -35,6 +35,8 @@
#include "mux_data.h" #include "mux_data.h"
#define board_is_x15() board_ti_is("BBRDX15_") #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() board_ti_is("AM572PM_")
#define board_is_am572x_evm_reva3() \ #define board_is_am572x_evm_reva3() \
(board_ti_is("AM572PM_") && \ (board_ti_is("AM572PM_") && \
@ -394,7 +396,10 @@ static void setup_board_eeprom_env(void)
goto invalid_eeprom; goto invalid_eeprom;
if (board_is_x15()) { 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()) { } else if (board_is_am572x_evm()) {
if (board_is_am572x_evm_reva3()) if (board_is_am572x_evm_reva3())
name = "am57xx_evm_reva3"; name = "am57xx_evm_reva3";
@ -790,14 +795,21 @@ int ft_board_setup(void *blob, bd_t *bd)
#ifdef CONFIG_SPL_LOAD_FIT #ifdef CONFIG_SPL_LOAD_FIT
int board_fit_config_name_match(const char *name) int board_fit_config_name_match(const char *name)
{ {
if (board_is_x15() && !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; return 0;
else if (board_is_am572x_evm() && !strcmp(name, "am57xx-beagle-x15")) } else if (board_is_am572x_idk() && !strcmp(name, "am572x-idk")) {
return 0; return 0;
else if (board_is_am572x_idk() && !strcmp(name, "am572x-idk")) }
return 0;
else return -1;
return -1;
} }
#endif #endif

2
configs/am57xx_evm_defconfig
View File

@ -50,7 +50,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="am57xx-beagle-x15 am572x-idk" CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am572x-idk"
CONFIG_DM=y CONFIG_DM=y
# CONFIG_BLK is not set # CONFIG_BLK is not set
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

2
include/configs/ti_omap5_common.h
View File

@ -89,6 +89,8 @@
"setenv fdtfile dra71-evm.dtb; fi;" \ "setenv fdtfile dra71-evm.dtb; fi;" \
"if test $board_name = beagle_x15; then " \ "if test $board_name = beagle_x15; then " \
"setenv fdtfile am57xx-beagle-x15.dtb; fi;" \ "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
"if test $board_name = beagle_x15_revb1; then " \
"setenv fdtfile am57xx-beagle-x15-revb1.dtb; fi;" \
"if test $board_name = am572x_idk; then " \ "if test $board_name = am572x_idk; then " \
"setenv fdtfile am572x-idk.dtb; fi;" \ "setenv fdtfile am572x-idk.dtb; fi;" \
"if test $board_name = am57xx_evm; then " \ "if test $board_name = am57xx_evm; then " \