diff --git a/arch/arm/mach-imx/imx8m/imximage.cfg b/arch/arm/mach-imx/imx8m/imximage.cfg
index 60c38ab..c2caa95 100644
--- a/arch/arm/mach-imx/imx8m/imximage.cfg
+++ b/arch/arm/mach-imx/imx8m/imximage.cfg
@@ -12,8 +12,3 @@
 #endif
 LOADER		spl/u-boot-spl-ddr.bin	0x7E1000
 SECOND_LOADER	u-boot.itb		0x40200000 0x60000
-
-DDR_FW lpddr4_pmu_train_1d_imem.bin
-DDR_FW lpddr4_pmu_train_1d_dmem.bin
-DDR_FW lpddr4_pmu_train_2d_imem.bin
-DDR_FW lpddr4_pmu_train_2d_dmem.bin
diff --git a/board/freescale/imx8mq_phanbell/board_id_cmd.c b/board/freescale/imx8mq_phanbell/board_id_cmd.c
index caee24e..fe3e92a 100644
--- a/board/freescale/imx8mq_phanbell/board_id_cmd.c
+++ b/board/freescale/imx8mq_phanbell/board_id_cmd.c
@@ -28,7 +28,7 @@
 static int do_board_id(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	int board_id = get_board_id();
-	char* board_id_name;
+	const char* board_id_name;
 
 	if (board_id > MAX_BOARD_ID) {
 		board_id = UNKNOWN_BOARD_ID;
diff --git a/board/freescale/imx8mq_phanbell/imx8mq_phanbell.c b/board/freescale/imx8mq_phanbell/imx8mq_phanbell.c
index 320d15f..4c3ca0b 100644
--- a/board/freescale/imx8mq_phanbell/imx8mq_phanbell.c
+++ b/board/freescale/imx8mq_phanbell/imx8mq_phanbell.c
@@ -212,7 +212,7 @@
 	writel(RegData, dwc3->base + USB_PHY_CTRL1);
 }
 
-static void configure_cc_switch() {
+static void configure_cc_switch(void) {
 	uint8_t value;
 	int ret;
 	struct udevice *bus, *dev;
@@ -291,10 +291,8 @@
  * For Phanbell, this will always yield the eMMC. To ensure we boot the
  * bootstrapped device, use this in board_late_init.
  */
-static int board_get_rom_mmc_dev() {
-	struct bootrom_sw_info **p =
-		is_soc_rev(CHIP_REV_1_0)? (struct bootrom_sw_info **)ROM_SW_INFO_ADDR_A0 :
-		(struct bootrom_sw_info **)ROM_SW_INFO_ADDR;
+static int board_get_rom_mmc_dev(void) {
+	struct bootrom_sw_info **p = ROM_SW_INFO_ADDR;
 	int devno = (*p)->boot_dev_instance;
 	u8 boot_type = (*p)->boot_dev_type;
 
@@ -353,7 +351,7 @@
 }
 #endif /*CONFIG_ANDROID_RECOVERY*/
 
-int fastboot_set_reboot_flag()
+int fastboot_set_reboot_flag(void)
 {
   // Nothing needs to be done for phanbell
   return 0;
diff --git a/board/freescale/imx8mq_phanbell/spl.c b/board/freescale/imx8mq_phanbell/spl.c
index 3818039..7408a5f 100644
--- a/board/freescale/imx8mq_phanbell/spl.c
+++ b/board/freescale/imx8mq_phanbell/spl.c
@@ -167,7 +167,6 @@
 {
 	struct pmic *p;
 	int ret;
-	unsigned int reg;
 
 	ret = power_bd71837_init(I2C_PMIC);
 	if (ret)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index f42e613..78cd3ed 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -624,7 +624,6 @@
 		reset_cpu(0);
 
 		/*NOTREACHED*/
-		return 0;
 	}
 
 	spl_perform_fixups(&spl_image);
diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig
index e0884c3..e6a8cd0 100644
--- a/configs/imx8mq_phanbell_defconfig
+++ b/configs/imx8mq_phanbell_defconfig
@@ -80,8 +80,6 @@
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
-CONFIG_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
 CONFIG_ZIRCON_BOOT_IMAGE=y
 CONFIG_SD_BOOT=y
 CONFIG_CMD_IMPORTENV=y
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index e56751e..305ec0e 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -31,7 +31,6 @@
 #define CONFIG_SPL_STACK		0x187FF0
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
 #define CONFIG_SPL_BSS_START_ADDR      0x00180000