diff --git a/board/qca/arm/ipq6018/ipq6018.c b/board/qca/arm/ipq6018/ipq6018.c
index ee17b1b..d53ec02 100644
--- a/board/qca/arm/ipq6018/ipq6018.c
+++ b/board/qca/arm/ipq6018/ipq6018.c
@@ -226,6 +226,10 @@
 	}
 #endif
 }
+void set_flash_secondary_type(qca_smem_flash_info_t *smem)
+{
+	return;
+};
 void enable_caches(void)
 {
 	icache_enable();
diff --git a/common/Makefile b/common/Makefile
index 4f6107f..c8f2828 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -123,7 +123,6 @@
 obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o
 obj-$(CONFIG_CMD_LED) += cmd_led.o
 obj-$(CONFIG_CMD_LICENSE) += cmd_license.o
-obj-y += cmd_load.o
 obj-$(CONFIG_LOGBUFFER) += cmd_log.o
 obj-$(CONFIG_ID_EEPROM) += cmd_mac.o
 obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o
diff --git a/configs/ipq807x_defconfig b/configs/ipq807x_defconfig
index 1536375..0de4a40 100644
--- a/configs/ipq807x_defconfig
+++ b/configs/ipq807x_defconfig
@@ -25,7 +25,7 @@
 # Info commands
 #
 CONFIG_CMD_BDI=y
-CONFIG_CMD_CONSOLE=y
+# CONFIG_CMD_CONSOLE is not set
 
 #
 # Boot commands
@@ -41,11 +41,11 @@
 #
 # Environment commands
 #
-CONFIG_CMD_EXPORTENV=y
-CONFIG_CMD_IMPORTENV=y
-CONFIG_CMD_EDITENV=y
+# CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_IMPORTENV is not set
+# CONFIG_CMD_EDITENV is not set
 CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_ENV_EXISTS=y
+# CONFIG_CMD_ENV_EXISTS is not set
 
 #
 # Memory commands
@@ -70,7 +70,7 @@
 # CONFIG_CMD_SPI is not set
 # CONFIG_CMD_I2C is not set
 # CONFIG_CMD_USB is not set
-CONFIG_CMD_FPGA=y
+# CONFIG_CMD_FPGA is not set
 
 #
 # Shell scripting commands
@@ -78,7 +78,7 @@
 CONFIG_CMD_ECHO=y
 CONFIG_CMD_ITEST=y
 CONFIG_CMD_SOURCE=y
-CONFIG_CMD_SETEXPR=y
+# CONFIG_CMD_SETEXPR is not set
 
 #
 # Network commands
@@ -88,7 +88,7 @@
 # CONFIG_CMD_TFTPSRV is not set
 # CONFIG_CMD_RARP is not set
 # CONFIG_CMD_DHCP is not set
-CONFIG_CMD_NFS=y
+# CONFIG_CMD_NFS is not set
 # CONFIG_CMD_PING is not set
 # CONFIG_CMD_CDP is not set
 # CONFIG_CMD_SNTP is not set
@@ -100,9 +100,11 @@
 #
 # CONFIG_CMD_TIME is not set
 CONFIG_CMD_MISC=y
-CONFIG_CMD_PART=y
+# CONFIG_CMD_PART is not set
 CONFIG_PARTITION_UUIDS=y
 # CONFIG_CMD_TIMER is not set
+# CONFIG_CMD_ELF is not set
+
 
 #
 # Boot timing
@@ -282,7 +284,7 @@
 # CONFIG_USE_PRIVATE_LIBGCC is not set
 CONFIG_SYS_HZ=1000
 # CONFIG_SYS_VSNPRINTF is not set
-CONFIG_REGEX=y
+# CONFIG_REGEX is not set
 # CONFIG_LIB_RAND is not set
 # CONFIG_CMD_DHRYSTONE is not set
 # CONFIG_RSA is not set
diff --git a/include/configs/ipq6018.h b/include/configs/ipq6018.h
index da85c44..390b1c4 100644
--- a/include/configs/ipq6018.h
+++ b/include/configs/ipq6018.h
@@ -20,8 +20,10 @@
 
 #define CONFIG_IPQ6018
 
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_CACHELINE_SIZE	64
+#define CONFIG_SYS_VSNPRINTF
 
 #define CONFIG_IPQ6018_UART
 #define CONFIG_NR_DRAM_BANKS		1
@@ -78,6 +80,7 @@
 #define CONFIG_SYS_SDRAM_SIZE		0x10000000
 #define CONFIG_MAX_RAM_BANK_SIZE	CONFIG_SYS_SDRAM_SIZE
 #define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + (64 << 20))
+#define CONFIG_ROOTFS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + (32 << 20))
 
 #define QCA_KERNEL_START_ADDR		CONFIG_SYS_SDRAM_BASE
 #define QCA_DRAM_KERNEL_SIZE		CONFIG_SYS_SDRAM_SIZE
@@ -87,7 +90,7 @@
 
 #define CONFIG_QCA_SMEM_BASE		0x4AB00000
 
-#define CONFIG_IPQ_FDT_HIGH		0x4A400000
+#define CONFIG_IPQ_FDT_HIGH		0x48700000
 #define CONFIG_IPQ_NO_MACS		6
 #define CONFIG_ENV_IS_IN_SPI_FLASH	1
 #define CONFIG_ENV_SECT_SIZE		(64 * 1024)
@@ -117,6 +120,9 @@
 
 #define CONFIG_ENV_IS_IN_NAND		1
 
+/* Allow to overwrite serial and ethaddr */
+#define CONFIG_ENV_OVERWRITE
+
 /*
 * SPI Flash Configs
 */
@@ -193,6 +199,7 @@
  * U-Boot Env Configs
  */
 #define CONFIG_OF_LIBFDT		1
+#define CONFIG_SYS_HUSH_PARSER
 
 /* NSS firmware loaded using bootm */
 #define CONFIG_BOOTCOMMAND		"bootm"
@@ -211,6 +218,7 @@
 
 #define CONFIG_CMD_BOOTZ
 
+#define CONFIG_FDT_FIXUP_PARTITIONS
 /*
  * Below Configs need to be updated after enabling reset_crashdump
  * Included now to avoid build failure
diff --git a/include/configs/ipq807x.h b/include/configs/ipq807x.h
index 02b299e..5f47bc1 100644
--- a/include/configs/ipq807x.h
+++ b/include/configs/ipq807x.h
@@ -340,12 +340,6 @@
 /*#define CONFIG_IPQ_REPORT_L2ERR*/
 
 /*
- * FAT FS commands
- */
-#define	CONFIG_FS_FAT
-#define	CONFIG_CMD_FAT
-
-/*
  * Other commands
  */