diff --git a/board/t3/t3-gem-o1/genimage.cfg b/board/t3/t3-gem-o1/genimage.cfg
index c88f2f81064..36477065422 100644
--- a/board/t3/t3-gem-o1/genimage.cfg
+++ b/board/t3/t3-gem-o1/genimage.cfg
@@ -6,7 +6,7 @@ image boot.vfat {
 			"u-boot.img",
 			"Image",
 			"k3-am67a-t3-gem-o1.dtb",
-            "uEnv.txt"
+			"uEnv.txt"
 		}
 	}
 	size = 64M
diff --git a/board/t3/t3-gem-o1/post-image.sh b/board/t3/t3-gem-o1/post-image.sh
index 45086d9e847..e09294a1136 100755
--- a/board/t3/t3-gem-o1/post-image.sh
+++ b/board/t3/t3-gem-o1/post-image.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-BOARD_DIR="$(dirname $0)"
+BOARD_DIR="$(dirname "$0")"
 GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
 GENIMAGE_TMP="$(mktemp -d)"
 
diff --git a/configs/t3_gem_o1_defconfig b/configs/t3_gem_o1_defconfig
index f5413290463..d4dd672e4a3 100644
--- a/configs/t3_gem_o1_defconfig
+++ b/configs/t3_gem_o1_defconfig
@@ -24,6 +24,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/t3gemstone/u-boot.git"
 BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="8b5ae72c281207430fcc58031fe36f40900f7a2d"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am67a_t3_gem_o1_a53"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -31,6 +32,11 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
 BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE=y
 BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_RAW_BIN=y
+BR2_TARGET_UBOOT_USE_BINMAN=y
+# BR2_TARGET_UBOOT_FORMAT_BIN is not set
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="tispl.bin"
 BR2_TARGET_TI_K3_BOOT_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y