diff options
| author | Anatolij Gustschin <agust@denx.de> | 2021-05-24 17:19:56 +0200 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2021-06-05 10:40:47 +0200 |
| commit | ac36dc7d19c2f49f0ee9b17109c2a03cd6a4f123 (patch) | |
| tree | 22d161ae0eabb7fadd2e314b656e08df93081ae9 | |
| parent | bbc14b43de11399792d5288b5d752dc82154f6ad (diff) | |
| download | u-boot-ac36dc7d19c2f49f0ee9b17109c2a03cd6a4f123.tar.gz u-boot-ac36dc7d19c2f49f0ee9b17109c2a03cd6a4f123.tar.xz u-boot-ac36dc7d19c2f49f0ee9b17109c2a03cd6a4f123.zip | |
brxre1: disable video after DM_VIDEO conversion deadline
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>
| -rw-r--r-- | board/BuR/brxre1/board.c | 9 | ||||
| -rw-r--r-- | configs/brxre1_defconfig | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c index ef692b006d..544e09f447 100644 --- a/board/BuR/brxre1/board.c +++ b/board/BuR/brxre1/board.c @@ -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 diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 57f3f437d9..6d9f24314f 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -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 |