From 60bbff034c52151c65792997b67b8bbdcca2277d Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 10 Jan 2023 10:28:40 +0000 Subject: [PATCH] u-boot: Rename CONFIG_DM_VIDEO to CONFIG_VIDEO As part of v2023.01 CONFIG_DM_VIDEO has been renamed to CONFIG_VIDEO - https://github.com/u-boot/u-boot/commit/b86986c7b314f1378ca5be8df49310a6ce7302f8 --- ...LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch | 4 ++-- ...boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch | 2 +- ...ot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch | 2 +- ...ot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch | 2 +- ...ot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch | 2 +- projects/Rockchip/bootloader/config | 2 +- projects/Rockchip/devices/RK3288/bootloader/config | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch index a5bdb26d5d..45cc8a216a 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch @@ -4,7 +4,7 @@ Date: Fri, 13 Nov 2020 02:09:36 +0000 Subject: [PATCH 01/22] LOCAL: configs: meson64: prevent stdout/stderr on videoconsole -Several devices have CONFIG_DM_VIDEO enabled which causes stdout/stderr +Several devices have CONFIG_VIDEO enabled which causes stdout/stderr to appear on videoconsole, so remove videoconsole from STDOUT so that early u-boot boot remains silent unless using the uart/serial console. @@ -20,7 +20,7 @@ index 40803ee9da..05b1fcb9fd 100644 @@ -18,7 +18,7 @@ /* For splashscreen */ - #ifdef CONFIG_DM_VIDEO + #ifdef CONFIG_VIDEO -#define STDOUT_CFG "vidconsole,serial" +#define STDOUT_CFG "serial" #else diff --git a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch index 0dce3407b3..5878cd358d 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch @@ -73,7 +73,7 @@ index 0000000000..9ad263ca2c +CONFIG_DM_USB=y +CONFIG_USB_DWC2=y +CONFIG_USB_KEYBOARD=y -+CONFIG_DM_VIDEO=y ++CONFIG_VIDEO=y +# CONFIG_VIDEO_BPP8 is not set +# CONFIG_VIDEO_BPP16 is not set +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch index 41b94fd28a..a190d14225 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch @@ -73,7 +73,7 @@ index 0000000000..624679f90c +CONFIG_DM_USB=y +CONFIG_USB_DWC2=y +CONFIG_USB_KEYBOARD=y -+CONFIG_DM_VIDEO=y ++CONFIG_VIDEO=y +# CONFIG_VIDEO_BPP8 is not set +# CONFIG_VIDEO_BPP16 is not set +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch index 547babb8a7..545452811f 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch @@ -92,7 +92,7 @@ index 0000000000..3ef3c9c143 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y +CONFIG_USB_GADGET_DOWNLOAD=y -+CONFIG_DM_VIDEO=y ++CONFIG_VIDEO=y +# CONFIG_VIDEO_BPP8 is not set +# CONFIG_VIDEO_BPP16 is not set +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch index 24bdcda648..ea69b977e3 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch @@ -81,7 +81,7 @@ index 0000000000..77ffc9aa49 +CONFIG_USB_GADGET_PRODUCT_NUM=0xfada +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y -+CONFIG_DM_VIDEO=y ++CONFIG_VIDEO=y +# CONFIG_VIDEO_BPP8 is not set +# CONFIG_VIDEO_BPP16 is not set +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/projects/Rockchip/bootloader/config b/projects/Rockchip/bootloader/config index 18c676d8fe..c0d3a54b2f 100644 --- a/projects/Rockchip/bootloader/config +++ b/projects/Rockchip/bootloader/config @@ -1,5 +1,5 @@ CONFIG_BOOTDELAY=1 -# CONFIG_DM_VIDEO is not set +# CONFIG_VIDEO is not set # CONFIG_DISPLAY is not set # CONFIG_ENV_IS_IN_MMC is not set # CONFIG_NET_RANDOM_ETHADDR is not set diff --git a/projects/Rockchip/devices/RK3288/bootloader/config b/projects/Rockchip/devices/RK3288/bootloader/config index a067c28356..48779ace61 100644 --- a/projects/Rockchip/devices/RK3288/bootloader/config +++ b/projects/Rockchip/devices/RK3288/bootloader/config @@ -1,5 +1,5 @@ CONFIG_BOOTDELAY=1 -# CONFIG_DM_VIDEO is not set +# CONFIG_VIDEO is not set # CONFIG_DISPLAY is not set # CONFIG_ENV_IS_IN_MMC is not set # CONFIG_NET_RANDOM_ETHADDR is not set