diff --git a/rpi3.mk b/rpi3.mk
index cf89462bac2ef9b952a3798395499d3d3aeafe06..71abfac964b883a51524ba1dee373701251284ae 100644
--- a/rpi3.mk
+++ b/rpi3.mk
@@ -66,6 +66,7 @@ ARM_TF_FLAGS ?= \
 	CRASH_REPORTING=1 \
 	LOG_LEVEL=40 \
 	PLAT=rpi3 \
+	RPI3_PRELOADED_DTB_BASE=0x00010000 \
 	SPD=opteed
 
 arm-tf: optee-os $(RPI3_UBOOT_ENV)
diff --git a/rpi3/firmware/uboot.env.txt b/rpi3/firmware/uboot.env.txt
index c453dc4ae78bc554ac13272167bb366f9b865951..7e299623813ead16cae74ae903451dfdda0a87de 100644
--- a/rpi3/firmware/uboot.env.txt
+++ b/rpi3/firmware/uboot.env.txt
@@ -33,4 +33,4 @@ nfsboot=run load_kernel; run set_bootargs_tty set_bootargs_nfs set_common_args;
 set_bootargs_tty=setenv bootargs console=${ttyconsole} console=${sttyconsole},${baudrate}
 set_bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs rw rootfstype=nfs nfsroot=${nfsserverip}:${nfspath},udp,vers=3 ip=dhcp
 set_bootargs_mmc=setenv bootargs ${bootargs} root=/dev/mmcblk0p2 rw rootfs=ext4
-set_common_args=setenv bootargs ${bootargs} smsc95xx.macaddr=${ethaddr} 'ignore_loglevel dma.dmachans=0x7f35 memmap=16M$256M rootwait 8250.nr_uarts=1 elevator=deadline fsck.repair=yes bcm2708_fb.fbwidth=1920 bcm2708_fb.fbheight=1080 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000 dwc_otg.fiq_enable=0 dwc_otg.fiq_fsm_enable=0 dwc_otg.nak_holdoff=0'
+set_common_args=setenv bootargs ${bootargs} smsc95xx.macaddr=${ethaddr} 'ignore_loglevel dma.dmachans=0x7f35 rootwait 8250.nr_uarts=1 elevator=deadline fsck.repair=yes bcm2708_fb.fbwidth=1920 bcm2708_fb.fbheight=1080 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000 dwc_otg.fiq_enable=0 dwc_otg.fiq_fsm_enable=0 dwc_otg.nak_holdoff=0'