diff --git a/sysutils/u-boot-beaglebone/Makefile b/sysutils/u-boot-beaglebone/Makefile
index c1b306a60893..f4c8b962a9ba 100644
--- a/sysutils/u-boot-beaglebone/Makefile
+++ b/sysutils/u-boot-beaglebone/Makefile
@@ -6,6 +6,8 @@ MODEL=		beaglebone
 BOARD_CONFIG=	am335x_evm_defconfig
 FAMILY=		omap
 
+U_BOOT_SLAVE_PORTREVISION_2020.04=	1
+
 CONFIG_FRAGMENT=	${.CURDIR}/files/bbb_fragment
 FRAGMENT_NAME=		bbb_fragment
 
diff --git a/sysutils/u-boot-beaglebone/files/bbb_fragment b/sysutils/u-boot-beaglebone/files/bbb_fragment
index 99e906a20a89..f52a43eab753 100644
--- a/sysutils/u-boot-beaglebone/files/bbb_fragment
+++ b/sysutils/u-boot-beaglebone/files/bbb_fragment
@@ -2,7 +2,8 @@ CONFIG_API=y
 CONFIG_ARMV7_NONSEC=n
 CONFIG_CMD_CACHE=y
 CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; setenv boot_targets mmc0 mmc1 pxe dhcp; run distro_bootcmd"
-CONFIG_NAND=n
+CONFIG_MTD=n
+CONFIG_MTD_RAW_NAND=n
 CONFIG_SPL_NAND_SUPPORT=n
 CONFIG_CMD_NAND=n
 CONFIG_DFU_NAND=n