diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-14 07:31:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-14 07:31:02 -0500 |
| commit | e6da32f243b3846e5c18183b8604b71ccb535a89 (patch) | |
| tree | 1565067dd56a3642177c22e60b20ed0f3a801410 /board/ti/am57xx | |
| parent | f20d81e1d4c1596cfbf4d9e78c3ca5ffd47948f9 (diff) | |
| parent | 96dd223c2933a9190411f52ab0654f50feca3005 (diff) | |
Merge tag 'ti-v2020.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
K3 J721E/AM65X:
- UART boot fixes for J721E
- Enabling debug uart for AM65x
DRA7xx/AM57xx:
- Preveinting boot from Invalid boot configuration for AM57xx
Keysonte2:
- Linux Boot fixes for K2 platforms.
AM33/AM43/Davinci:
- Ethernt boot fixes for AM43XX
- USB Host boot fixes for AM43XX
Diffstat (limited to 'board/ti/am57xx')
| -rw-r--r-- | board/ti/am57xx/board.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 7528de3e5c..34ca3ec9b0 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -36,6 +36,7 @@ #include <ti-usb-phy-uboot.h> #include <mmc.h> #include <dm/uclass.h> +#include <hang.h> #include "../common/board_detect.h" #include "mux_data.h" @@ -707,6 +708,18 @@ void am57x_idk_lcd_detect(void) } out: env_set("idk_lcd", idk_lcd); + + /* + * On AM571x_IDK, no Display with J51 set to LCD is considered as an + * invalid configuration and we prevent boot to get user attention. + */ + if (board_is_am571x_idk() && am571x_idk_needs_lcd() && + !strncmp(idk_lcd, "no", 2)) { + printf("%s: Invalid HW configuration: display not detected/supported but J51 is set. Remove J51 to boot without display.\n", + __func__); + hang(); + } + return; } |