diff --git a/arch/arm/dts/ipq5018-soc.dtsi b/arch/arm/dts/ipq5018-soc.dtsi
index 6579252f99..c021d34fdb 100644
--- a/arch/arm/dts/ipq5018-soc.dtsi
+++ b/arch/arm/dts/ipq5018-soc.dtsi
@@ -37,6 +37,10 @@
 		compatible = "qcom,spi-qup-v2.7.0";
 		wr_pipe_0 = <4>;
 		rd_pipe_0 = <5>;
+		wr_pipe_1 = <6>;
+		rd_pipe_1 = <7>;
+		wr_pipe_2 = <8>;
+		rd_pipe_2 = <9>;
 		status = "ok";
 		spi_gpio {
 			blsp0_spi_clk {
diff --git a/arch/arm/dts/ipq6018-soc.dtsi b/arch/arm/dts/ipq6018-soc.dtsi
index 801b217223..be4a38dd81 100644
--- a/arch/arm/dts/ipq6018-soc.dtsi
+++ b/arch/arm/dts/ipq6018-soc.dtsi
@@ -81,6 +81,17 @@
 		compatible = "qcom,spi-qup-v2.7.0";
 		wr_pipe_0 = <12>;
 		rd_pipe_0 = <13>;
+		wr_pipe_1 = <14>;
+		rd_pipe_1 = <15>;
+		wr_pipe_2 = <16>;
+		rd_pipe_2 = <17>;
+		wr_pipe_3 = <18>;
+		rd_pipe_3 = <19>;
+		wr_pipe_4 = <20>;
+		rd_pipe_4 = <21>;
+		wr_pipe_5 = <22>;
+		rd_pipe_5 = <23>;
+
 		spi_gpio {
 			gpio1 {
 				gpio = <38>;
diff --git a/arch/arm/dts/ipq807x-soc.dtsi b/arch/arm/dts/ipq807x-soc.dtsi
index 133cf7162b..1ba71daf8f 100644
--- a/arch/arm/dts/ipq807x-soc.dtsi
+++ b/arch/arm/dts/ipq807x-soc.dtsi
@@ -61,6 +61,17 @@
 		compatible = "qcom,spi-qup-v2.7.0";
 		wr_pipe_0 = <12>;
 		rd_pipe_0 = <13>;
+		wr_pipe_1 = <14>;
+		rd_pipe_1 = <15>;
+		wr_pipe_2 = <16>;
+		rd_pipe_2 = <17>;
+		wr_pipe_3 = <18>;
+		rd_pipe_3 = <19>;
+		wr_pipe_4 = <20>;
+		rd_pipe_4 = <21>;
+		wr_pipe_5 = <22>;
+		rd_pipe_5 = <23>;
+
 	};
 
 	nand: nand-controller@79B0000 {
diff --git a/arch/arm/dts/ipq9574-soc.dtsi b/arch/arm/dts/ipq9574-soc.dtsi
index fe3e0e785f..3fcc24a912 100644
--- a/arch/arm/dts/ipq9574-soc.dtsi
+++ b/arch/arm/dts/ipq9574-soc.dtsi
@@ -88,6 +88,16 @@
 		compatible = "qcom,spi-qup-v2.7.0";
 		wr_pipe_0 = <12>;
 		rd_pipe_0 = <13>;
+		wr_pipe_1 = <14>;
+		rd_pipe_1 = <15>;
+		wr_pipe_2 = <16>;
+		rd_pipe_2 = <17>;
+		wr_pipe_3 = <18>;
+		rd_pipe_3 = <19>;
+		wr_pipe_4 = <20>;
+		rd_pipe_4 = <21>;
+		wr_pipe_5 = <22>;
+		rd_pipe_5 = <23>;
 		status = "ok";
 		spi_gpio {
 		};
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c
index e00dd66d55..3677d78b47 100644
--- a/common/cmd_ubi.c
+++ b/common/cmd_ubi.c
@@ -531,6 +531,19 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	if (argc < 2)
 		return CMD_RET_USAGE;
 
+#ifdef CONFIG_QSPI_LAYOUT_SWITCH
+	if (strcmp(argv[1], "exit") == 0)  {
+		if (ubi_initialized) {
+			printf("!! Detaching UBI partition\n");
+			ubi_exit();
+			del_mtd_partitions(ubi_dev.mtd_info);
+			put_mtd_device(ubi_dev.mtd_info);
+			ubi_initialized = 0;
+		}
+		return 0;
+	}
+#endif
+
 	if (strcmp(argv[1], "part") == 0) {
 		const char *vid_header_offset = NULL;
 
diff --git a/common/usb.c b/common/usb.c
index b3aff89724..993d57b3bc 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -46,6 +46,8 @@
 #define TRANSCEND_USB_VENDOR_ID		0x8564
 #define TRANSCEND_USB_PRODUCT_ID	0x1000
 
+#define SP_USB_VENDOR_ID 	0x058f
+#define SP_USB_PRODUCT_ID	0x6387
 static int asynch_allowed;
 char usb_started; /* flag for the started/stopped USB status */
 
@@ -1091,18 +1093,22 @@ int usb_select_config(struct usb_device *dev)
 	le16_to_cpus(&dev->descriptor.idProduct);
 	le16_to_cpus(&dev->descriptor.bcdDevice);
 
-	/*The Transcend device fails for get configuration length. Adding
-	  delay about 10 micro secs to fix this.*/
-	if (dev->descriptor.idVendor == TRANSCEND_USB_VENDOR_ID &&
-		dev->descriptor.idProduct == TRANSCEND_USB_PRODUCT_ID)
+	/*The Transcend and Silicon-power devices fails for get configuration length.
+		Adding delay about 10 micro secs to fix this.*/
+	if ((dev->descriptor.idVendor == TRANSCEND_USB_VENDOR_ID &&
+		dev->descriptor.idProduct == TRANSCEND_USB_PRODUCT_ID) ||
+		(dev->descriptor.idVendor == SP_USB_VENDOR_ID &&
+		dev->descriptor.idProduct == SP_USB_PRODUCT_ID))
 		udelay(10);
 	/* only support for one config for now */
 	err = usb_get_configuration_len(dev, 0);
 
-	/*The Transcend device fails for get configuration number. Adding
-	  delay about 10 micro secs to fix this.*/
-	if (dev->descriptor.idVendor == TRANSCEND_USB_VENDOR_ID &&
-		dev->descriptor.idProduct == TRANSCEND_USB_PRODUCT_ID)
+	/*The Transcend and Silicon-power devices fails for get configuration number.
+		Adding delay about 10 micro secs to fix this.*/
+	if ((dev->descriptor.idVendor == TRANSCEND_USB_VENDOR_ID &&
+		dev->descriptor.idProduct == TRANSCEND_USB_PRODUCT_ID) ||
+		(dev->descriptor.idVendor == SP_USB_VENDOR_ID &&
+		dev->descriptor.idProduct == SP_USB_PRODUCT_ID))
 		udelay(10);
 
 	if (err >= 0) {
diff --git a/drivers/mtd/nand/qpic_nand.c b/drivers/mtd/nand/qpic_nand.c
index aa92a91935..0697e58ac4 100644
--- a/drivers/mtd/nand/qpic_nand.c
+++ b/drivers/mtd/nand/qpic_nand.c
@@ -49,6 +49,16 @@ typedef unsigned long addr_t;
 static uint32_t hw_ver;
 unsigned int qpic_training_offset = 0;
 
+#ifdef CONFIG_QSPI_LAYOUT_SWITCH
+enum qpic_nand_layout {
+	QPIC_NAND_LAYOUT_SBL,
+	QPIC_NAND_LAYOUT_LINUX,
+	QPIC_NAND_LAYOUT_MAX
+};
+
+enum qpic_nand_layout qpic_layout = QPIC_NAND_LAYOUT_LINUX;
+#endif
+
 #ifdef CONFIG_QPIC_SERIAL
 static struct qpic_serial_nand_params qpic_serial_nand_tbl[] = {
 	{
@@ -940,6 +950,10 @@ static void qpic_serial_update_dev_params(struct mtd_info *mtd)
 	uint32_t ecc_bits;
 
 	dev->page_size = serial_params->page_size;
+#ifdef CONFIG_QSPI_LAYOUT_SWITCH
+	if (serial_params->page_size == 4096 && qpic_layout == QPIC_NAND_LAYOUT_SBL)
+		dev->page_size = 2048;
+#endif
 	mtd->writesize = dev->page_size;
 	dev->block_size = serial_params->pgs_per_blk * (dev->page_size);
 	mtd->erasesize = dev->block_size;
@@ -4699,8 +4713,19 @@ void qpic_nand_init(qpic_nand_cfg_t *qpic_nand_cfg)
 	buf += mtd->oobsize;
 
 #ifdef CONFIG_QSPI_SERIAL_TRAINING
+
 	/* start serial training here */
+#ifdef CONFIG_QSPI_LAYOUT_SWITCH
+	if (qpic_layout != QPIC_NAND_LAYOUT_SBL)
+		ret = qpic_execute_serial_training(mtd);
+	else {
+		ret = 0;
+		printf("!! Skip serial traning in SBL layout\n");
+	}
+#else
 	ret = qpic_execute_serial_training(mtd);
+#endif
+
 	if (ret) {
 		printf("Error in serial training.\n");
 		printf("switch back to 50MHz with feed back clock bit enabled\n");
@@ -5125,3 +5150,65 @@ void Read_onfi_ParameterPage_DataStructure(unsigned char *ParPage, int size)
 	printf("512-767 bytes are value of bytes 0-255\n");
 }
 #endif
+
+#ifdef CONFIG_QSPI_LAYOUT_SWITCH
+static int qpic_nand_deinit(void)
+{
+	int ret = 0;
+	struct mtd_info *mtd = &nand_info[CONFIG_QPIC_NAND_NAND_INFO_IDX];
+	struct qpic_nand_dev *dev = MTD_QPIC_NAND_DEV(mtd);
+
+	if (run_command("ubi exit", 0) != CMD_RET_SUCCESS)
+		return CMD_RET_FAILURE;
+
+#ifdef CONFIG_MTD_DEVICE
+	ret = del_mtd_device(mtd);
+	if (ret < 0)
+		return ret;
+#endif
+
+	dev->cfg0 = 0;
+	dev->cfg1 = 0;
+	dev->ecc_bch_cfg = 0;
+	free(dev->buffers);
+
+	return ret;
+}
+
+static int do_qpic_nand_cmd(cmd_tbl_t *cmdtp, int flag,
+			   int argc, char * const argv[])
+{
+	int ret;
+
+	if (argc != 2 || serial_params->page_size == 2048)
+		return CMD_RET_USAGE;
+
+	if (strcmp(argv[1], "sbl") == 0) {
+		if (qpic_layout == QPIC_NAND_LAYOUT_SBL) {
+			printf("Already in sbl layout\n");
+			return CMD_RET_SUCCESS;
+		}
+		qpic_layout = QPIC_NAND_LAYOUT_SBL;
+	} else if (strcmp(argv[1], "linux") == 0) {
+		if (qpic_layout == QPIC_NAND_LAYOUT_LINUX) {
+			printf("Already in linux layout\n");
+			return CMD_RET_SUCCESS;
+		}
+		qpic_layout = QPIC_NAND_LAYOUT_LINUX;
+	} else
+		return CMD_RET_USAGE;
+
+	ret = qpic_nand_deinit();
+	if (ret < 0)
+		return CMD_RET_FAILURE;
+
+	nand_curr_device = -1;
+	qpic_nand_init(NULL);
+
+	return CMD_RET_SUCCESS;
+}
+
+U_BOOT_CMD(qpic_nand, 2, 1, do_qpic_nand_cmd,
+	   "Switch between SBL and Linux kernel page on 4K NAND Flash.",
+	   "qpic_nand (sbl | linux)");
+#endif
diff --git a/drivers/spi/qca_qup_spi_bam.c b/drivers/spi/qca_qup_spi_bam.c
index d07d0c2274..bf360bdc6e 100644
--- a/drivers/spi/qca_qup_spi_bam.c
+++ b/drivers/spi/qca_qup_spi_bam.c
@@ -40,8 +40,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static unsigned int read_pipe[NO_OF_QUPS];
-static unsigned int write_pipe[NO_OF_QUPS];
+static unsigned int read_pipe[CONFIG_IPQ_MAX_BLSP_QUPS];
+static unsigned int write_pipe[CONFIG_IPQ_MAX_BLSP_QUPS];
 static unsigned char qup_pipe_initialized = 0;
 
 static int check_bit_state(uint32_t reg_addr, int bit_num, int val,
@@ -177,7 +177,7 @@ static void qup_pipe_init(void)
 	qup_pipe_initialized = 1;
 	node = fdt_path_offset(gd->fdt_blob, "/spi");
 	if (node >= 0) {
-		for(i = 0; i < NO_OF_QUPS; i++) {
+		for(i = 0; i < CONFIG_IPQ_MAX_BLSP_QUPS; i++) {
 
 		        snprintf(rd_pipe_name, sizeof(rd_pipe_name),
 				"rd_pipe_%01d", i);
@@ -352,19 +352,19 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 	memset(ds, 0, sizeof(struct ipq_spi_slave));
 	/*
 	 * QCA BLSP supports SPI Flash
-	 * on different BLSP0 and BLSP1
+	 * on different BLSP 0 to CONFIG_IPQ_MAX_BLSP_QUPS-1
 	 * with different number of chip selects (CS, channels):
 	*/
-	if ((bus > BLSP1_SPI)
-		|| ((bus == BLSP0_SPI) && (cs > 2))
-		|| ((bus == BLSP1_SPI) && (cs > 0))) {
+	if (bus >= CONFIG_IPQ_MAX_BLSP_QUPS){
 		printf("SPI error: unsupported bus %d "
-			"(Supported busses 0,1 and 2) or chipselect\n", bus);
+		"Supported busses 0 to %d\n", bus, CONFIG_IPQ_MAX_BLSP_QUPS-1);
 		goto err;
 	}
 	ds->slave.bus	= bus;
 	ds->slave.cs	= cs;
 
+	BLSP_SPI_REGISTERS(spi_reg[bus]);
+
 	ds->regs	= &spi_reg[bus];
 
 	/* TODO For different clock frequency */
@@ -384,7 +384,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 	/* DMA mode */
 	ds->use_dma = CONFIG_QUP_SPI_USE_DMA;
 
-	if (ds->slave.cs == 1 &&
+	if (ds->slave.cs >= 1 &&
 		cs_is_valid(ds->slave.bus, ds->slave.cs)) {
 		/* GPIO Configuration for SPI NAND */
 		blsp_pin_config(ds->slave.bus, ds->slave.cs);
diff --git a/drivers/spi/qca_qup_spi_bam.h b/drivers/spi/qca_qup_spi_bam.h
index 80a35c3b00..465357fcf4 100644
--- a/drivers/spi/qca_qup_spi_bam.h
+++ b/drivers/spi/qca_qup_spi_bam.h
@@ -31,79 +31,57 @@
 #ifndef _IPQ_SPI_BAM_H_
 #define _IPQ_SPI_BAM_H_
 
-#define QUP0_BASE	0x78b5000
-#define QUP1_BASE	0x78b6000
-#define BLSP0_BAM_BASE	0x7884000
+#define QUP_BASE			0x78b5000
+#define BLSP0_BAM_BASE			0x7884000
 
-#define BLSP0_QUP_REG_BASE		(QUP0_BASE + 0x00000000)
-#define BLSP1_QUP_REG_BASE		(QUP1_BASE + 0x00000000)
+#define BLSP_QUP_REG_BASE(p)		(QUP_BASE + (p*0x1000) )
 
-#define BLSP0_SPI_CONFIG_REG		(BLSP0_QUP_REG_BASE + 0x00000300)
-#define BLSP1_SPI_CONFIG_REG		(BLSP1_QUP_REG_BASE + 0x00000300)
+#define BLSP_SPI_CONFIG_REG(p)		(BLSP_QUP_REG_BASE(p) + 0x00000300)
 
-#define BLSP0_SPI_IO_CONTROL_REG	(BLSP0_QUP_REG_BASE + 0x00000304)
-#define BLSP1_SPI_IO_CONTROL_REG	(BLSP1_QUP_REG_BASE + 0x00000304)
+#define BLSP_SPI_IO_CONTROL_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000304)
 
-#define BLSP0_SPI_ERROR_FLAGS_REG	(BLSP0_QUP_REG_BASE + 0x00000308)
-#define BLSP1_SPI_ERROR_FLAGS_REG	(BLSP1_QUP_REG_BASE + 0x00000308)
+#define BLSP_SPI_ERROR_FLAGS_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000308)
 
-#define BLSP0_SPI_DEASSERT_WAIT_REG	(BLSP0_QUP_REG_BASE + 0x00000310)
-#define BLSP1_SPI_DEASSERT_WAIT_REG	(BLSP1_QUP_REG_BASE + 0x00000310)
-#define BLSP0_SPI_ERROR_FLAGS_EN_REG	(BLSP0_QUP_REG_BASE + 0x0000030c)
-#define BLSP1_SPI_ERROR_FLAGS_EN_REG	(BLSP1_QUP_REG_BASE + 0x0000030c)
+#define BLSP_SPI_DEASSERT_WAIT_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000310)
 
-#define BLSP0_QUP_CONFIG_REG		(BLSP0_QUP_REG_BASE + 0x00000000)
-#define BLSP1_QUP_CONFIG_REG		(BLSP1_QUP_REG_BASE + 0x00000000)
+#define BLSP_SPI_ERROR_FLAGS_EN_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x0000030c)
 
-#define BLSP0_QUP_ERROR_FLAGS_REG	(BLSP0_QUP_REG_BASE      + 0x0000001c)
-#define BLSP1_QUP_ERROR_FLAGS_REG	(BLSP1_QUP_REG_BASE      + 0x0000001c)
+#define BLSP_QUP_CONFIG_REG(p)		(BLSP_QUP_REG_BASE(p) + 0x00000000)
 
-#define BLSP0_QUP_ERROR_FLAGS_EN_REG	(BLSP0_QUP_REG_BASE + 0x00000020)
-#define BLSP1_QUP_ERROR_FLAGS_EN_REG	(BLSP1_QUP_REG_BASE + 0x00000020)
+#define BLSP_QUP_ERROR_FLAGS_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x0000001c)
 
-#define BLSP0_QUP_OPERATIONAL_MASK	(BLSP0_QUP_REG_BASE + 0x00000028)
-#define BLSP1_QUP_OPERATIONAL_MASK	(BLSP1_QUP_REG_BASE + 0x00000028)
+#define BLSP_QUP_ERROR_FLAGS_EN_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000020)
 
-#define BLSP0_QUP_OPERATIONAL_REG	(BLSP0_QUP_REG_BASE + 0x00000018)
-#define BLSP1_QUP_OPERATIONAL_REG	(BLSP1_QUP_REG_BASE + 0x00000018)
+#define BLSP_QUP_OPERATIONAL_MASK(p)	(BLSP_QUP_REG_BASE(p) + 0x00000028)
 
-#define BLSP0_QUP_IO_MODES_REG		(BLSP0_QUP_REG_BASE + 0x00000008)
-#define BLSP1_QUP_IO_MODES_REG		(BLSP1_QUP_REG_BASE + 0x00000008)
+#define BLSP_QUP_OPERATIONAL_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000018)
 
-#define BLSP0_QUP_STATE_REG		(BLSP0_QUP_REG_BASE + 0x00000004)
-#define BLSP1_QUP_STATE_REG		(BLSP1_QUP_REG_BASE + 0x00000004)
+#define BLSP_QUP_IO_MODES_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000008)
 
+#define BLSP_QUP_STATE_REG(p)		(BLSP_QUP_REG_BASE(p) + 0x00000004)
 
-#define BLSP0_QUP_INPUT_FIFOc_REG(c) \
-		(BLSP0_QUP_REG_BASE + 0x00000218 + 4 * (c))
-#define BLSP1_QUP_INPUT_FIFOc_REG(c) \
-		(BLSP1_QUP_REG_BASE + 0x00000218 + 4 * (c))
+#define BLSP_QUP_INPUT_FIFOc_REG(p, c) \
+		(BLSP_QUP_REG_BASE(p) + 0x00000218 + 4 * (c))
 
-#define BLSP0_QUP_OUTPUT_FIFOc_REG(c) \
-		(BLSP0_QUP_REG_BASE + 0x00000110 + 4 * (c))
-#define BLSP1_QUP_OUTPUT_FIFOc_REG(c) \
-		(BLSP1_QUP_REG_BASE + 0x00000110 + 4 * (c))
+#define BLSP_QUP_OUTPUT_FIFOc_REG(p, c) \
+		(BLSP_QUP_REG_BASE(p) + 0x00000110 + 4 * (c))
 
-#define BLSP0_QUP_MX_INPUT_COUNT_REG	(BLSP0_QUP_REG_BASE + 0x00000200)
-#define BLSP1_QUP_MX_INPUT_COUNT_REG	(BLSP1_QUP_REG_BASE + 0x00000200)
+#define BLSP_QUP_MX_INPUT_COUNT_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000200)
 
-#define BLSP0_QUP_MX_OUTPUT_COUNT_REG	(BLSP0_QUP_REG_BASE + 0x00000100)
-#define BLSP1_QUP_MX_OUTPUT_COUNT_REG	(BLSP1_QUP_REG_BASE + 0x00000100)
+#define BLSP_QUP_MX_OUTPUT_COUNT_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000100)
 
-#define BLSP0_QUP_MX_READ_COUNT_REG	(BLSP0_QUP_REG_BASE + 0x00000208)
-#define BLSP1_QUP_MX_READ_COUNT_REG	(BLSP1_QUP_REG_BASE + 0x00000208)
+#define BLSP_QUP_MX_READ_COUNT_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000208)
 
-#define BLSP0_QUP_MX_WRITE_COUNT_REG	(BLSP0_QUP_REG_BASE + 0x00000150)
-#define BLSP1_QUP_MX_WRITE_COUNT_REG	(BLSP1_QUP_REG_BASE + 0x00000150)
+#define BLSP_QUP_MX_WRITE_COUNT_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x00000150)
+
+#define BLSP_QUP_SW_RESET_REG(p)	(BLSP_QUP_REG_BASE(p) + 0x0000000C)
 
-#define BLSP0_QUP_SW_RESET_REG		(BLSP0_QUP_REG_BASE + 0x0000000c)
-#define BLSP1_QUP_SW_RESET_REG		(BLSP1_QUP_REG_BASE + 0x0000000c)
 
 #define QUP_STATE_VALID_BIT			2
 #define QUP_STATE_VALID				1
 #define QUP_STATE_MASK				0x3
-#define QUP_CONFIG_MINI_CORE_MSK	(0x0F << 8)
-#define QUP_CONFIG_MINI_CORE_SPI	(1 << 8)
+#define QUP_CONFIG_MINI_CORE_MSK		(0x0F << 8)
+#define QUP_CONFIG_MINI_CORE_SPI		(1 << 8)
 #define QUP_CONF_INPUT_MSK			(1 << 7)
 #define QUP_CONF_INPUT_ENA			(0 << 7)
 #define QUP_CONF_NO_INPUT			(1 << 7)
@@ -111,7 +89,7 @@
 #define QUP_CONF_OUTPUT_ENA			(0 << 6)
 #define QUP_CONF_NO_OUTPUT			(1 << 6)
 #define QUP_STATE_RUN_STATE			0x1
-#define QUP_STATE_RESET_STATE		0x0
+#define QUP_STATE_RESET_STATE			0x0
 #define QUP_STATE_PAUSE_STATE		0x3
 #define SPI_BIT_WORD_MSK			0x1F
 #define SPI_8_BIT_WORD				0x07
@@ -191,52 +169,28 @@ struct blsp_spi {
 	unsigned int	qup_deassert_wait;
 };
 
-static const struct blsp_spi spi_reg[] = {
-	/* BLSP0 registers for SPI interface */
-	{
-		BLSP0_SPI_CONFIG_REG,
-		BLSP0_SPI_IO_CONTROL_REG,
-		BLSP0_SPI_ERROR_FLAGS_REG,
-		BLSP0_SPI_ERROR_FLAGS_EN_REG,
-		BLSP0_QUP_CONFIG_REG,
-		BLSP0_QUP_ERROR_FLAGS_REG,
-		BLSP0_QUP_ERROR_FLAGS_EN_REG,
-		BLSP0_QUP_OPERATIONAL_REG,
-		BLSP0_QUP_IO_MODES_REG,
-		BLSP0_QUP_STATE_REG,
-		BLSP0_QUP_INPUT_FIFOc_REG(0),
-		BLSP0_QUP_OUTPUT_FIFOc_REG(0),
-		BLSP0_QUP_MX_INPUT_COUNT_REG,
-		BLSP0_QUP_MX_OUTPUT_COUNT_REG,
-		BLSP0_QUP_MX_READ_COUNT_REG,
-		BLSP0_QUP_MX_WRITE_COUNT_REG,
-		BLSP0_QUP_SW_RESET_REG,
-		BLSP0_QUP_OPERATIONAL_MASK,
-		BLSP0_SPI_DEASSERT_WAIT_REG,
-	},
-	/* BLSP1 registers for SPI interface */
-	{
-		BLSP1_SPI_CONFIG_REG,
-		BLSP1_SPI_IO_CONTROL_REG,
-		BLSP1_SPI_ERROR_FLAGS_REG,
-		BLSP1_SPI_ERROR_FLAGS_EN_REG,
-		BLSP1_QUP_CONFIG_REG,
-		BLSP1_QUP_ERROR_FLAGS_REG,
-		BLSP1_QUP_ERROR_FLAGS_EN_REG,
-		BLSP1_QUP_OPERATIONAL_REG,
-		BLSP1_QUP_IO_MODES_REG,
-		BLSP1_QUP_STATE_REG,
-		BLSP1_QUP_INPUT_FIFOc_REG(0),
-		BLSP1_QUP_OUTPUT_FIFOc_REG(0),
-		BLSP1_QUP_MX_INPUT_COUNT_REG,
-		BLSP1_QUP_MX_OUTPUT_COUNT_REG,
-		BLSP1_QUP_MX_READ_COUNT_REG,
-		BLSP1_QUP_MX_WRITE_COUNT_REG,
-		BLSP1_QUP_SW_RESET_REG,
-		BLSP1_QUP_OPERATIONAL_MASK,
-		BLSP1_SPI_DEASSERT_WAIT_REG,
-	},
-};
+struct blsp_spi spi_reg[CONFIG_IPQ_MAX_BLSP_QUPS];
+
+#define BLSP_SPI_REGISTERS(x) \
+	x.spi_config = BLSP_SPI_CONFIG_REG(bus);\
+	x.io_control = BLSP_SPI_IO_CONTROL_REG(bus);\
+	x.error_flags = BLSP_SPI_ERROR_FLAGS_REG(bus);\
+	x.error_flags_en = BLSP_SPI_ERROR_FLAGS_EN_REG(bus);\
+	x.qup_config = BLSP_QUP_CONFIG_REG(bus);\
+	x.qup_error_flags = BLSP_QUP_ERROR_FLAGS_REG(bus);\
+	x.qup_error_flags_en = BLSP_QUP_ERROR_FLAGS_EN_REG(bus);\
+	x.qup_operational = BLSP_QUP_OPERATIONAL_REG(bus);\
+	x.qup_io_modes = BLSP_QUP_IO_MODES_REG(bus);\
+	x.qup_state = BLSP_QUP_STATE_REG(bus);\
+	x.qup_input_fifo = BLSP_QUP_INPUT_FIFOc_REG(bus, 0);\
+	x.qup_output_fifo = BLSP_QUP_OUTPUT_FIFOc_REG(bus, 0);\
+	x.qup_mx_input_count = BLSP_QUP_MX_INPUT_COUNT_REG(bus);\
+	x.qup_mx_output_count = BLSP_QUP_MX_OUTPUT_COUNT_REG(bus);\
+	x.qup_mx_read_count = BLSP_QUP_MX_READ_COUNT_REG(bus);\
+	x.qup_mx_write_count = BLSP_QUP_MX_WRITE_COUNT_REG(bus);\
+	x.qup_sw_reset = BLSP_QUP_SW_RESET_REG(bus);\
+	x.qup_op_mask = BLSP_QUP_OPERATIONAL_MASK(bus);\
+	x.qup_deassert_wait = BLSP_SPI_DEASSERT_WAIT_REG(bus);\
 
 #define SUCCESS		0
 #define FAILURE		1
@@ -268,14 +222,6 @@ static inline struct ipq_spi_slave *to_ipq_spi(struct spi_slave *slave)
 #define DATA_CONSUMER_PIPE_INDEX		0
 #define DATA_PRODUCER_PIPE_INDEX		1
 
-/* QUP0 BAM pipe numbers */
-#define QUP0_DATA_CONSUMER_PIPE			12
-#define QUP0_DATA_PRODUCER_PIPE			13
-
-/* QUP1 BAM pipe numbers */
-#define QUP1_DATA_CONSUMER_PIPE			6
-#define QUP1_DATA_PRODUCER_PIPE			7
-
 /* QUP0 BAM pipe groups */
 #define QUP0_DATA_PRODUCER_PIPE_GRP		0
 #define QUP0_DATA_CONSUMER_PIPE_GRP		0
@@ -284,8 +230,6 @@ static inline struct ipq_spi_slave *to_ipq_spi(struct spi_slave *slave)
 #define QUP1_DATA_PRODUCER_PIPE_GRP		0
 #define QUP1_DATA_CONSUMER_PIPE_GRP		0
 
-#define NO_OF_QUPS				2
-
 /* QUP EE */
 #define QUP_SPI_EE				0
 
diff --git a/include/configs/ipq40xx.h b/include/configs/ipq40xx.h
index 8882ddf369..c9aaabd19c 100644
--- a/include/configs/ipq40xx.h
+++ b/include/configs/ipq40xx.h
@@ -199,6 +199,7 @@ typedef struct {
 #define CONFIG_SYS_MAX_NAND_DEVICE      (CONFIG_IPQ_MAX_NAND_DEVICE + \
 					CONFIG_IPQ_MAX_SPI_DEVICE)
 
+#define CONFIG_IPQ_MAX_BLSP_QUPS	2
 #define CONFIG_IPQ_MAX_SPI_DEVICE       2
 #define CONFIG_IPQ_MAX_NAND_DEVICE      1
 
diff --git a/include/configs/ipq5018.h b/include/configs/ipq5018.h
index 8dc6aeca4f..48532d8b3b 100644
--- a/include/configs/ipq5018.h
+++ b/include/configs/ipq5018.h
@@ -294,6 +294,7 @@ extern loff_t board_env_size;
 #define CONFIG_IPQ_MAX_NAND_DEVICE		1
 #define CONFIG_IPQ_MAX_SPI_DEVICE		1
 
+#define CONFIG_IPQ_MAX_BLSP_QUPS		3
 #define CONFIG_QPIC_NAND_NAND_INFO_IDX		0
 #define CONFIG_IPQ_SPI_NOR_INFO_IDX		1
 
diff --git a/include/configs/ipq6018.h b/include/configs/ipq6018.h
index c074e65b23..78e3fe7718 100644
--- a/include/configs/ipq6018.h
+++ b/include/configs/ipq6018.h
@@ -248,7 +248,7 @@ extern loff_t board_env_size;
 					CONFIG_IPQ_MAX_SPI_DEVICE
 
 #define CONFIG_IPQ_MAX_NAND_DEVICE	1
-
+#define CONFIG_IPQ_MAX_BLSP_QUPS	6
 #define CONFIG_QPIC_NAND_NAND_INFO_IDX	0
 
 #define CONFIG_NAND_FLASH_INFO_IDX	CONFIG_QPIC_NAND_NAND_INFO_IDX
diff --git a/include/configs/ipq807x.h b/include/configs/ipq807x.h
index 21ee3e2c73..90be28e1d3 100644
--- a/include/configs/ipq807x.h
+++ b/include/configs/ipq807x.h
@@ -214,6 +214,7 @@ extern loff_t board_env_size;
 #define CONFIG_IPQ_MAX_NAND_DEVICE	1
 #define CONFIG_IPQ_MAX_SPI_DEVICE	1
 
+#define CONFIG_IPQ_MAX_BLSP_QUPS	6
 #define CONFIG_QPIC_NAND_NAND_INFO_IDX	0
 #define CONFIG_IPQ_SPI_NOR_INFO_IDX	1
 
diff --git a/include/configs/ipq9574.h b/include/configs/ipq9574.h
index d76e255ca3..4a832186f4 100644
--- a/include/configs/ipq9574.h
+++ b/include/configs/ipq9574.h
@@ -207,6 +207,7 @@ extern loff_t board_env_size;
 #endif /* QSPI DEBUG */
 #define CONFIG_PAGE_SCOPE_MULTI_PAGE_READ
 #define CONFIG_QSPI_SERIAL_TRAINING
+#define CONFIG_QSPI_LAYOUT_SWITCH
 #endif
 
 /*
@@ -219,6 +220,7 @@ extern loff_t board_env_size;
 #define CONFIG_IPQ_MAX_NAND_DEVICE	1
 #define CONFIG_IPQ_MAX_SPI_DEVICE	1
 
+#define CONFIG_IPQ_MAX_BLSP_QUPS	6
 #define CONFIG_QPIC_NAND_NAND_INFO_IDX	0
 #define CONFIG_IPQ_SPI_NOR_INFO_IDX	1
 
diff --git a/tools/pack.py b/tools/pack.py
index dadcd27594..0e819db84b 100644
--- a/tools/pack.py
+++ b/tools/pack.py
@@ -533,6 +533,9 @@ class Flash_Script(FlashScript):
         else:
             pass
 
+    def switch_layout_qpic(self, layout):
+        self.append("qpic_nand %s" % layout)
+
 its_tmpl = Template("""
 /dts-v1/;
 
@@ -1098,7 +1101,13 @@ class Pack(object):
                 if part_info.which_flash == 0:
                     offset = part_info.offset
                     script.erase(offset, part_info.length)
+                    if ARCH_NAME in ["ipq9574", "ipq9574_64"]:
+                        if self.flash_type == "nand-4k" and section_conf == "sbl1":
+                                script.switch_layout_qpic("sbl")
                     script.write(offset, img_size)
+                    if ARCH_NAME in ["ipq9574", "ipq9574_64"]:
+                        if self.flash_type == "nand-4k" and section_conf == "sbl1":
+                                script.switch_layout_qpic("linux")
                 else:
                     offset = part_info.offset
                     script.nand_write(offset, part_info.length, img_size, spi_nand)