]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
brxre1: disable video after DM_VIDEO conversion deadline
authorAnatolij Gustschin <agust@denx.de>
Mon, 24 May 2021 15:19:56 +0000 (17:19 +0200)
committerAnatolij Gustschin <agust@denx.de>
Sat, 5 Jun 2021 08:40:47 +0000 (10:40 +0200)
The board was not converted to DM_VIDEO before deadline, so disable
video support for now.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
board/BuR/brxre1/board.c
configs/brxre1_defconfig

index ef692b006d5100dde684cf30eb922ee2d806460a..544e09f447c270374ed205b3a45983e2283d8e34 100644 (file)
@@ -164,12 +164,21 @@ int board_late_init(void)
        br_resetc_bmode();
 
        /* setup othbootargs for bootvx-command (vxWorks bootline) */
+#ifdef CONFIG_LCD
        snprintf(othbootargs, sizeof(othbootargs),
                 "u=vxWorksFTP pw=vxWorks o=0x%08x;0x%08x;0x%08x;0x%08x",
                 (u32)gd->fb_base - 0x20,
                 (u32)env_get_ulong("vx_memtop", 16, gd->fb_base - 0x20),
                 (u32)env_get_ulong("vx_romfsbase", 16, 0),
                 (u32)env_get_ulong("vx_romfssize", 16, 0));
+#else
+       snprintf(othbootargs, sizeof(othbootargs),
+                "u=vxWorksFTP pw=vxWorks o=0x%08x;0x%08x;0x%08x;0x%08x",
+                (u32)gd->relocaddr,
+                (u32)env_get_ulong("vx_memtop", 16, gd->relocaddr),
+                (u32)env_get_ulong("vx_romfsbase", 16, 0),
+                (u32)env_get_ulong("vx_romfssize", 16, 0));
+#endif
        env_set("othbootargs", othbootargs);
        /*
         * reset VBAR registers to its reset location, VxWorks 6.9.3.2 does
index 57f3f437d919dc9ea20c0fe862f944c651b43701..6d9f24314f228ada3fe80d9fd6a9115325b2587a 100644 (file)
@@ -92,8 +92,8 @@ CONFIG_USB_MUSB_TI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_AM335X_LCD=y
-CONFIG_LCD=y
+# CONFIG_AM335X_LCD is not set
+# CONFIG_LCD is not set
 CONFIG_SPL_TINY_MEMSET=y
 # CONFIG_OF_LIBFDT_OVERLAY is not set
 # CONFIG_EFI_LOADER is not set