moveconfig: Skip binary and ELF files
PATCH v2 1/8 moveconfig: Skip binary and ELF files
Add a few more file extensions to the list of files that should not be processed. This avoids unicode errors, for example.
---
(no changes since v1)
tools/moveconfig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/moveconfig.py +2 -1
@@ -666,7 +666,8 @@ def cleanup_headers(configs, options): if dirpath == os.path.join('include', 'generated'): continue for filename in filenames: - if not filename.endswith(('~', '.dts', '.dtsi')): + if not filename.endswith(('~', '.dts', '.dtsi', '.bin', + '.elf')): header_path = os.path.join(dirpath, filename) # This file contains UTF-16 data and no CONFIG symbols if header_path == 'include/video_font_data.h':
Signature · 1 line
2.28.0.236.gb10cc79966-goog
PATCH v2 2/8 Convert CONFIG_SPLASH_SCREEN et al to Kconfig
This converts the following to Kconfig:
CONFIG_SPLASH_SCREEN
CONFIG_SPLASH_SCREEN_ALIGN
CONFIG_SPLASHIMAGE_GUARD
CONFIG_SPLASH_SOURCE
---
(no changes since v1)
README | 42 ------------ configs/apalis_imx6_defconfig | 2 + configs/aristainetos2_defconfig | 2 + configs/aristainetos2b_defconfig | 2 + configs/aristainetos2bcsl_defconfig | 2 + configs/aristainetos2c_defconfig | 2 + configs/cgtqmx6eval_defconfig | 2 + configs/cm_fx6_defconfig | 2 + configs/colibri-imx6ull_defconfig | 2 + configs/colibri_imx6_defconfig | 2 + configs/colibri_imx7_defconfig | 2 + configs/colibri_imx7_emmc_defconfig | 2 + configs/colibri_vf_defconfig | 1 + configs/dms-ba16-1g_defconfig | 2 + configs/dms-ba16_defconfig | 2 + configs/eb_cpu5282_defconfig | 1 + configs/eb_cpu5282_internal_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/imx6dl_icore_nand_defconfig | 2 + configs/imx6q_icore_nand_defconfig | 2 + configs/imx6qdl_icore_mmc_defconfig | 2 + configs/imx6qdl_icore_nand_defconfig | 2 + configs/imxrt1050-evk_defconfig | 2 + configs/khadas-vim3_defconfig | 2 + configs/khadas-vim3l_defconfig | 2 + configs/libretech-ac_defconfig | 2 + configs/libretech-cc_defconfig | 2 + configs/libretech-s905d-pc_defconfig | 2 + configs/libretech-s912-pc_defconfig | 2 + configs/m53menlo_defconfig | 4 ++ configs/marsboard_defconfig | 2 + configs/mx23evk_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 1 + configs/mx28evk_defconfig | 1 + configs/mx28evk_nand_defconfig | 1 + configs/mx28evk_spi_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/mx53loco_defconfig | 1 + configs/mx6cuboxi_defconfig | 2 + configs/mx6qsabrelite_defconfig | 2 + configs/mx6sabreauto_defconfig | 2 + configs/mx6sabresd_defconfig | 2 + configs/mx6sxsabresd_defconfig | 2 + configs/mx6ul_14x14_evk_defconfig | 2 + configs/mx6ul_9x9_evk_defconfig | 2 + configs/mx7dsabresd_defconfig | 2 + configs/mx7dsabresd_qspi_defconfig | 2 + configs/nitrogen6dl2g_defconfig | 2 + configs/nitrogen6dl_defconfig | 2 + configs/nitrogen6q2g_defconfig | 2 + configs/nitrogen6q_defconfig | 2 + configs/nitrogen6s1g_defconfig | 2 + configs/nitrogen6s_defconfig | 2 + configs/nokia_rx51_defconfig | 1 + configs/novena_defconfig | 1 + configs/odroid-c2_defconfig | 2 + configs/odroid-c4_defconfig | 2 + configs/opos6uldev_defconfig | 3 + configs/pico-dwarf-imx6ul_defconfig | 2 + configs/pico-dwarf-imx7d_defconfig | 2 + configs/pico-hobbit-imx6ul_defconfig | 2 + configs/pico-hobbit-imx7d_defconfig | 2 + configs/pico-imx6_defconfig | 2 + configs/pico-imx6ul_defconfig | 2 + configs/pico-imx7d_bl33_defconfig | 2 + configs/pico-imx7d_defconfig | 2 + configs/pico-nymph-imx7d_defconfig | 2 + configs/pico-pi-imx6ul_defconfig | 2 + configs/pico-pi-imx7d_defconfig | 2 + configs/pxm2_defconfig | 2 + configs/riotboard_defconfig | 2 + configs/riotboard_spl_defconfig | 2 + configs/rut_defconfig | 2 + configs/s5p4418_nanopi2_defconfig | 3 + configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + configs/sei510_defconfig | 2 + configs/sei610_defconfig | 2 + configs/stm32f746-disco_defconfig | 2 + configs/stm32f769-disco_defconfig | 2 + configs/tools-only_defconfig | 1 + configs/wandboard_defconfig | 2 + drivers/video/Kconfig | 85 +++++++++++++++++++++++++ include/configs/M52277EVB.h | 1 - include/configs/advantech_dms-ba16.h | 2 - include/configs/apalis_imx6.h | 2 - include/configs/aristainetos2.h | 2 - include/configs/cgtqmx6eval.h | 2 - include/configs/cm_fx6.h | 2 - include/configs/colibri-imx6ull.h | 2 - include/configs/colibri_imx6.h | 2 - include/configs/colibri_imx7.h | 2 - include/configs/colibri_vf.h | 1 - include/configs/eb_cpu5282.h | 1 - include/configs/embestmx6boards.h | 2 - include/configs/gw_ventana.h | 1 - include/configs/imx6-engicam.h | 2 - include/configs/imxrt1050-evk.h | 2 - include/configs/m53menlo.h | 4 -- include/configs/meson64.h | 2 - include/configs/mx23evk.h | 1 - include/configs/mx28evk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx6cuboxi.h | 2 - include/configs/mx6sabre_common.h | 2 - include/configs/mx6sxsabresd.h | 2 - include/configs/mx6ul_14x14_evk.h | 2 - include/configs/mx7dsabresd.h | 2 - include/configs/nitrogen6x.h | 2 - include/configs/nokia_rx51.h | 1 - include/configs/novena.h | 1 - include/configs/opos6uldev.h | 3 - include/configs/pico-imx6.h | 2 - include/configs/pico-imx6ul.h | 2 - include/configs/pico-imx7d.h | 2 - include/configs/pxm2.h | 2 - include/configs/rut.h | 2 - include/configs/s5p4418_nanopi2.h | 4 -- include/configs/sandbox.h | 1 - include/configs/stm32f746-disco.h | 2 - include/configs/wandboard.h | 2 - scripts/config_whitelist.txt | 4 -- 127 files changed, 239 insertions(+), 118 deletions(-)
README +0 -42
@@ -1250,48 +1250,6 @@ The following options need to be configured: Enables an 'i2c edid' command which can read EDID information over I2C from an attached LCD display. -- Splash Screen Support: CONFIG_SPLASH_SCREEN - - If this option is set, the environment is checked for - a variable "splashimage". If found, the usual display - of logo, copyright and system information on the LCD - is suppressed and the BMP image at the address - specified in "splashimage" is loaded instead. The - console is redirected to the "nulldev", too. This - allows for a "silent" boot where a splash screen is - loaded very quickly after power-on. - - CONFIG_SPLASHIMAGE_GUARD - - If this option is set, then U-Boot will prevent the environment - variable "splashimage" from being set to a problematic address - (see doc/README.displaying-bmps). - This option is useful for targets where, due to alignment - restrictions, an improperly aligned BMP image will cause a data - abort. If you think you will not have problems with unaligned - accesses (for example because your toolchain prevents them) - there is no need to set this option. - - CONFIG_SPLASH_SCREEN_ALIGN - - If this option is set the splash image can be freely positioned - on the screen. Environment variable "splashpos" specifies the - position as "x,y". If a positive number is given it is used as - number of pixel from left/top. If a negative number is given it - is used as number of pixel from right/bottom. You can also - specify 'm' for centering the image. - - Example: - setenv splashpos m,m - => image at center of screen - - setenv splashpos 30,20 - => image at x = 30 and y = 20 - - setenv splashpos -10,m - => vertically centered image - at x = dspWidth - bmpWidth - 9 - - Gzip compressed BMP image support: CONFIG_VIDEO_BMP_GZIP If this option is set, additionally to standard BMP
configs/apalis_imx6_defconfig +2 -0
@@ -103,4 +103,6 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/aristainetos2_defconfig +2 -0
@@ -111,5 +111,7 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_DISPLAY=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_IMX_WATCHDOG=y # CONFIG_EFI_LOADER is not set
configs/aristainetos2b_defconfig +2 -0
@@ -105,5 +105,7 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_DISPLAY=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_IMX_WATCHDOG=y # CONFIG_EFI_LOADER is not set
configs/aristainetos2bcsl_defconfig +2 -0
@@ -105,5 +105,7 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_DISPLAY=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_IMX_WATCHDOG=y # CONFIG_EFI_LOADER is not set
configs/aristainetos2c_defconfig +2 -0
@@ -111,5 +111,7 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_DISPLAY=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_IMX_WATCHDOG=y # CONFIG_EFI_LOADER is not set
configs/cgtqmx6eval_defconfig +2 -0
@@ -90,4 +90,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT=y
configs/cm_fx6_defconfig +2 -0
@@ -94,4 +94,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SOURCE=y CONFIG_FDT_FIXUP_PARTITIONS=y
configs/colibri-imx6ull_defconfig +2 -0
@@ -91,5 +91,7 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y
configs/colibri_imx6_defconfig +2 -0
@@ -101,4 +101,6 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/colibri_imx7_defconfig +2 -0
@@ -91,5 +91,7 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y
configs/colibri_imx7_emmc_defconfig +2 -0
@@ -87,4 +87,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/colibri_vf_defconfig +1 -0
@@ -96,6 +96,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP16 is not set CONFIG_VIDEO_FSL_DCU_FB=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y # CONFIG_EFI_UNICODE_CAPITALIZATION is not set
configs/dms-ba16-1g_defconfig +2 -0
@@ -60,4 +60,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT=y
configs/dms-ba16_defconfig +2 -0
@@ -59,4 +59,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT=y
configs/eb_cpu5282_defconfig +1 -0
@@ -34,3 +34,4 @@ CONFIG_MCFFEC=y CONFIG_MII=y CONFIG_VIDEO=y # CONFIG_CFB_CONSOLE is not set +CONFIG_SPLASH_SCREEN=y
configs/eb_cpu5282_internal_defconfig +1 -0
@@ -33,3 +33,4 @@ CONFIG_MCFFEC=y CONFIG_MII=y CONFIG_VIDEO=y # CONFIG_CFB_CONSOLE is not set +CONFIG_SPLASH_SCREEN=y
configs/gwventana_emmc_defconfig +1 -0
@@ -103,5 +103,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT=y CONFIG_FDT_FIXUP_PARTITIONS=y
configs/gwventana_gw5904_defconfig +1 -0
@@ -107,5 +107,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT=y CONFIG_FDT_FIXUP_PARTITIONS=y
configs/gwventana_nand_defconfig +1 -0
@@ -107,5 +107,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT=y CONFIG_FDT_FIXUP_PARTITIONS=y
configs/imx6dl_icore_nand_defconfig +2 -0
@@ -63,3 +63,5 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/imx6q_icore_nand_defconfig +2 -0
@@ -64,3 +64,5 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/imx6qdl_icore_mmc_defconfig +2 -0
@@ -80,4 +80,6 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_IMX_WATCHDOG=y
configs/imx6qdl_icore_nand_defconfig +2 -0
@@ -64,3 +64,5 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/imxrt1050-evk_defconfig +2 -0
@@ -68,6 +68,8 @@ CONFIG_SPL_TIMER=y CONFIG_DM_VIDEO=y CONFIG_BACKLIGHT_GPIO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SHA1=y CONFIG_SHA256=y CONFIG_HEXDUMP=y
configs/khadas-vim3_defconfig +2 -0
@@ -71,4 +71,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/khadas-vim3l_defconfig +2 -0
@@ -71,4 +71,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/libretech-ac_defconfig +2 -0
@@ -80,4 +80,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/libretech-cc_defconfig +2 -0
@@ -63,4 +63,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/libretech-s905d-pc_defconfig +2 -0
@@ -73,4 +73,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/libretech-s912-pc_defconfig +2 -0
@@ -72,4 +72,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/m53menlo_defconfig +4 -0
@@ -100,5 +100,9 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASHIMAGE_GUARD=y +CONFIG_SPLASH_SCREEN_ALIGN=y +CONFIG_SPLASH_SOURCE=y CONFIG_WATCHDOG_TIMEOUT_MSECS=8000 CONFIG_IMX_WATCHDOG=y
configs/marsboard_defconfig +2 -0
@@ -49,4 +49,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT=y
configs/mx23evk_defconfig +1 -0
@@ -38,4 +38,5 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y CONFIG_OF_LIBFDT=y
configs/mx28evk_auart_console_defconfig +1 -0
@@ -57,4 +57,5 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y CONFIG_OF_LIBFDT=y
configs/mx28evk_defconfig +1 -0
@@ -57,4 +57,5 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y CONFIG_OF_LIBFDT=y
configs/mx28evk_nand_defconfig +1 -0
@@ -58,4 +58,5 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y CONFIG_OF_LIBFDT=y
configs/mx28evk_spi_defconfig +1 -0
@@ -54,4 +54,5 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y CONFIG_OF_LIBFDT=y
configs/mx51evk_defconfig +1 -0
@@ -38,4 +38,5 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y CONFIG_OF_LIBFDT=y
configs/mx53loco_defconfig +1 -0
@@ -39,4 +39,5 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y CONFIG_OF_LIBFDT=y
configs/mx6cuboxi_defconfig +2 -0
@@ -77,3 +77,5 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/mx6qsabrelite_defconfig +2 -0
@@ -78,3 +78,5 @@ CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/mx6sabreauto_defconfig +2 -0
@@ -104,3 +104,5 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/mx6sabresd_defconfig +2 -0
@@ -113,3 +113,5 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/mx6sxsabresd_defconfig +2 -0
@@ -73,3 +73,5 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/mx6ul_14x14_evk_defconfig +2 -0
@@ -89,3 +89,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/mx6ul_9x9_evk_defconfig +2 -0
@@ -79,3 +79,5 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/mx7dsabresd_defconfig +2 -0
@@ -85,4 +85,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_ERRNO_STR=y
configs/mx7dsabresd_qspi_defconfig +2 -0
@@ -92,4 +92,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_ERRNO_STR=y
configs/nitrogen6dl2g_defconfig +2 -0
@@ -79,3 +79,5 @@ CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/nitrogen6dl_defconfig +2 -0
@@ -79,3 +79,5 @@ CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/nitrogen6q2g_defconfig +2 -0
@@ -81,3 +81,5 @@ CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/nitrogen6q_defconfig +2 -0
@@ -81,3 +81,5 @@ CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/nitrogen6s1g_defconfig +2 -0
@@ -79,3 +79,5 @@ CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/nitrogen6s_defconfig +2 -0
@@ -79,3 +79,5 @@ CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/nokia_rx51_defconfig +1 -0
@@ -57,4 +57,5 @@ CONFIG_TWL4030_USB=y CONFIG_VIDEO=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set +CONFIG_SPLASH_SCREEN=y # CONFIG_GZIP is not set
configs/novena_defconfig +1 -0
@@ -77,3 +77,4 @@ CONFIG_USB_ETHER_SMSC95XX=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y
configs/odroid-c2_defconfig +2 -0
@@ -56,5 +56,7 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SMBIOS_MANUFACTURER="Hardkernel Co., Ltd."
configs/odroid-c4_defconfig +2 -0
@@ -58,4 +58,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/opos6uldev_defconfig +3 -0
@@ -105,5 +105,8 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y +CONFIG_SPLASH_SOURCE=y CONFIG_OF_LIBFDT_OVERLAY=y # CONFIG_EFI_LOADER is not set
configs/pico-dwarf-imx6ul_defconfig +2 -0
@@ -69,3 +69,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pico-dwarf-imx7d_defconfig +2 -0
@@ -78,3 +78,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pico-hobbit-imx6ul_defconfig +2 -0
@@ -72,3 +72,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pico-hobbit-imx7d_defconfig +2 -0
@@ -78,3 +78,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pico-imx6_defconfig +2 -0
@@ -88,3 +88,5 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pico-imx6ul_defconfig +2 -0
@@ -74,3 +74,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pico-imx7d_bl33_defconfig +2 -0
@@ -74,4 +74,6 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/pico-imx7d_defconfig +2 -0
@@ -78,3 +78,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pico-nymph-imx7d_defconfig +2 -0
@@ -78,3 +78,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pico-pi-imx6ul_defconfig +2 -0
@@ -72,3 +72,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pico-pi-imx7d_defconfig +2 -0
@@ -78,3 +78,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
configs/pxm2_defconfig +2 -0
@@ -104,3 +104,5 @@ CONFIG_VIDEO=y # 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
configs/riotboard_defconfig +2 -0
@@ -50,4 +50,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT=y
configs/riotboard_spl_defconfig +2 -0
@@ -60,5 +60,7 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT=y CONFIG_SPL_OF_LIBFDT=y
configs/rut_defconfig +2 -0
@@ -104,3 +104,5 @@ CONFIG_VIDEO=y # 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
configs/s5p4418_nanopi2_defconfig +3 -0
@@ -52,4 +52,7 @@ CONFIG_VIDEO_NX=y CONFIG_VIDEO_NX_RGB=y CONFIG_VIDEO_NX_LVDS=y CONFIG_VIDEO_NX_HDMI=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y +CONFIG_SPLASH_SOURCE=y CONFIG_ERRNO_STR=y
configs/sandbox64_defconfig +1 -0
@@ -214,6 +214,7 @@ CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_WDT=y CONFIG_WDT_SANDBOX=y CONFIG_FS_CBFS=y
configs/sandbox_defconfig +1 -0
@@ -246,6 +246,7 @@ CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_VIDEO_DSI_HOST_SANDBOX=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_W1=y CONFIG_W1_GPIO=y CONFIG_W1_EEPROM=y
configs/sandbox_flattree_defconfig +1 -0
@@ -191,6 +191,7 @@ CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_CMD_DHRYSTONE=y CONFIG_RSA_VERIFY_WITH_PKEY=y CONFIG_TPM=y
configs/sandbox_spl_defconfig +1 -0
@@ -210,6 +210,7 @@ CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y # CONFIG_SPL_USE_TINY_PRINTF is not set
configs/sei510_defconfig +2 -0
@@ -78,4 +78,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/sei610_defconfig +2 -0
@@ -78,4 +78,6 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MESON=y CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/stm32f746-disco_defconfig +2 -0
@@ -60,4 +60,6 @@ CONFIG_BACKLIGHT_GPIO=y CONFIG_VIDEO_STM32=y CONFIG_VIDEO_STM32_MAX_XRES=480 CONFIG_VIDEO_STM32_MAX_YRES=640 +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/stm32f769-disco_defconfig +2 -0
@@ -62,4 +62,6 @@ CONFIG_VIDEO_STM32=y CONFIG_VIDEO_STM32_DSI=y CONFIG_VIDEO_STM32_MAX_XRES=480 CONFIG_VIDEO_STM32_MAX_YRES=800 +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/tools-only_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_PCI_SANDBOX=y CONFIG_DM_RTC=y CONFIG_SOUND=y CONFIG_SYSRESET=y +CONFIG_SPLASH_SCREEN_ALIGN=y # CONFIG_VIRTIO_MMIO is not set # CONFIG_VIRTIO_PCI is not set # CONFIG_VIRTIO_SANDBOX is not set
configs/wandboard_defconfig +2 -0
@@ -78,3 +78,5 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPLASH_SCREEN=y +CONFIG_SPLASH_SCREEN_ALIGN=y
drivers/video/Kconfig +85 -0
89 lines not on this page · raw message
include/configs/M52277EVB.h +0 -1
@@ -74,7 +74,6 @@/* LCD */ #ifdef CONFIG_CMD_BMP -#define CONFIG_SPLASH_SCREEN #define CONFIG_LCD_LOGO #define CONFIG_SHARP_LQ035Q7DH06 #endif
include/configs/advantech_dms-ba16.h +0 -2
@@ -198,8 +198,6 @@/* Framebuffer */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
include/configs/apalis_imx6.h +0 -2
@@ -68,8 +68,6 @@/* Framebuffer and LCD */ #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
include/configs/aristainetos2.h +0 -2
@@ -438,8 +438,6 @@/* Framebuffer */ /* check this console not needed, after test remove it */ -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_IMX_VIDEO_SKIP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
include/configs/cgtqmx6eval.h +0 -2
@@ -61,8 +61,6 @@/* Framebuffer */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
include/configs/cm_fx6.h +0 -2
@@ -204,8 +204,6 @@/* Display */ #define CONFIG_IMX_HDMI -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SOURCE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_LOGO
include/configs/colibri-imx6ull.h +0 -2
@@ -153,8 +153,6 @@#define CONFIG_VIDEO_MXS #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR#define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/colibri_imx6.h +0 -2
@@ -56,8 +56,6 @@/* Framebuffer and LCD */ #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
include/configs/colibri_imx7.h +0 -2
@@ -216,8 +216,6 @@#if defined(CONFIG_VIDEO ) || defined(CONFIG_DM_VIDEO )#define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/colibri_vf.h +0 -1
@@ -19,7 +19,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT #ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_SYS_FSL_DCU_LE
include/configs/eb_cpu5282.h +0 -1
@@ -27,7 +27,6 @@#define CONFIG_BOOT_RETRY_TIME -1#define CONFIG_RESET_TO_RETRY -#define CONFIG_SPLASH_SCREEN #define CONFIG_HW_WATCHDOG
include/configs/embestmx6boards.h +0 -2
@@ -73,8 +73,6 @@/* Framebuffer */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
include/configs/gw_ventana.h +0 -1
@@ -122,7 +122,6 @@#define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_HIDE_LOGO_VERSION /* Custom config to hide U-boot version */ /* Miscellaneous configurable options */
include/configs/imx6-engicam.h +0 -2
@@ -165,8 +165,6 @@#ifdef CONFIG_VIDEO_IPUV3 # define CONFIG_IMX_VIDEO_SKIP -# define CONFIG_SPLASH_SCREEN -# define CONFIG_SPLASH_SCREEN_ALIGN # define CONFIG_BMP_16BPP # define CONFIG_VIDEO_BMP_RLE8 # define CONFIG_VIDEO_LOGO
include/configs/imxrt1050-evk.h +0 -2
@@ -31,8 +31,6 @@#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/m53menlo.h +0 -4
@@ -128,9 +128,6 @@*/ #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASHIMAGE_GUARD -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
@@ -138,7 +135,6 @@/* LVDS display */ #define CONFIG_SYS_LDB_CLOCK 33260000#define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_SPLASH_SOURCE /* IIM Fuses */ #define CONFIG_FSL_IIM
include/configs/meson64.h +0 -2
@@ -22,8 +22,6 @@#define CONFIG_BMP_16BPP #define CONFIG_BMP_24BPP #define CONFIG_BMP_32BPP -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define STDOUT_CFG "vidconsole,serial"#else #define STDOUT_CFG "serial"
include/configs/mx23evk.h +0 -1
@@ -31,7 +31,6 @@/* Framebuffer support */ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP
include/configs/mx28evk.h +0 -1
@@ -52,7 +52,6 @@/* Framebuffer support */ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP
include/configs/mx51evk.h +0 -1
@@ -66,7 +66,6 @@/* Framebuffer and LCD */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO
include/configs/mx53loco.h +0 -1
@@ -177,7 +177,6 @@/* Framebuffer and LCD */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO
include/configs/mx6cuboxi.h +0 -2
@@ -30,8 +30,6 @@/* Framebuffer */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
include/configs/mx6sabre_common.h +0 -2
@@ -170,8 +170,6 @@/* Framebuffer */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
include/configs/mx6sxsabresd.h +0 -2
@@ -176,8 +176,6 @@#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/mx6ul_14x14_evk.h +0 -2
@@ -183,8 +183,6 @@#if defined(CONFIG_DM_VIDEO )#define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/mx7dsabresd.h +0 -2
@@ -141,8 +141,6 @@#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/nitrogen6x.h +0 -2
@@ -58,8 +58,6 @@/* Framebuffer and LCD */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024)#define CONFIG_BMP_16BPP
include/configs/nokia_rx51.h +0 -1
@@ -101,7 +101,6 @@#define CONFIG_VIDEO_LOGO #define VIDEO_FB_16BPP_PIXEL_SWAP #define VIDEO_FB_16BPP_WORD_SWAP -#define CONFIG_SPLASH_SCREEN /* functions for cfb_console */ #define VIDEO_KBD_INIT_FCT rx51_kp_init()
include/configs/novena.h +0 -1
@@ -103,7 +103,6 @@/* Video output */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_IMX_HDMI
include/configs/opos6uldev.h +0 -3
@@ -45,9 +45,6 @@#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN -#define CONFIG_SPLASH_SOURCE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_BMP_16BPP
include/configs/pico-imx6.h +0 -2
@@ -144,8 +144,6 @@/* Framebuffer */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
include/configs/pico-imx6ul.h +0 -2
@@ -147,8 +147,6 @@#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/pico-imx7d.h +0 -2
@@ -143,8 +143,6 @@#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/pxm2.h +0 -2
@@ -114,8 +114,6 @@#if defined(CONFIG_VIDEO )#define CONFIG_VIDEO_DA8XX -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/rut.h +0 -2
@@ -107,8 +107,6 @@#if defined(CONFIG_VIDEO )#define CONFIG_VIDEO_DA8XX -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO
include/configs/s5p4418_nanopi2.h +0 -4
@@ -152,8 +152,6 @@#define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#ifdef CONFIG_VIDEO_LOGO #ifdef CONFIG_DM_VIDEO
@@ -161,8 +159,6 @@#endif #ifdef CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SOURCE 1 -#define CONFIG_SPLASH_SCREEN_ALIGN 1#define SPLASH_FILE logo.bmp#endif
include/configs/sandbox.h +0 -1
@@ -81,7 +81,6 @@#define LCD_BPP LCD_COLOR16#define CONFIG_LCD_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_KEYBOARD
include/configs/stm32f746-disco.h +0 -2
@@ -81,8 +81,6 @@#define CONFIG_BMP_16BPP #define CONFIG_BMP_24BPP #define CONFIG_BMP_32BPP -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #endif #endif /* __CONFIG_H */
include/configs/wandboard.h +0 -2
@@ -38,8 +38,6 @@/* Framebuffer */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO
scripts/config_whitelist.txt +0 -4
@@ -1584,10 +1584,6 @@ CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_IDLE_VAL CONFIG_SPI_LENGTH CONFIG_SPI_N25Q256A_RESET -CONFIG_SPLASHIMAGE_GUARD -CONFIG_SPLASH_SCREEN -CONFIG_SPLASH_SCREEN_ALIGN -CONFIG_SPLASH_SOURCE CONFIG_SPLL_FREQ CONFIG_SPL_ CONFIG_SPL_ATMEL_SIZE
Signature · 1 line
2.28.0.236.gb10cc79966-goog
PATCH v2 2/8 Convert CONFIG_SPLASH_SCREEN et al to Kconfig
Quoted 7 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_SPLASH_SCREEN
CONFIG_SPLASH_SCREEN_ALIGN
CONFIG_SPLASHIMAGE_GUARD
CONFIG_SPLASH_SOURCESigned-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200823/885a55f0/attachment.sig>
PATCH v2 3/8 Convert CONFIG_SYS_DEVICE_NULLDEV to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_SYS_DEVICE_NULLDEV
---
(no changes since v1)
common/Kconfig | 16 ++++++++++++++++ configs/M5249EVB_defconfig | 1 + configs/colibri_pxa270_defconfig | 1 + doc/README.silent | 2 +- include/configs/M5249EVB.h | 2 -- include/configs/colibri_pxa270.h | 2 -- scripts/config_whitelist.txt | 1 - 7 files changed, 19 insertions(+), 6 deletions(-)
common/Kconfig +16 -0
@@ -635,6 +635,22 @@ config SYS_STDIO_DEREGISTER removed (for example a USB keyboard) then this option can be enabled to ensure this is handled correctly. +config SPL_SYS_STDIO_DEREGISTER + bool "Allow deregistering stdio devices in SPL" + help + Generally there is no need to deregister stdio devices since they + are never deactivated. But if a stdio device is used which can be + removed (for example a USB keyboard) then this option can be + enabled to ensure this is handled correctly. This is very rarely + needed in SPL. + +config SYS_DEVICE_NULLDEV + bool "Enable a null device for stdio" + help + Enable creation of a "nulldev" stdio device. This allows silent + operation of the console by setting stdout to "nulldev". Enable + this to use a serial console under board control. + endmenu menu "Logging"
configs/M5249EVB_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_TARGET_M5249EVB=y CONFIG_DEFAULT_DEVICE_TREE="M5249EVB" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_SYS_DEVICE_NULLDEV=y # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTOBOOT is not set
configs/colibri_pxa270_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=tty0 console=ttyS0,115200" +CONFIG_SYS_DEVICE_NULLDEV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_CMDLINE_EDITING is not set
doc/README.silent +1 -1
@@ -19,7 +19,7 @@ The following actions are taken if "silent" is set at boot time: - When the console devices have been initialized, "stdout" and "stderr" are set to "nulldev", so subsequent messages are suppressed automatically. Make sure to enable "nulldev" by - #defining CONFIG_SYS_DEVICE_NULLDEV in your board config file. + enabling CONFIG_SYS_DEVICE_NULLDEV in your board defconfig file. - When booting a linux kernel, the "bootargs" are fixed up so that the argument "console=" will be in the command line, no matter how
include/configs/M5249EVB.h +0 -2
@@ -31,8 +31,6 @@*/ #undef CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ -#define CONFIG_SYS_LOAD_ADDR 0x200000/* default load address */ /*
include/configs/colibri_pxa270.h +0 -2
@@ -69,8 +69,6 @@#define CONFIG_BOOTP_BOOTFILESIZE #endif -#define CONFIG_SYS_DEVICE_NULLDEV 1 -/* * Clock Configuration */
scripts/config_whitelist.txt +0 -1
@@ -2117,7 +2117,6 @@ CONFIG_SYS_DEBUG_SERVER_FW_IN_NOR CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS CONFIG_SYS_DEFAULT_VIDEO_MODE CONFIG_SYS_DEF_EEPROM_ADDR -CONFIG_SYS_DEVICE_NULLDEV CONFIG_SYS_DFU_DATA_BUF_SIZE CONFIG_SYS_DFU_MAX_FILE_SIZE CONFIG_SYS_DIAG_ADDR
Signature · 1 line
2.28.0.236.gb10cc79966-goog
PATCH v2 3/8 Convert CONFIG_SYS_DEVICE_NULLDEV to Kconfig
Quoted 4 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_SYS_DEVICE_NULLDEVSigned-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200823/8db40987/attachment.sig>
PATCH v2 4/8 stdio: Tidy up use of CONFIG_SYS_DEVICE_NULLDEV
In reply to Simon GlassNow that this is in Kconfig we can move the logic at the top of the file to Kconfig, and use if() instead of #if. Update the file with these changes.
---
(no changes since v1)
common/Kconfig | 1 + common/stdio.c | 30 ++++++++++-------------------- 2 files changed, 11 insertions(+), 20 deletions(-)
common/Kconfig +1 -0
@@ -646,6 +646,7 @@ config SPL_SYS_STDIO_DEREGISTER config SYS_DEVICE_NULLDEV bool "Enable a null device for stdio" + default y if SPLASH_SCREEN || SYS_STDIO_DEREGISTER help Enable creation of a "nulldev" stdio device. This allows silent operation of the console by setting stdout to "nulldev". Enable
common/stdio.c +10 -20
@@ -31,15 +31,6 @@ static struct stdio_dev devs;struct stdio_dev *stdio_devices[] = {NULL ,NULL ,NULL };char *stdio_names[MAX_FILES ] = {"stdin" ,"stdout" ,"stderr" }; -#if defined(CONFIG_SPLASH_SCREEN ) && !defined(CONFIG_SYS_DEVICE_NULLDEV ) -#define CONFIG_SYS_DEVICE_NULLDEV 1 -#endif - -#if CONFIG_IS_ENABLED (SYS_STDIO_DEREGISTER ) -#define CONFIG_SYS_DEVICE_NULLDEV 1 -#endif - -#ifdef CONFIG_SYS_DEVICE_NULLDEV static void nulldev_putc (struct stdio_dev *dev,const char c) {/* nulldev is empty! */
@@ -55,7 +46,6 @@ static int nulldev_input(struct stdio_dev *dev)/* nulldev is empty! */ return 0 ; } -#endif static void stdio_serial_putc (struct stdio_dev *dev,const char c) {
@@ -96,18 +86,18 @@ static void drv_system_init (void) dev.tstc = stdio_serial_tstc;stdio_register (&dev); -#ifdef CONFIG_SYS_DEVICE_NULLDEV -memset (&dev,0 ,sizeof (dev)); +if (CONFIG_IS_ENABLED (SYS_DEVICE_NULLDEV )) { +memset (&dev,'\0' ,sizeof (dev)); -strcpy (dev.name,"nulldev" ); - dev.flags =DEV_FLAGS_OUTPUT |DEV_FLAGS_INPUT ; - dev.putc = nulldev_putc; - dev.puts = nulldev_puts; - dev.getc = nulldev_input; - dev.tstc = nulldev_input; +strcpy (dev.name,"nulldev" ); + dev.flags =DEV_FLAGS_OUTPUT |DEV_FLAGS_INPUT ; + dev.putc = nulldev_putc; + dev.puts = nulldev_puts; + dev.getc = nulldev_input; + dev.tstc = nulldev_input; -stdio_register (&dev); -#endif +stdio_register (&dev); + } }/**************************************************************************
Signature · 1 line
2.28.0.236.gb10cc79966-goog
PATCH v2 4/8 stdio: Tidy up use of CONFIG_SYS_DEVICE_NULLDEV
Quoted 5 lines · Simon Glass
Now that this is in
Kconfigwe can move the logic at the top of the file toKconfig, and useif()instead of #if. Update the file with these changes.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200823/ea59dc14/attachment.sig>
PATCH v2 5/8 stdio: Drop #ifdefs in the header file
In reply to Simon GlassThese prevent the use of IS_ENABLED() and are unnecessary. Drop them and fix a few code-style nits nearby.
---
(no changes since v1)
include/stdio_dev.h | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-)
include/stdio_dev.h +12 -28
@@ -57,7 +57,7 @@ extern char *stdio_names[MAX_FILES];/* * PROTOTYPES */ -int stdio_register (struct stdio_dev * dev); +int stdio_register (struct stdio_dev *dev);int stdio_register_dev (struct stdio_dev *dev,struct stdio_dev **devp);/**
@@ -82,35 +82,19 @@ int stdio_add_devices(void);*/ int stdio_init (void ); -void stdio_print_current_devices (void ); -#if CONFIG_IS_ENABLED (SYS_STDIO_DEREGISTER ) +void stdio_print_current_devices (void );int stdio_deregister (const char *devname,int force);int stdio_deregister_dev (struct stdio_dev *dev,int force); -#endif -struct list_head *stdio_get_list (void ); -struct stdio_dev *stdio_get_by_name (const char * name); -struct stdio_dev *stdio_clone (struct stdio_dev *dev); - -#ifdef CONFIG_LCD -int drv_lcd_init (void ); -#endif -#if defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE ) -int drv_video_init (void ); -#endif -#ifdef CONFIG_KEYBOARD -int drv_keyboard_init (void ); -#endif -#ifdef CONFIG_USB_TTY -int drv_usbtty_init (void ); -#endif -#ifdef CONFIG_NETCONSOLE -int drv_nc_init (void ); -#endif -#ifdef CONFIG_JTAG_CONSOLE -int drv_jtag_console_init (void ); -#endif -#ifdef CONFIG_CBMEM_CONSOLE +struct list_head *stdio_get_list (void ); +struct stdio_dev *stdio_get_by_name (const char *name); +struct stdio_dev *stdio_clone (struct stdio_dev *dev); + +int drv_lcd_init (void ); +int drv_video_init (void ); +int drv_keyboard_init (void ); +int drv_usbtty_init (void ); +int drv_nc_init (void ); +int drv_jtag_console_init (void );int cbmemc_init (void ); -#endif #endif
Signature · 1 line
2.28.0.236.gb10cc79966-goog
PATCH v2 5/8 stdio: Drop #ifdefs in the header file
Quoted 4 lines · Simon Glass
These prevent the use of
IS_ENABLED()and are unnecessary. Drop them and fix a few code-style nits nearby.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200823/dd7eee65/attachment.sig>
PATCH v2 6/8 stdio: Update to use compiler for Kconfig checks
In reply to Simon GlassDrop use of the preprocessor where possible.
---
(no changes since v1)
common/stdio.c | 172 ++++++++++++++++++++++++------------------------- 1 file changed, 83 insertions(+), 89 deletions(-)
common/stdio.c +83 -89
@@ -18,10 +18,7 @@#include <stdio_dev.h> #include <serial.h> #include <splash.h> - -#if defined(CONFIG_SYS_I2C )#include <i2c.h> -#endif #include <dm/device-internal.h>
@@ -109,7 +106,6 @@ struct list_head* stdio_get_list(void)return &(devs.list); } -#ifdef CONFIG_DM_VIDEO /** * stdio_probe_device() - Find a device which provides the given stdio device *
@@ -160,7 +156,6 @@ static int stdio_probe_device(const char *name, enum uclass_id id,return 0 ; } -#endif struct stdio_dev *stdio_get_by_name (const char *name) {
@@ -175,22 +170,23 @@ struct stdio_dev *stdio_get_by_name(const char *name)if (strcmp (sdev->name, name) ==0 )return sdev; } -#ifdef CONFIG_DM_VIDEO -/* -* We did not find a suitable stdio device. If there is a video -* driver with a name starting with 'vidconsole', we can try probing -* that in the hope that it will produce the required stdio device. -* -* This function is sometimes called with the entire value of -* 'stdout', which may include a list of devices separate by commas. -* Obviously this is not going to work, so we ignore that case. The -* call path in that case is console_init_r() -> search_device() -> -* stdio_get_by_name(). -*/ -if (!strncmp (name,"vidconsole" ,10 ) && !strchr (name,',' ) && - !stdio_probe_device (name,UCLASS_VIDEO , &sdev)) -return sdev; -#endif +if (IS_ENABLED (CONFIG_DM_VIDEO )) { +/* +* We did not find a suitable stdio device. If there is a video +* driver with a name starting with 'vidconsole', we can try +* probing that in the hope that it will produce the required +* stdio device. +* +* This function is sometimes called with the entire value of +* 'stdout', which may include a list of devices separate by +* commas. Obviously this is not going to work, so we ignore +* that case. The call path in that case is +* console_init_r() -> search_device() -> stdio_get_by_name() +*/ +if (!strncmp (name,"vidconsole" ,10 ) && !strchr (name,',' ) && + !stdio_probe_device (name,UCLASS_VIDEO , &sdev)) +return sdev; + }return NULL ; }
@@ -234,7 +230,6 @@ int stdio_register(struct stdio_dev *dev)/* deregister the device "devname". * returns 0 if success, -1 if device is assigned and 1 if devname not found */ -#if CONFIG_IS_ENABLED (SYS_STDIO_DEREGISTER )int stdio_deregister_dev (struct stdio_dev *dev,int force) {int l;
@@ -281,7 +276,6 @@ int stdio_deregister(const char *devname, int force)return stdio_deregister_dev (dev, force); } -#endif /* CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) */ int stdio_init_tables (void ) {
@@ -305,87 +299,87 @@ int stdio_init_tables(void)int stdio_add_devices (void ) { -#ifdef CONFIG_DM_KEYBOARD struct udevice *dev;struct uclass *uc;int ret; -/* -* For now we probe all the devices here. At some point this should be -* done only when the devices are required - e.g. we have a list of -* input devices to start up in the stdin environment variable. That -* work probably makes more sense when stdio itself is converted to -* driver model. -* -* TODO(sjg at chromium.org): Convert changing uclass_first_device() etc. -* to return the device even on error. Then we could use that here. -*/ - ret =uclass_get (UCLASS_KEYBOARD , &uc); -if (ret) -return ret; - -/* Don't report errors to the caller - assume that they are non-fatal */ - uclass_foreach_dev(dev, uc) { - ret =device_probe (dev); +if (IS_ENABLED (CONFIG_DM_KEYBOARD )) { +/* +* For now we probe all the devices here. At some point this +* should be done only when the devices are required - e.g. we +* have a list of input devices to start up in the stdin +* environment variable. That work probably makes more sense +* when stdio itself is converted to driver model. +* +* TODO(sjg at chromium.org): Convert changing +* uclass_first_device() etc. to return the device even on +* error. Then we could use that here. +*/ + ret =uclass_get (UCLASS_KEYBOARD , &uc);if (ret) -printf ("Failed to probe keyboard '%s'\n" , dev->name); +return ret; + +/* +* Don't report errors to the caller - assume that they are +* non-fatal +*/ + uclass_foreach_dev(dev, uc) { + ret =device_probe (dev); +if (ret) +printf ("Failed to probe keyboard '%s'\n" , + dev->name); + } } -#endif #ifdef CONFIG_SYS_I2C i2c_init_all (); -#else #endif -#ifdef CONFIG_DM_VIDEO -/* -* If the console setting is not in environment variables then -* console_init_r() will not be calling iomux_doenv() (which calls -* search_device()). So we will not dynamically add devices by -* calling stdio_probe_device(). -* -* So just probe all video devices now so that whichever one is -* required will be available. -*/ -#ifndef CONFIG_SYS_CONSOLE_IS_IN_ENV -struct udevice *vdev; -# ifndef CONFIG_DM_KEYBOARD -int ret; -# endif - -for (ret =uclass_first_device (UCLASS_VIDEO , &vdev); - vdev; - ret =uclass_next_device (&vdev)) - ; -if (ret) -printf ("%s: Video device failed (ret=%d)\n" , __func__, ret); -#endif /* !CONFIG_SYS_CONSOLE_IS_IN_ENV */ -#if defined(CONFIG_SPLASH_SCREEN ) && defined(CONFIG_CMD_BMP ) -splash_display (); -#endif /* CONFIG_SPLASH_SCREEN && CONFIG_CMD_BMP */ -#else -# if defined(CONFIG_LCD ) -drv_lcd_init (); -# endif -# if defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE ) -drv_video_init (); -# endif -#endif /* CONFIG_DM_VIDEO */ +if (IS_ENABLED (CONFIG_DM_VIDEO )) { +/* +* If the console setting is not in environment variables then +* console_init_r() will not be calling iomux_doenv() (which +* calls search_device()). So we will not dynamically add +* devices by calling stdio_probe_device(). +* +* So just probe all video devices now so that whichever one is +* required will be available. +*/ +struct udevice *vdev; +int ret; + +if (!IS_ENABLED (CONFIG_SYS_CONSOLE_IS_IN_ENV )) { +for (ret =uclass_first_device (UCLASS_VIDEO , &vdev); + vdev; + ret =uclass_next_device (&vdev)) + ; +if (ret) +printf ("%s: Video device failed (ret=%d)\n" , + __func__, ret); + } +if (IS_ENABLED (CONFIG_SPLASH_SCREEN ) && +IS_ENABLED (CONFIG_CMD_BMP )) +splash_display (); + }else { +if (IS_ENABLED (CONFIG_LCD )) +drv_lcd_init (); +if (IS_ENABLED (CONFIG_VIDEO ) ||IS_ENABLED (CONFIG_CFB_CONSOLE )) +drv_video_init (); + } +#if defined(CONFIG_KEYBOARD ) && !defined(CONFIG_DM_KEYBOARD ) -drv_keyboard_init (); +drv_keyboard_init ();#endif -drv_system_init (); -serial_stdio_init (); +drv_system_init (); +serial_stdio_init ();#ifdef CONFIG_USB_TTY -drv_usbtty_init (); -#endif -#ifdef CONFIG_NETCONSOLE -drv_nc_init (); +drv_usbtty_init ();#endif +if (IS_ENABLED (CONFIG_NETCONSOLE )) +drv_nc_init ();#ifdef CONFIG_JTAG_CONSOLE -drv_jtag_console_init (); -#endif -#ifdef CONFIG_CBMEM_CONSOLE -cbmemc_init (); +drv_jtag_console_init ();#endif +if (IS_ENABLED (CONFIG_CBMEM_CONSOLE )) +cbmemc_init ();return 0 ; }
Signature · 1 line
2.28.0.236.gb10cc79966-goog
PATCH v2 6/8 stdio: Update to use compiler for Kconfig checks
Quoted 3 lines · Simon Glass
Drop use of the preprocessor where possible.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200823/39eb3046/attachment.sig>
PATCH v2 7/8 stdio: Drop brackets around &devs.list
In reply to Simon GlassThese brackets are not needed. Drop them.
---
(no changes since v1)
common/stdio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
common/stdio.c +6 -6
@@ -103,7 +103,7 @@ static void drv_system_init (void)*/ struct list_head *stdio_get_list (void ) { -return &(devs.list); +return &devs.list; }/**
@@ -165,7 +165,7 @@ struct stdio_dev *stdio_get_by_name(const char *name)if (!name)return NULL ; -list_for_each (pos, &(devs.list)) { +list_for_each (pos, &devs.list) { sdev = list_entry(pos, struct stdio_dev, list);if (strcmp (sdev->name, name) ==0 )return sdev;
@@ -215,7 +215,7 @@ int stdio_register_dev(struct stdio_dev *dev, struct stdio_dev **devp) _dev =stdio_clone (dev);if (!_dev)return -ENODEV ; -list_add_tail (&(_dev->list), &(devs.list)); +list_add_tail (&_dev->list, &devs.list);if (devp) *devp = _dev;
@@ -251,11 +251,11 @@ int stdio_deregister_dev(struct stdio_dev *dev, int force) sizeof(temp_names[l])); } -list_del (&(dev->list)); +list_del (&dev->list);free (dev);/* reassign Device list */ -list_for_each (pos, &(devs.list)) { +list_for_each (pos, &devs.list) { dev = list_entry(pos, struct stdio_dev, list);for (l=0 ; l<MAX_FILES ; l++) {if (strcmp (dev->name, temp_names[l]) ==0 )
@@ -292,7 +292,7 @@ int stdio_init_tables(void)#endif /* CONFIG_NEEDS_MANUAL_RELOC */ /* Initialize the list */ -INIT_LIST_HEAD (&(devs.list)); +INIT_LIST_HEAD (&devs.list);return 0 ; }
Signature · 1 line
2.28.0.236.gb10cc79966-goog
PATCH v2 7/8 stdio: Drop brackets around &devs.list
Quoted 3 lines · Simon Glass
These brackets are not needed. Drop them.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200823/83f2bb47/attachment.sig>
PATCH v2 8/8 stdio: Tidy up the coding style
In reply to Simon GlassBring the coding style in this file up to the current level.
---
Changes in v2:
- Rebase to master
common/stdio.c | 37 ++++++++++++++++--------------------- include/stdio_dev.h | 9 +++++++++ 2 files changed, 25 insertions(+), 21 deletions(-)
common/stdio.c +16 -21
@@ -191,16 +191,15 @@ struct stdio_dev *stdio_get_by_name(const char *name)return NULL ; } -struct stdio_dev *stdio_clone (struct stdio_dev *dev) +struct stdio_dev *stdio_clone (struct stdio_dev *dev) {struct stdio_dev *_dev; -if (!dev) +if (!dev)return NULL ; _dev =calloc (1 ,sizeof (struct stdio_dev )); - -if (!_dev) +if (!_dev)return NULL ;memcpy (_dev, dev,sizeof (struct stdio_dev ));
@@ -213,7 +212,7 @@ int stdio_register_dev(struct stdio_dev *dev, struct stdio_dev **devp)struct stdio_dev *_dev; _dev =stdio_clone (dev); -if (!_dev) +if (!_dev)return -ENODEV ;list_add_tail (&_dev->list, &devs.list);if (devp)
@@ -227,41 +226,38 @@ int stdio_register(struct stdio_dev *dev)return stdio_register_dev (dev,NULL ); } -/* deregister the device "devname". -* returns 0 if success, -1 if device is assigned and 1 if devname not found -*/ int stdio_deregister_dev (struct stdio_dev *dev,int force) { -int l;struct list_head *pos;char temp_names[3 ][16 ]; +int i;/* get stdio devices (ListRemoveItem changes the dev list) */ -for (l=0 ; l<MAX_FILES ; l++) { -if (stdio_devices[l] == dev) { +for (i =0 ; i <MAX_FILES ; i++) { +if (stdio_devices[i] == dev) {if (force) { -strcpy (temp_names[l],"nulldev" ); +strcpy (temp_names[i],"nulldev" );continue ; }/* Device is assigned -> report error */ -return -1 ; +return -EBUSY ; } -memcpy (&temp_names[l][0 ], - stdio_devices[l]->name, -sizeof (temp_names[l])); +memcpy (&temp_names[i][0 ], stdio_devices[i]->name, +sizeof (temp_names[i])); }list_del (&dev->list);free (dev); -/* reassign Device list */ +/* reassign device list */ list_for_each (pos, &devs.list) { dev = list_entry(pos, struct stdio_dev, list); -for (l=0 ; l<MAX_FILES ; l++) { -if (strcmp (dev->name, temp_names[l]) ==0 ) - stdio_devices[l] = dev; +for (i =0 ; i <MAX_FILES ; i++) { +if (strcmp (dev->name, temp_names[i]) ==0 ) + stdio_devices[i] = dev; } } +return 0 ; }
@@ -270,7 +266,6 @@ int stdio_deregister(const char *devname, int force)struct stdio_dev *dev; dev =stdio_get_by_name (devname); -if (!dev)/* device not found */ return -ENODEV ;
include/stdio_dev.h +9 -0
@@ -84,6 +84,15 @@ int stdio_init(void);void stdio_print_current_devices (void );int stdio_deregister (const char *devname,int force); + +/** +* stdio_deregister_dev() - deregister the device "devname". +* +* @dev: Stdio device to deregister +* @force: true to force deregistration even if in use +* +* returns 0 on success, -EBUSY if device is assigned +*/ int stdio_deregister_dev (struct stdio_dev *dev,int force);struct list_head *stdio_get_list (void );struct stdio_dev *stdio_get_by_name (const char *name);
Signature · 1 line
2.28.0.236.gb10cc79966-goog
PATCH v2 8/8 stdio: Tidy up the coding style
Quoted 3 lines · Simon Glass
Bring the coding style in this file up to the current level.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200823/56886fc5/attachment.sig>
PATCH v2 1/8 moveconfig: Skip binary and ELF files
In reply to Simon GlassQuoted 4 lines · Simon Glass
Add a few more file extensions to the list of files that should not be processed. This avoids unicode errors, for example.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200823/a6539e0a/attachment.sig>