-# Disable the meta-agl-refhw-gen3 arm-trusted-firmware bbappend as
-# it makes the firmware reference hardware specific.
-BBMASK += "meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware"
+UBOOT_CONFIG:append:h3ulcb = " agl-refhw"
+UBOOT_CONFIG[agl-refhw] = "rcar3_salvator-x_defconfig"
+
+MACHINE_EXTRA_RRECOMMENDS:append:h3ulcb = " \
+ linux-firmware-wl18xx \
+ ti-bt-firmware \
+ wlconf \
+ wireless-regdb-static \
+"