diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc
index 85be4f54e41a..83fa6275f702 100644
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@@ -28,10 +28,6 @@ function fetch_sources_tools__libreelec_amlogic_fip() {
 # this family does not need it
 ATF_COMPILE="no"
 
-if [[ $BOARD == lafrite ]]; then
-	UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin:u-boot.bin u-boot-dtb.img"
-fi
-
 # Set CPUMIN et al if not already set in the board config.
 CPUMIN=${CPUMIN:-500000}
 CPUMAX=${CPUMAX:-1536000}
diff --git a/config/sources/families/meson-gxl.conf b/config/sources/families/meson-gxl.conf
index 18711440ad75..217b664c5eaf 100644
--- a/config/sources/families/meson-gxl.conf
+++ b/config/sources/families/meson-gxl.conf
@@ -35,19 +35,19 @@ family_tweaks() {
 
 uboot_custom_postprocess() {
 	if [[ $BOARD == lepotato ]]; then
-		uboot_gxl_postprocess $SRC/cache/sources/odroidc2-blobs/ gxl
+		uboot_gxl_postprocess_ng $SRC/cache/sources/amlogic-boot-fip/lepotato
 	fi
 
 	if [[ $BOARD == aml-c400-plus ]]; then
-		uboot_gxl_postprocess $SRC/cache/sources/odroidc2-blobs/ gxl
+		uboot_gxl_postprocess_ng $SRC/cache/sources/amlogic-boot-fip/p212
 	fi
 
 	if [[ $BOARD == aml-s9xx-box ]]; then
-		uboot_gxl_postprocess $SRC/cache/sources/odroidc2-blobs/ gxl
+		uboot_gxl_postprocess_ng $SRC/cache/sources/amlogic-boot-fip/p212
 	fi
 
 	if [[ $BOARD == khadas-vim1 ]]; then
-		uboot_gxl_postprocess $SRC/cache/sources/odroidc2-blobs/ vim1
+		uboot_gxl_postprocess_ng $SRC/cache/sources/amlogic-boot-fip/khadas-vim
 	fi
 
 	if [[ $BOARD == khadas-vim2 ]]; then