[PATCH 1/5] rut: 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: Samuel Egli samuel.egli@siemens.com --- configs/rut_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 6fc06f1ed9..5b15789100 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -101,10 +101,10 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0908 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_SYS_CONSOLE_BG_COL=0xff CONFIG_SYS_CONSOLE_FG_COL=0x00 CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_RLE8 is not set
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: Samuel Egli samuel.egli@siemens.com --- configs/pxm2_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 90ef4c8d99..da6b1bb0e3 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -101,10 +101,10 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_SYS_CONSOLE_BG_COL=0xff CONFIG_SYS_CONSOLE_FG_COL=0x00 CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_RLE8 is not set
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: Fabio Estevam festevam@gmail.com --- configs/mx28evk_auart_console_defconfig | 6 +++--- configs/mx28evk_defconfig | 6 +++--- configs/mx28evk_nand_defconfig | 6 +++--- configs/mx28evk_spi_defconfig | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index ec4fd6585e..60b9f3999e 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -56,8 +56,8 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y -CONFIG_VIDEO_BMP_GZIP=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_GZIP is not set +# CONFIG_VIDEO_BMP_RLE8 is not set CONFIG_OF_LIBFDT=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 4f0ed83bc1..abc0c48d21 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -56,8 +56,8 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y -CONFIG_VIDEO_BMP_GZIP=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_GZIP is not set +# CONFIG_VIDEO_BMP_RLE8 is not set CONFIG_OF_LIBFDT=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index 7d95b8fc52..0a376a2f80 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -57,8 +57,8 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y -CONFIG_VIDEO_BMP_GZIP=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_GZIP is not set +# CONFIG_VIDEO_BMP_RLE8 is not set CONFIG_OF_LIBFDT=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index e969d50af7..a6b00c29f5 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -53,8 +53,8 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y -CONFIG_VIDEO_BMP_GZIP=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_GZIP is not set +# CONFIG_VIDEO_BMP_RLE8 is not set CONFIG_OF_LIBFDT=y
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 | 9 +++++++++ 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
These boards were not converted to DM_VIDEO before deadline, so disable video support for now.
Signed-off-by: Anatolij Gustschin agust@denx.de Cc: Richard Hu richard.hu@technexion.com Cc: Fabio Estevam festevam@gmail.com --- configs/pico-dwarf-imx6ul_defconfig | 4 ++-- configs/pico-hobbit-imx6ul_defconfig | 4 ++-- configs/pico-pi-imx6ul_defconfig | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig index 9695eb2657..bf016f80ed 100644 --- a/configs/pico-dwarf-imx6ul_defconfig +++ b/configs/pico-dwarf-imx6ul_defconfig @@ -68,7 +68,7 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_RLE8 is not set diff --git a/configs/pico-hobbit-imx6ul_defconfig b/configs/pico-hobbit-imx6ul_defconfig index 5c1ca0b8d7..14d36c5e6a 100644 --- a/configs/pico-hobbit-imx6ul_defconfig +++ b/configs/pico-hobbit-imx6ul_defconfig @@ -71,7 +71,7 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_RLE8 is not set diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig index 51b71a77e5..ba8b1a1e8e 100644 --- a/configs/pico-pi-imx6ul_defconfig +++ b/configs/pico-pi-imx6ul_defconfig @@ -71,7 +71,7 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_RLE8 is not set
The board was not converted to DM_VIDEO before deadline, so disable video support for now.
Signed-off-by: Anatolij Gustschin agust@denx.de --- Changes in v2: - fix build error: undefined reference to `arch_early_init_r'
configs/rut_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 6fc06f1ed9..2ddf0e63dd 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -31,7 +31,6 @@ CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_ARCH_EARLY_INIT_R=y CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y @@ -101,10 +100,10 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0908 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y -CONFIG_VIDEO=y +# CONFIG_VIDEO is not set # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_SYS_CONSOLE_BG_COL=0xff CONFIG_SYS_CONSOLE_FG_COL=0x00 CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_VIDEO_BMP_RLE8 is not set
participants (1)
-
Anatolij Gustschin