Message ID | 20200210095924.16814-1-rogerq@ti.com |
---|---|
State | Accepted |
Commit | 4d26dc64d28fee87359d1324f4db8986c5c97f82 |
Headers | show |
Series | board: ti: am57xx-idk: Prevent boot for invalid configuation | expand |
On 10/02/20 3:29 PM, Roger Quadros wrote: > 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 <rogerq at ti.com> > Acked-by: Suman Anna <s-anna at ti.com> Merged into u-boot-ti. Thanks and regards, Lokesh
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index d70ab0c4d0..683d3aa8da 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -706,6 +706,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; }