From 4d26dc64d28fee87359d1324f4db8986c5c97f82 Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Mon, 10 Feb 2020 11:59:24 +0200 Subject: [PATCH] board: ti: am57xx-idk: Prevent boot for invalid configuation On am571x-idk there can be following configurations based on Jumper J51 and LCD panel detected. 1) J51 removed (6port): 6 port Ethernet. Disable LCD panel. 2) J51 placed (LCD) + Panel detected: 4 port Ethernet with appropriate LCD. 3) J51 placed (LCD) + Panel not detected/not supported. Configuration 3 is considered invalid as we can't use display nor ICSS1 ethernet ports due to hardware muxing. Alert the user to fix the configuration and prevent boot. Alternative was to allow boot and limit to 4 port Ethernet with no display but this involved introduction of another DTB for the kernel and was considered not worth the hassle. Signed-off-by: Roger Quadros Acked-by: Suman Anna Signed-off-by: Lokesh Vutla --- board/ti/am57xx/board.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 #include #include +#include #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; } -- 2.39.5