diff --git a/resources/u-boot/daisy/board.cfg b/resources/u-boot/daisy/board.cfg
deleted file mode 100644
index 4844cdd3..00000000
--- a/resources/u-boot/daisy/board.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-ubtree="daisy"
-ubrevision="e092e3250270a1016c877da7bdd9384f14b1321e" # v2022.07
-arch="ARMv7"
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
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
diff --git a/resources/u-boot/default/board.cfg b/resources/u-boot/default/board.cfg
index b821b351..ef34429f 100644
--- a/resources/u-boot/default/board.cfg
+++ b/resources/u-boot/default/board.cfg
@@ -1,2 +1,2 @@
 ubtree="default"
-ubrevision="master"
+ubrevision="e092e3250270a1016c877da7bdd9384f14b1321e" # v2022.07
diff --git a/resources/u-boot/gru/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch b/resources/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch
similarity index 100%
rename from resources/u-boot/gru/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch
rename to resources/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch
diff --git a/resources/u-boot/gru/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch b/resources/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch
similarity index 100%
rename from resources/u-boot/gru/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch
rename to resources/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch
diff --git a/resources/u-boot/gru/board.cfg b/resources/u-boot/gru/board.cfg
deleted file mode 100644
index 128e0876..00000000
--- a/resources/u-boot/gru/board.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-ubtree="gru"
-ubrevision="e092e3250270a1016c877da7bdd9384f14b1321e" # v2022.07
-arch="AArch64"
diff --git a/resources/u-boot/gru_bob/board.cfg b/resources/u-boot/gru_bob/board.cfg
index 2187c86b..bc113590 100644
--- a/resources/u-boot/gru_bob/board.cfg
+++ b/resources/u-boot/gru_bob/board.cfg
@@ -1,2 +1,2 @@
-ubtree="gru"
+ubtree="default"
 arch="AArch64"
diff --git a/resources/u-boot/gru_kevin/board.cfg b/resources/u-boot/gru_kevin/board.cfg
index 2187c86b..bc113590 100644
--- a/resources/u-boot/gru_kevin/board.cfg
+++ b/resources/u-boot/gru_kevin/board.cfg
@@ -1,2 +1,2 @@
-ubtree="gru"
+ubtree="default"
 arch="AArch64"
