diff --git a/so3/devices/i2c/i2c_bsc.c b/so3/devices/i2c/i2c_bsc.c
index a4f160d8d..63605fe9c 100644
--- a/so3/devices/i2c/i2c_bsc.c
+++ b/so3/devices/i2c/i2c_bsc.c
@@ -28,6 +28,7 @@
 #include <types.h>
 #include <completion.h>
 #include <mutex.h>
+#include <log.h>
 
 #include <asm/io.h>
 
@@ -212,7 +213,7 @@ static int i2c_bsc_init(dev_t *dev, int fdt_offset)
 	uint32_t mask;
 	uint32_t gpio_regs_addr;
 
-	DBG("I2C broadcom - Initialization\n");
+	LOG_DEBUG("I2C broadcom - Initialization\n");
 
 	memset(&i2c, 0, sizeof(i2c_t));
 
@@ -261,7 +262,7 @@ static int i2c_bsc_init(dev_t *dev, int fdt_offset)
 
 	io_unmap(gpio_regs_addr);
 
-	DBG("i2c_init end\n");
+	LOG_DEBUG("i2c_init end\n");
 
 	return 0;
 }
diff --git a/so3/dts/Makefile b/so3/dts/Makefile
index cef8c4129..2ba411c3a 100644
--- a/so3/dts/Makefile
+++ b/so3/dts/Makefile
@@ -1,5 +1,5 @@
 
-dtb-$(CONFIG_RPI4) += rpi4.dtb rpi4_avz.dtb
+dtb-$(CONFIG_RPI4) += rpi4.dtb
 dtb-$(CONFIG_RPI4_64) += rpi4_64.dtb rpi4_64_avz_vt.dtb
 dtb-$(CONFIG_VIRT64) += virt64.dtb virt64_avz.dtb virt64_capsule.dtb virt64_lvperf.dtb
 dtb-$(CONFIG_VIRT32) += virt32.dtb virt32_lvperf.dtb