From c798975de639fddd708b99b4c67e567142264b7b Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Wed, 7 Dec 2022 13:34:20 +0300 Subject: u-boot: Use a common tree Merge all boards into a common "default" tree, currently for v2022.07. This ends up applying the "Improve UEFI experience on DM_VIDEO" series to everything, so refresh the configs for the new options. Signed-off-by: Alper Nebi Yasak --- resources/u-boot/daisy_snow/board.cfg | 2 +- resources/u-boot/daisy_snow/config/default | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'resources/u-boot/daisy_snow') diff --git a/resources/u-boot/daisy_snow/board.cfg b/resources/u-boot/daisy_snow/board.cfg index 120ba67f..d5f9de8a 100644 --- a/resources/u-boot/daisy_snow/board.cfg +++ b/resources/u-boot/daisy_snow/board.cfg @@ -1,2 +1,2 @@ -ubtree="daisy" +ubtree="default" arch="ARMv7" diff --git a/resources/u-boot/daisy_snow/config/default b/resources/u-boot/daisy_snow/config/default index 2bbd9839..e7bef878 100644 --- a/resources/u-boot/daisy_snow/config/default +++ b/resources/u-boot/daisy_snow/config/default @@ -1664,6 +1664,10 @@ CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_NO_FB_CLEAR is not set CONFIG_PANEL=y CONFIG_SIMPLE_PANEL=y +# CONFIG_VIDEO_FONT_4X6 is not set +CONFIG_VIDEO_FONT_8X16=y +# CONFIG_VIDEO_FONT_SUN12X22 is not set +# CONFIG_VIDEO_FONT_TER16X32 is not set # # TrueType Fonts -- cgit v1.2.1