diff --git a/resources/u-boot/nyan/board.cfg b/resources/u-boot/nyan/board.cfg
deleted file mode 100644
index 98a4b610..00000000
--- a/resources/u-boot/nyan/board.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-ubtree="nyan"
-ubrevision="e092e3250270a1016c877da7bdd9384f14b1321e" # v2022.07
-arch="ARMv7"
diff --git a/resources/u-boot/nyan_big/board.cfg b/resources/u-boot/nyan_big/board.cfg
index 094a8189..d5f9de8a 100644
--- a/resources/u-boot/nyan_big/board.cfg
+++ b/resources/u-boot/nyan_big/board.cfg
@@ -1,2 +1,2 @@
-ubtree="veyron"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/nyan_big/config/default b/resources/u-boot/nyan_big/config/default
index a76dfa81..7ad8cef3 100644
--- a/resources/u-boot/nyan_big/config/default
+++ b/resources/u-boot/nyan_big/config/default
@@ -1751,6 +1751,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
diff --git a/resources/u-boot/nyan_blaze/board.cfg b/resources/u-boot/nyan_blaze/board.cfg
index 094a8189..d5f9de8a 100644
--- a/resources/u-boot/nyan_blaze/board.cfg
+++ b/resources/u-boot/nyan_blaze/board.cfg
@@ -1,2 +1,2 @@
-ubtree="veyron"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/nyan_blaze/config/default b/resources/u-boot/nyan_blaze/config/default
index a76dfa81..7ad8cef3 100644
--- a/resources/u-boot/nyan_blaze/config/default
+++ b/resources/u-boot/nyan_blaze/config/default
@@ -1751,6 +1751,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
diff --git a/resources/u-boot/peach/board.cfg b/resources/u-boot/peach/board.cfg
deleted file mode 100644
index 59d17f7a..00000000
--- a/resources/u-boot/peach/board.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-ubtree="peach"
-ubrevision="e092e3250270a1016c877da7bdd9384f14b1321e" # v2022.07
-arch="ARMv7"
diff --git a/resources/u-boot/peach_pi/board.cfg b/resources/u-boot/peach_pi/board.cfg
index 17bafe44..d5f9de8a 100644
--- a/resources/u-boot/peach_pi/board.cfg
+++ b/resources/u-boot/peach_pi/board.cfg
@@ -1,2 +1,2 @@
-ubtree="peach"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/peach_pi/config/default b/resources/u-boot/peach_pi/config/default
index 46e4dbd2..3f7511ce 100644
--- a/resources/u-boot/peach_pi/config/default
+++ b/resources/u-boot/peach_pi/config/default
@@ -1649,6 +1649,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
diff --git a/resources/u-boot/peach_pit/board.cfg b/resources/u-boot/peach_pit/board.cfg
index 17bafe44..d5f9de8a 100644
--- a/resources/u-boot/peach_pit/board.cfg
+++ b/resources/u-boot/peach_pit/board.cfg
@@ -1,2 +1,2 @@
-ubtree="peach"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/peach_pit/config/default b/resources/u-boot/peach_pit/config/default
index 9375212f..7ca567af 100644
--- a/resources/u-boot/peach_pit/config/default
+++ b/resources/u-boot/peach_pit/config/default
@@ -1649,6 +1649,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
diff --git a/resources/u-boot/v2021.07/board.cfg b/resources/u-boot/v2021.07/board.cfg
deleted file mode 100644
index 4bddc10c..00000000
--- a/resources/u-boot/v2021.07/board.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ubtree="v2021.07"
-ubrevision="840658b093976390e9537724f802281c9c8439f5" # v2021.07
diff --git a/resources/u-boot/v2022.07/board.cfg b/resources/u-boot/v2022.07/board.cfg
deleted file mode 100644
index 244e7202..00000000
--- a/resources/u-boot/v2022.07/board.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ubtree="v2022.07"
-ubrevision="e092e3250270a1016c877da7bdd9384f14b1321e" # v2022.07
diff --git a/resources/u-boot/veyron/board.cfg b/resources/u-boot/veyron/board.cfg
deleted file mode 100644
index cb7f15d6..00000000
--- a/resources/u-boot/veyron/board.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-ubtree="veyron"
-ubrevision="e092e3250270a1016c877da7bdd9384f14b1321e" # v2022.07
-arch="ARMv7"
diff --git a/resources/u-boot/veyron_jerry/board.cfg b/resources/u-boot/veyron_jerry/board.cfg
index 094a8189..d5f9de8a 100644
--- a/resources/u-boot/veyron_jerry/board.cfg
+++ b/resources/u-boot/veyron_jerry/board.cfg
@@ -1,2 +1,2 @@
-ubtree="veyron"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/veyron_jerry/config/default b/resources/u-boot/veyron_jerry/config/default
index 9ae791cd..9cd75bfc 100644
--- a/resources/u-boot/veyron_jerry/config/default
+++ b/resources/u-boot/veyron_jerry/config/default
@@ -1710,6 +1710,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
diff --git a/resources/u-boot/veyron_mickey/board.cfg b/resources/u-boot/veyron_mickey/board.cfg
index 094a8189..d5f9de8a 100644
--- a/resources/u-boot/veyron_mickey/board.cfg
+++ b/resources/u-boot/veyron_mickey/board.cfg
@@ -1,2 +1,2 @@
-ubtree="veyron"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/veyron_mickey/config/default b/resources/u-boot/veyron_mickey/config/default
index 0924f1ff..7e89d3db 100644
--- a/resources/u-boot/veyron_mickey/config/default
+++ b/resources/u-boot/veyron_mickey/config/default
@@ -1678,6 +1678,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
diff --git a/resources/u-boot/veyron_minnie/board.cfg b/resources/u-boot/veyron_minnie/board.cfg
index 094a8189..d5f9de8a 100644
--- a/resources/u-boot/veyron_minnie/board.cfg
+++ b/resources/u-boot/veyron_minnie/board.cfg
@@ -1,2 +1,2 @@
-ubtree="veyron"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/veyron_minnie/config/default b/resources/u-boot/veyron_minnie/config/default
index bbb1a474..c077c648 100644
--- a/resources/u-boot/veyron_minnie/config/default
+++ b/resources/u-boot/veyron_minnie/config/default
@@ -1694,6 +1694,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
diff --git a/resources/u-boot/veyron_speedy/board.cfg b/resources/u-boot/veyron_speedy/board.cfg
index 094a8189..d5f9de8a 100644
--- a/resources/u-boot/veyron_speedy/board.cfg
+++ b/resources/u-boot/veyron_speedy/board.cfg
@@ -1,2 +1,2 @@
-ubtree="veyron"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/veyron_speedy/config/default b/resources/u-boot/veyron_speedy/config/default
index 52c7351c..bb668963 100644
--- a/resources/u-boot/veyron_speedy/config/default
+++ b/resources/u-boot/veyron_speedy/config/default
@@ -1682,6 +1682,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