summaryrefslogtreecommitdiff
path: root/resources/u-boot/daisy_spring
diff options
context:
space:
mode:
authorAlper Nebi Yasak <alpernebiyasak@gmail.com>2022-12-07 13:34:20 +0300
committerAlper Nebi Yasak <alpernebiyasak@gmail.com>2022-12-10 14:19:00 +0300
commitc798975de639fddd708b99b4c67e567142264b7b (patch)
treea1124a291353b08c5923734da04c7cab5554e629 /resources/u-boot/daisy_spring
parent5b6bf2a82631f15ad8d3923520e678b9b0065302 (diff)
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 <alpernebiyasak@gmail.com>
Diffstat (limited to 'resources/u-boot/daisy_spring')
-rw-r--r--resources/u-boot/daisy_spring/board.cfg2
-rw-r--r--resources/u-boot/daisy_spring/config/default4
2 files changed, 5 insertions, 1 deletions
diff --git a/resources/u-boot/daisy_spring/board.cfg b/resources/u-boot/daisy_spring/board.cfg
index 120ba67f..d5f9de8a 100644
--- a/resources/u-boot/daisy_spring/board.cfg
+++ b/resources/u-boot/daisy_spring/board.cfg
@@ -1,2 +1,2 @@
-ubtree="daisy"
+ubtree="default"
arch="ARMv7"
diff --git a/resources/u-boot/daisy_spring/config/default b/resources/u-boot/daisy_spring/config/default
index f1687bf0..156665b4 100644
--- a/resources/u-boot/daisy_spring/config/default
+++ b/resources/u-boot/daisy_spring/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