diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc
index be89c2f36..9ec63b19b 100644
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@@ -11,8 +11,8 @@ OVERLAY_PREFIX='meson'
 # this family does not need it
 ATF_COMPILE="no"
 
-if [[ $BOARD == lafrite || $BOARD == odroid*c4 ]]; then
-		UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin:u-boot.bin u-boot-dtb.img"
+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.
diff --git a/config/sources/families/meson-sm1.conf b/config/sources/families/meson-sm1.conf
index 77287a0f6..56a1a01d6 100644
--- a/config/sources/families/meson-sm1.conf
+++ b/config/sources/families/meson-sm1.conf
@@ -11,16 +11,15 @@ family_tweaks()
 	:
 }
 
-uboot_custom_postprocess()
-{
+uboot_custom_postprocess() {
 	# FIP trees for C4 and HC4 are identical as of 30/06/2021
-	if [[ $BOARD == odroid-c4 ]]; then
+	if [[ $BOARD == odroidc4 ]]; then
 		uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/odroid-c4 g12a
-	fi
-	if [[ $BOARD == odroid-hc4 ]]; then
+	elif [[ $BOARD == odroidhc4 ]]; then
 		uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/odroid-hc4 g12a
-	fi
-	if [[ $BOARD == khadas-vim3l ]]; then
+	elif [[ $BOARD == khadas-vim3l ]]; then
 		uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/khadas-vim3l g12a
+	else
+		display_alert "uboot_custom_postprocess meson-sm1" "Unknown BOARD: $BOARD - not using FIP trees" "wrn"
 	fi
 }