All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver
@ 2017-06-29 12:33 Vanessa Maegima
  2017-06-29 12:33 ` [U-Boot] [PATCH next 2/3] mx6qsabreauto: Add SPL support Vanessa Maegima
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Vanessa Maegima @ 2017-06-29 12:33 UTC (permalink / raw)
  To: u-boot

From: Fabio Estevam <fabio.estevam@nxp.com>

Currently the following build error is seen when a board using MMC SPL
is built and the MXS nand driver is also selected:

arch/arm/cpu/armv7/built-in.o: In function `arch_cpu_init':
arch/arm/cpu/armv7/mx6/soc.c:432: undefined reference to 'mxs_dma_init'

On mx6 the only user of mxs_dma_init() is the mxs nand driver, so
move it there.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 arch/arm/cpu/armv7/mx6/soc.c | 5 -----
 drivers/mtd/nand/mxs_nand.c  | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 2bedbdb..ecbc3b2 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -427,11 +427,6 @@ int arch_cpu_init(void)
 
 	imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */
 
-#ifdef CONFIG_APBH_DMA
-	/* Start APBH DMA */
-	mxs_dma_init();
-#endif
-
 	init_src();
 
 	return 0;
diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
index 9200544..5aa3608 100644
--- a/drivers/mtd/nand/mxs_nand.c
+++ b/drivers/mtd/nand/mxs_nand.c
@@ -1114,6 +1114,7 @@ int mxs_nand_init(struct mxs_nand_info *info)
 	}
 
 	/* Init the DMA controller. */
+	mxs_dma_init();
 	for (j = MXS_DMA_CHANNEL_AHB_APBH_GPMI0;
 		j <= MXS_DMA_CHANNEL_AHB_APBH_GPMI7; j++) {
 		ret = mxs_dma_init_channel(j);
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 2/3] mx6qsabreauto: Add SPL support
  2017-06-29 12:33 [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver Vanessa Maegima
@ 2017-06-29 12:33 ` Vanessa Maegima
  2017-06-29 19:36   ` Fabio Estevam
  2017-06-30  8:53   ` Stefano Babic
  2017-06-29 12:33 ` [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode Vanessa Maegima
  2017-06-30  8:51 ` [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver Stefano Babic
  2 siblings, 2 replies; 12+ messages in thread
From: Vanessa Maegima @ 2017-06-29 12:33 UTC (permalink / raw)
  To: u-boot

Add support for mx6q, mx6dl and mx6qp sabreauto boards in SPL.

Retrieved the mx6q DCD table from:
board/freescale/mx6qsabreauto/imximage.cfg

Retrieved the mx6dl DCD table from:
board/freescale/mx6qsabreauto/mx6dl.cfg

Retrieved the mx6qp DCD table from:
board/freescale/mx6qsabreauto/mx6qp.cfg

Flashed SPL and u-boot.img to an SD card and could successfully boot it
on mx6q, mx6qp and mx6dl sabreauto boards.

Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
---
 arch/arm/cpu/armv7/mx6/Kconfig                |   1 +
 board/freescale/mx6qsabreauto/mx6qsabreauto.c | 638 +++++++++++++++++++++-----
 configs/mx6qsabreauto_spl_defconfig           |  53 +++
 include/configs/mx6qsabreauto.h               |   4 +
 4 files changed, 581 insertions(+), 115 deletions(-)
 create mode 100644 configs/mx6qsabreauto_spl_defconfig

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 4fd60d4..0d500aa 100644
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -205,6 +205,7 @@ config TARGET_MX6Q_ICORE_RQS
 config TARGET_MX6QSABREAUTO
 	bool "mx6qsabreauto"
 	select BOARD_LATE_INIT
+	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
 	select BOARD_EARLY_INIT_F
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
index 51bbbc4..927ebe4 100644
--- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c
+++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
@@ -70,38 +70,51 @@ int dram_init(void)
 }
 
 static iomux_v3_cfg_t const uart4_pads[] = {
-	MX6_PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX6_PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
+	IOMUX_PADS(PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
+	IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
 };
 
 static iomux_v3_cfg_t const enet_pads[] = {
-	MX6_PAD_KEY_COL1__ENET_MDIO		| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_KEY_COL2__ENET_MDC		| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_TXC__RGMII_TXC	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_TD0__RGMII_TD0	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_TD1__RGMII_TD1	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_TD2__RGMII_TD2	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_TD3__RGMII_TD3	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_TX_CTL__RGMII_TX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_ENET_REF_CLK__ENET_TX_CLK	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_RXC__RGMII_RXC	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_RD0__RGMII_RD0	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_RD1__RGMII_RD1	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_RD2__RGMII_RD2	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_RD3__RGMII_RD3	| MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL),
+	IOMUX_PADS(PAD_KEY_COL1__ENET_MDIO		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_KEY_COL2__ENET_MDC		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_TXC__RGMII_TXC		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_TD0__RGMII_TD0		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_TD1__RGMII_TD1		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_TD2__RGMII_TD2		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_TD3__RGMII_TD3		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_TX_CTL__RGMII_TX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_ENET_REF_CLK__ENET_TX_CLK	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
+	IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
 };
 
 /* I2C2 PMIC, iPod, Tuner, Codec, Touch, HDMI EDID, MIPI CSI2 card */
-static struct i2c_pads_info i2c_pad_info1 = {
+static struct i2c_pads_info mx6q_i2c_pad_info1 = {
 	.scl = {
-		.i2c_mode = MX6_PAD_EIM_EB2__I2C2_SCL | PC,
-		.gpio_mode = MX6_PAD_EIM_EB2__GPIO2_IO30 | PC,
+		.i2c_mode = MX6Q_PAD_EIM_EB2__I2C2_SCL | PC,
+		.gpio_mode = MX6Q_PAD_EIM_EB2__GPIO2_IO30 | PC,
 		.gp = IMX_GPIO_NR(2, 30)
 	},
 	.sda = {
-		.i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | PC,
-		.gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | PC,
+		.i2c_mode = MX6Q_PAD_KEY_ROW3__I2C2_SDA | PC,
+		.gpio_mode = MX6Q_PAD_KEY_ROW3__GPIO4_IO13 | PC,
+		.gp = IMX_GPIO_NR(4, 13)
+	}
+};
+
+static struct i2c_pads_info mx6dl_i2c_pad_info1 = {
+	.scl = {
+		.i2c_mode = MX6DL_PAD_EIM_EB2__I2C2_SCL | PC,
+		.gpio_mode = MX6DL_PAD_EIM_EB2__GPIO2_IO30 | PC,
+		.gp = IMX_GPIO_NR(2, 30)
+	},
+	.sda = {
+		.i2c_mode = MX6DL_PAD_KEY_ROW3__I2C2_SDA | PC,
+		.gpio_mode = MX6DL_PAD_KEY_ROW3__GPIO4_IO13 | PC,
 		.gp = IMX_GPIO_NR(4, 13)
 	}
 };
@@ -111,26 +124,39 @@ static struct i2c_pads_info i2c_pad_info1 = {
  * I2C3 MLB, Port Expanders (A, B, C), Video ADC, Light Sensor,
  * Compass Sensor, Accelerometer, Res Touch
  */
-static struct i2c_pads_info i2c_pad_info2 = {
+static struct i2c_pads_info mx6q_i2c_pad_info2 = {
+	.scl = {
+		.i2c_mode = MX6Q_PAD_GPIO_3__I2C3_SCL | PC,
+		.gpio_mode = MX6Q_PAD_GPIO_3__GPIO1_IO03 | PC,
+		.gp = IMX_GPIO_NR(1, 3)
+	},
+	.sda = {
+		.i2c_mode = MX6Q_PAD_EIM_D18__I2C3_SDA | PC,
+		.gpio_mode = MX6Q_PAD_EIM_D18__GPIO3_IO18 | PC,
+		.gp = IMX_GPIO_NR(3, 18)
+	}
+};
+
+static struct i2c_pads_info mx6dl_i2c_pad_info2 = {
 	.scl = {
-		.i2c_mode = MX6_PAD_GPIO_3__I2C3_SCL | PC,
-		.gpio_mode = MX6_PAD_GPIO_3__GPIO1_IO03 | PC,
+		.i2c_mode = MX6DL_PAD_GPIO_3__I2C3_SCL | PC,
+		.gpio_mode = MX6DL_PAD_GPIO_3__GPIO1_IO03 | PC,
 		.gp = IMX_GPIO_NR(1, 3)
 	},
 	.sda = {
-		.i2c_mode = MX6_PAD_EIM_D18__I2C3_SDA | PC,
-		.gpio_mode = MX6_PAD_EIM_D18__GPIO3_IO18 | PC,
+		.i2c_mode = MX6DL_PAD_EIM_D18__I2C3_SDA | PC,
+		.gpio_mode = MX6DL_PAD_EIM_D18__GPIO3_IO18 | PC,
 		.gp = IMX_GPIO_NR(3, 18)
 	}
 };
 #endif
 
 static iomux_v3_cfg_t const i2c3_pads[] = {
-	MX6_PAD_EIM_A24__GPIO5_IO04		| MUX_PAD_CTRL(NO_PAD_CTRL),
+	IOMUX_PADS(PAD_EIM_A24__GPIO5_IO04	| MUX_PAD_CTRL(NO_PAD_CTRL)),
 };
 
 static iomux_v3_cfg_t const port_exp[] = {
-	MX6_PAD_SD2_DAT0__GPIO1_IO15		| MUX_PAD_CTRL(NO_PAD_CTRL),
+	IOMUX_PADS(PAD_SD2_DAT0__GPIO1_IO15	| MUX_PAD_CTRL(NO_PAD_CTRL)),
 };
 
 /*Define for building port exp gpio, pin starts from 0*/
@@ -172,49 +198,49 @@ static int port_exp_direction_output(unsigned gpio, int value)
 }
 
 static iomux_v3_cfg_t const eimnor_pads[] = {
-	MX6_PAD_EIM_D16__EIM_DATA16	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D17__EIM_DATA17	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D18__EIM_DATA18	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D19__EIM_DATA19	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D20__EIM_DATA20	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D21__EIM_DATA21	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D22__EIM_DATA22	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D23__EIM_DATA23	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D24__EIM_DATA24	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D25__EIM_DATA25	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D26__EIM_DATA26	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D27__EIM_DATA27	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D28__EIM_DATA28	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D29__EIM_DATA29	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D30__EIM_DATA30	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_D31__EIM_DATA31	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA0__EIM_AD00	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA1__EIM_AD01	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA2__EIM_AD02	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA3__EIM_AD03	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA4__EIM_AD04	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA5__EIM_AD05	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA6__EIM_AD06	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA7__EIM_AD07	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA8__EIM_AD08	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA9__EIM_AD09	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA10__EIM_AD10	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA11__EIM_AD11	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL) ,
-	MX6_PAD_EIM_DA12__EIM_AD12	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA13__EIM_AD13	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA14__EIM_AD14	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_DA15__EIM_AD15	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_A16__EIM_ADDR16	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_A17__EIM_ADDR17	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_A18__EIM_ADDR18	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_A19__EIM_ADDR19	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_A20__EIM_ADDR20	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_A21__EIM_ADDR21	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_A22__EIM_ADDR22	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_A23__EIM_ADDR23	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
-	MX6_PAD_EIM_OE__EIM_OE_B	| MUX_PAD_CTRL(NO_PAD_CTRL),
-	MX6_PAD_EIM_RW__EIM_RW		| MUX_PAD_CTRL(NO_PAD_CTRL),
-	MX6_PAD_EIM_CS0__EIM_CS0_B	| MUX_PAD_CTRL(NO_PAD_CTRL),
+	IOMUX_PADS(PAD_EIM_D16__EIM_DATA16	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D17__EIM_DATA17	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D18__EIM_DATA18	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D19__EIM_DATA19	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D20__EIM_DATA20	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D21__EIM_DATA21	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D22__EIM_DATA22	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D23__EIM_DATA23	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D24__EIM_DATA24	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D25__EIM_DATA25	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D26__EIM_DATA26	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D27__EIM_DATA27	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D28__EIM_DATA28	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D29__EIM_DATA29	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D30__EIM_DATA30	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_D31__EIM_DATA31	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA0__EIM_AD00	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA1__EIM_AD01	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA2__EIM_AD02	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA3__EIM_AD03	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA4__EIM_AD04	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA5__EIM_AD05	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA6__EIM_AD06	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA7__EIM_AD07	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA8__EIM_AD08	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA9__EIM_AD09	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA10__EIM_AD10	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA11__EIM_AD11	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA12__EIM_AD12	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA13__EIM_AD13	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA14__EIM_AD14	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_DA15__EIM_AD15	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_A16__EIM_ADDR16	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_A17__EIM_ADDR17	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_A18__EIM_ADDR18	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_A19__EIM_ADDR19	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_A20__EIM_ADDR20	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_A21__EIM_ADDR21	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_A22__EIM_ADDR22	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_A23__EIM_ADDR23	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_OE__EIM_OE_B		| MUX_PAD_CTRL(NO_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_RW__EIM_RW		| MUX_PAD_CTRL(NO_PAD_CTRL)),
+	IOMUX_PADS(PAD_EIM_CS0__EIM_CS0_B	| MUX_PAD_CTRL(NO_PAD_CTRL)),
 };
 
 static void eimnor_cs_setup(void)
@@ -260,7 +286,7 @@ static void eim_clk_setup(void)
 
 static void setup_iomux_eimnor(void)
 {
-	imx_iomux_v3_setup_multiple_pads(eimnor_pads, ARRAY_SIZE(eimnor_pads));
+	SETUP_IOMUX_PADS(eimnor_pads);
 
 	gpio_direction_output(IMX_GPIO_NR(5, 4), 0);
 
@@ -269,27 +295,27 @@ static void setup_iomux_eimnor(void)
 
 static void setup_iomux_enet(void)
 {
-	imx_iomux_v3_setup_multiple_pads(enet_pads, ARRAY_SIZE(enet_pads));
+	SETUP_IOMUX_PADS(enet_pads);
 }
 
 static iomux_v3_cfg_t const usdhc3_pads[] = {
-	MX6_PAD_SD3_CLK__SD3_CLK	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_SD3_CMD__SD3_CMD	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_SD3_DAT0__SD3_DATA0	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_SD3_DAT1__SD3_DATA1	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_SD3_DAT2__SD3_DATA2	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_SD3_DAT3__SD3_DATA3	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_SD3_DAT4__SD3_DATA4	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_SD3_DAT5__SD3_DATA5	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_SD3_DAT6__SD3_DATA6	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_SD3_DAT7__SD3_DATA7	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_GPIO_18__SD3_VSELECT | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX6_PAD_NANDF_CS2__GPIO6_IO15   | MUX_PAD_CTRL(NO_PAD_CTRL),
+	IOMUX_PADS(PAD_SD3_CLK__SD3_CLK		| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_SD3_CMD__SD3_CMD		| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_SD3_DAT4__SD3_DATA4	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_SD3_DAT5__SD3_DATA5	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_SD3_DAT6__SD3_DATA6	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_SD3_DAT7__SD3_DATA7	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_GPIO_18__SD3_VSELECT	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+	IOMUX_PADS(PAD_NANDF_CS2__GPIO6_IO15	| MUX_PAD_CTRL(NO_PAD_CTRL)),
 };
 
 static void setup_iomux_uart(void)
 {
-	imx_iomux_v3_setup_multiple_pads(uart4_pads, ARRAY_SIZE(uart4_pads));
+	SETUP_IOMUX_PADS(uart4_pads);
 }
 
 #ifdef CONFIG_FSL_ESDHC
@@ -305,7 +331,7 @@ int board_mmc_getcd(struct mmc *mmc)
 
 int board_mmc_init(bd_t *bis)
 {
-	imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
+	SETUP_IOMUX_PADS(usdhc3_pads);
 
 	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
 	return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
@@ -314,22 +340,22 @@ int board_mmc_init(bd_t *bis)
 
 #ifdef CONFIG_NAND_MXS
 static iomux_v3_cfg_t gpmi_pads[] = {
-	MX6_PAD_NANDF_CLE__NAND_CLE		| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_ALE__NAND_ALE		| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_WP_B__NAND_WP_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_RB0__NAND_READY_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL0),
-	MX6_PAD_NANDF_CS0__NAND_CE0_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_SD4_CMD__NAND_RE_B		| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_SD4_CLK__NAND_WE_B		| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_D0__NAND_DATA00	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_D1__NAND_DATA01	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_D2__NAND_DATA02	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_D3__NAND_DATA03	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_D4__NAND_DATA04	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_D5__NAND_DATA05	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_D6__NAND_DATA06	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_NANDF_D7__NAND_DATA07	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
-	MX6_PAD_SD4_DAT0__NAND_DQS		| MUX_PAD_CTRL(GPMI_PAD_CTRL1),
+	IOMUX_PADS(PAD_NANDF_CLE__NAND_CLE	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_ALE__NAND_ALE	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_WP_B__NAND_WP_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_RB0__NAND_READY_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL0)),
+	IOMUX_PADS(PAD_NANDF_CS0__NAND_CE0_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_SD4_CMD__NAND_RE_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_SD4_CLK__NAND_WE_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_D0__NAND_DATA00	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_D1__NAND_DATA01	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_D2__NAND_DATA02	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_D3__NAND_DATA03	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_D4__NAND_DATA04	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_D5__NAND_DATA05	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_D6__NAND_DATA06	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_NANDF_D7__NAND_DATA07	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
+	IOMUX_PADS(PAD_SD4_DAT0__NAND_DQS	| MUX_PAD_CTRL(GPMI_PAD_CTRL1)),
 };
 
 static void setup_gpmi_nand(void)
@@ -337,7 +363,7 @@ static void setup_gpmi_nand(void)
 	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
 
 	/* config gpmi nand iomux */
-	imx_iomux_v3_setup_multiple_pads(gpmi_pads, ARRAY_SIZE(gpmi_pads));
+	SETUP_IOMUX_PADS(gpmi_pads);
 
 	setup_gpmi_io_clk((MXC_CCM_CS2CDR_ENFC_CLK_PODF(0) |
 			MXC_CCM_CS2CDR_ENFC_CLK_PRED(3) |
@@ -465,14 +491,13 @@ struct display_info_t const displays[] = {{
 size_t display_count = ARRAY_SIZE(displays);
 
 iomux_v3_cfg_t const backlight_pads[] = {
-	MX6_PAD_SD4_DAT1__GPIO2_IO09 | MUX_PAD_CTRL(ENET_PAD_CTRL),
+	IOMUX_PADS(PAD_SD4_DAT1__GPIO2_IO09 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
 };
 
 static void setup_iomux_backlight(void)
 {
 	gpio_direction_output(IMX_GPIO_NR(2, 9), 1);
-	imx_iomux_v3_setup_multiple_pads(backlight_pads,
-					 ARRAY_SIZE(backlight_pads));
+	SETUP_IOMUX_PADS(backlight_pads);
 }
 
 static void setup_display(void)
@@ -557,15 +582,21 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 	/* I2C 2 and 3 setup - I2C 3 hw mux with EIM */
-	setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
+	if (is_mx6dq() || is_mx6dqp())
+		setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c_pad_info1);
+	else
+		setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info1);
 	/* I2C 3 Steer */
 	gpio_direction_output(IMX_GPIO_NR(5, 4), 1);
-	imx_iomux_v3_setup_multiple_pads(i2c3_pads, ARRAY_SIZE(i2c3_pads));
+	SETUP_IOMUX_PADS(i2c3_pads);
 #ifndef CONFIG_SYS_FLASH_CFI
-	setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info2);
+	if (is_mx6dq() || is_mx6dqp())
+		setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c_pad_info2);
+	else
+		setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info2);
 #endif
 	gpio_direction_output(IMX_GPIO_NR(1, 15), 1);
-	imx_iomux_v3_setup_multiple_pads(port_exp, ARRAY_SIZE(port_exp));
+	SETUP_IOMUX_PADS(port_exp);
 
 #ifdef CONFIG_VIDEO_IPUV3
 	setup_display();
@@ -654,15 +685,14 @@ int checkboard(void)
 #define USB_OTG_PWR       PORTEXP_IO_NR(0x34, 1)
 
 iomux_v3_cfg_t const usb_otg_pads[] = {
-	MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL),
+	IOMUX_PADS(PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL)),
 };
 
 int board_ehci_hcd_init(int port)
 {
 	switch (port) {
 	case 0:
-		imx_iomux_v3_setup_multiple_pads(usb_otg_pads,
-			ARRAY_SIZE(usb_otg_pads));
+		SETUP_IOMUX_PADS(usb_otg_pads);
 
 		/*
 		  * Set daisy chain for otg_pin_id on 6q.
@@ -702,3 +732,381 @@ int board_ehci_power(int port, int on)
 	return 0;
 }
 #endif
+
+#ifdef CONFIG_SPL_BUILD
+#include <asm/arch/mx6-ddr.h>
+#include <spl.h>
+#include <libfdt.h>
+
+static void ccgr_init(void)
+{
+	struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+	writel(0x00C03F3F, &ccm->CCGR0);
+	writel(0x0030FC03, &ccm->CCGR1);
+	writel(0x0FFFC000, &ccm->CCGR2);
+	writel(0x3FF00000, &ccm->CCGR3);
+	writel(0x00FFF300, &ccm->CCGR4);
+	writel(0x0F0000C3, &ccm->CCGR5);
+	writel(0x000003FF, &ccm->CCGR6);
+}
+
+static void gpr_init(void)
+{
+	struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
+
+	/* enable AXI cache for VDOA/VPU/IPU */
+	writel(0xF00000CF, &iomux->gpr[4]);
+	if (is_mx6dqp()) {
+		/* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */
+		writel(0x007F007F, &iomux->gpr[6]);
+		writel(0x007F007F, &iomux->gpr[7]);
+	} else {
+		/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
+		writel(0x007F007F, &iomux->gpr[6]);
+		writel(0x007F007F, &iomux->gpr[7]);
+	}
+}
+
+static int mx6q_dcd_table[] = {
+	0x020e0798, 0x000C0000,
+	0x020e0758, 0x00000000,
+	0x020e0588, 0x00000030,
+	0x020e0594, 0x00000030,
+	0x020e056c, 0x00000030,
+	0x020e0578, 0x00000030,
+	0x020e074c, 0x00000030,
+	0x020e057c, 0x00000030,
+	0x020e058c, 0x00000000,
+	0x020e059c, 0x00000030,
+	0x020e05a0, 0x00000030,
+	0x020e078c, 0x00000030,
+	0x020e0750, 0x00020000,
+	0x020e05a8, 0x00000028,
+	0x020e05b0, 0x00000028,
+	0x020e0524, 0x00000028,
+	0x020e051c, 0x00000028,
+	0x020e0518, 0x00000028,
+	0x020e050c, 0x00000028,
+	0x020e05b8, 0x00000028,
+	0x020e05c0, 0x00000028,
+	0x020e0774, 0x00020000,
+	0x020e0784, 0x00000028,
+	0x020e0788, 0x00000028,
+	0x020e0794, 0x00000028,
+	0x020e079c, 0x00000028,
+	0x020e07a0, 0x00000028,
+	0x020e07a4, 0x00000028,
+	0x020e07a8, 0x00000028,
+	0x020e0748, 0x00000028,
+	0x020e05ac, 0x00000028,
+	0x020e05b4, 0x00000028,
+	0x020e0528, 0x00000028,
+	0x020e0520, 0x00000028,
+	0x020e0514, 0x00000028,
+	0x020e0510, 0x00000028,
+	0x020e05bc, 0x00000028,
+	0x020e05c4, 0x00000028,
+	0x021b0800, 0xa1390003,
+	0x021b080c, 0x001F001F,
+	0x021b0810, 0x001F001F,
+	0x021b480c, 0x001F001F,
+	0x021b4810, 0x001F001F,
+	0x021b083c, 0x43260335,
+	0x021b0840, 0x031A030B,
+	0x021b483c, 0x4323033B,
+	0x021b4840, 0x0323026F,
+	0x021b0848, 0x483D4545,
+	0x021b4848, 0x44433E48,
+	0x021b0850, 0x41444840,
+	0x021b4850, 0x4835483E,
+	0x021b081c, 0x33333333,
+	0x021b0820, 0x33333333,
+	0x021b0824, 0x33333333,
+	0x021b0828, 0x33333333,
+	0x021b481c, 0x33333333,
+	0x021b4820, 0x33333333,
+	0x021b4824, 0x33333333,
+	0x021b4828, 0x33333333,
+	0x021b08b8, 0x00000800,
+	0x021b48b8, 0x00000800,
+	0x021b0004, 0x00020036,
+	0x021b0008, 0x09444040,
+	0x021b000c, 0x8A8F7955,
+	0x021b0010, 0xFF328F64,
+	0x021b0014, 0x01FF00DB,
+	0x021b0018, 0x00001740,
+	0x021b001c, 0x00008000,
+	0x021b002c, 0x000026d2,
+	0x021b0030, 0x008F1023,
+	0x021b0040, 0x00000047,
+	0x021b0000, 0x841A0000,
+	0x021b001c, 0x04088032,
+	0x021b001c, 0x00008033,
+	0x021b001c, 0x00048031,
+	0x021b001c, 0x09408030,
+	0x021b001c, 0x04008040,
+	0x021b0020, 0x00005800,
+	0x021b0818, 0x00011117,
+	0x021b4818, 0x00011117,
+	0x021b0004, 0x00025576,
+	0x021b0404, 0x00011006,
+	0x021b001c, 0x00000000,
+	0x020c4068, 0x00C03F3F,
+	0x020c406c, 0x0030FC03,
+	0x020c4070, 0x0FFFC000,
+	0x020c4074, 0x3FF00000,
+	0x020c4078, 0xFFFFF300,
+	0x020c407c, 0x0F0000F3,
+	0x020c4080, 0x00000FFF,
+	0x020e0010, 0xF00000CF,
+	0x020e0018, 0x007F007F,
+	0x020e001c, 0x007F007F,
+};
+
+static int mx6qp_dcd_table[] = {
+	0x020e0798, 0x000C0000,
+	0x020e0758, 0x00000000,
+	0x020e0588, 0x00000030,
+	0x020e0594, 0x00000030,
+	0x020e056c, 0x00000030,
+	0x020e0578, 0x00000030,
+	0x020e074c, 0x00000030,
+	0x020e057c, 0x00000030,
+	0x020e058c, 0x00000000,
+	0x020e059c, 0x00000030,
+	0x020e05a0, 0x00000030,
+	0x020e078c, 0x00000030,
+	0x020e0750, 0x00020000,
+	0x020e05a8, 0x00000030,
+	0x020e05b0, 0x00000030,
+	0x020e0524, 0x00000030,
+	0x020e051c, 0x00000030,
+	0x020e0518, 0x00000030,
+	0x020e050c, 0x00000030,
+	0x020e05b8, 0x00000030,
+	0x020e05c0, 0x00000030,
+	0x020e0774, 0x00020000,
+	0x020e0784, 0x00000030,
+	0x020e0788, 0x00000030,
+	0x020e0794, 0x00000030,
+	0x020e079c, 0x00000030,
+	0x020e07a0, 0x00000030,
+	0x020e07a4, 0x00000030,
+	0x020e07a8, 0x00000030,
+	0x020e0748, 0x00000030,
+	0x020e05ac, 0x00000030,
+	0x020e05b4, 0x00000030,
+	0x020e0528, 0x00000030,
+	0x020e0520, 0x00000030,
+	0x020e0514, 0x00000030,
+	0x020e0510, 0x00000030,
+	0x020e05bc, 0x00000030,
+	0x020e05c4, 0x00000030,
+	0x021b0800, 0xa1390003,
+	0x021b080c, 0x001b001e,
+	0x021b0810, 0x002e0029,
+	0x021b480c, 0x001b002a,
+	0x021b4810, 0x0019002c,
+	0x021b083c, 0x43240334,
+	0x021b0840, 0x0324031a,
+	0x021b483c, 0x43340344,
+	0x021b4840, 0x03280276,
+	0x021b0848, 0x44383A3E,
+	0x021b4848, 0x3C3C3846,
+	0x021b0850, 0x2e303230,
+	0x021b4850, 0x38283E34,
+	0x021b081c, 0x33333333,
+	0x021b0820, 0x33333333,
+	0x021b0824, 0x33333333,
+	0x021b0828, 0x33333333,
+	0x021b481c, 0x33333333,
+	0x021b4820, 0x33333333,
+	0x021b4824, 0x33333333,
+	0x021b4828, 0x33333333,
+	0x021b08c0, 0x24912492,
+	0x021b48c0, 0x24912492,
+	0x021b08b8, 0x00000800,
+	0x021b48b8, 0x00000800,
+	0x021b0004, 0x00020036,
+	0x021b0008, 0x09444040,
+	0x021b000c, 0x898E7955,
+	0x021b0010, 0xFF328F64,
+	0x021b0014, 0x01FF00DB,
+	0x021b0018, 0x00001740,
+	0x021b001c, 0x00008000,
+	0x021b002c, 0x000026d2,
+	0x021b0030, 0x008E1023,
+	0x021b0040, 0x00000047,
+	0x021b0400, 0x14420000,
+	0x021b0000, 0x841A0000,
+	0x00bb0008, 0x00000004,
+	0x00bb000c, 0x2891E41A,
+	0x00bb0038, 0x00000564,
+	0x00bb0014, 0x00000040,
+	0x00bb0028, 0x00000020,
+	0x00bb002c, 0x00000020,
+	0x021b001c, 0x04088032,
+	0x021b001c, 0x00008033,
+	0x021b001c, 0x00048031,
+	0x021b001c, 0x09408030,
+	0x021b001c, 0x04008040,
+	0x021b0020, 0x00005800,
+	0x021b0818, 0x00011117,
+	0x021b4818, 0x00011117,
+	0x021b0004, 0x00025576,
+	0x021b0404, 0x00011006,
+	0x021b001c, 0x00000000,
+	0x020c4068, 0x00C03F3F,
+	0x020c406c, 0x0030FC03,
+	0x020c4070, 0x0FFFC000,
+	0x020c4074, 0x3FF00000,
+	0x020c4078, 0xFFFFF300,
+	0x020c407c, 0x0F0000F3,
+	0x020c4080, 0x00000FFF,
+	0x020e0010, 0xF00000CF,
+	0x020e0018, 0x77177717,
+	0x020e001c, 0x77177717,
+};
+
+static int mx6dl_dcd_table[] = {
+	0x020e0774, 0x000C0000,
+	0x020e0754, 0x00000000,
+	0x020e04ac, 0x00000030,
+	0x020e04b0, 0x00000030,
+	0x020e0464, 0x00000030,
+	0x020e0490, 0x00000030,
+	0x020e074c, 0x00000030,
+	0x020e0494, 0x00000030,
+	0x020e04a0, 0x00000000,
+	0x020e04b4, 0x00000030,
+	0x020e04b8, 0x00000030,
+	0x020e076c, 0x00000030,
+	0x020e0750, 0x00020000,
+	0x020e04bc, 0x00000028,
+	0x020e04c0, 0x00000028,
+	0x020e04c4, 0x00000028,
+	0x020e04c8, 0x00000028,
+	0x020e04cc, 0x00000028,
+	0x020e04d0, 0x00000028,
+	0x020e04d4, 0x00000028,
+	0x020e04d8, 0x00000028,
+	0x020e0760, 0x00020000,
+	0x020e0764, 0x00000028,
+	0x020e0770, 0x00000028,
+	0x020e0778, 0x00000028,
+	0x020e077c, 0x00000028,
+	0x020e0780, 0x00000028,
+	0x020e0784, 0x00000028,
+	0x020e078c, 0x00000028,
+	0x020e0748, 0x00000028,
+	0x020e0470, 0x00000028,
+	0x020e0474, 0x00000028,
+	0x020e0478, 0x00000028,
+	0x020e047c, 0x00000028,
+	0x020e0480, 0x00000028,
+	0x020e0484, 0x00000028,
+	0x020e0488, 0x00000028,
+	0x020e048c, 0x00000028,
+	0x021b0800, 0xa1390003,
+	0x021b080c, 0x001F001F,
+	0x021b0810, 0x001F001F,
+	0x021b480c, 0x001F001F,
+	0x021b4810, 0x001F001F,
+	0x021b083c, 0x42190217,
+	0x021b0840, 0x017B017B,
+	0x021b483c, 0x4176017B,
+	0x021b4840, 0x015F016C,
+	0x021b0848, 0x4C4C4D4C,
+	0x021b4848, 0x4A4D4C48,
+	0x021b0850, 0x3F3F3F40,
+	0x021b4850, 0x3538382E,
+	0x021b081c, 0x33333333,
+	0x021b0820, 0x33333333,
+	0x021b0824, 0x33333333,
+	0x021b0828, 0x33333333,
+	0x021b481c, 0x33333333,
+	0x021b4820, 0x33333333,
+	0x021b4824, 0x33333333,
+	0x021b4828, 0x33333333,
+	0x021b08b8, 0x00000800,
+	0x021b48b8, 0x00000800,
+	0x021b0004, 0x00020025,
+	0x021b0008, 0x00333030,
+	0x021b000c, 0x676B5313,
+	0x021b0010, 0xB66E8B63,
+	0x021b0014, 0x01FF00DB,
+	0x021b0018, 0x00001740,
+	0x021b001c, 0x00008000,
+	0x021b002c, 0x000026d2,
+	0x021b0030, 0x006B1023,
+	0x021b0040, 0x00000047,
+	0x021b0000, 0x841A0000,
+	0x021b001c, 0x04008032,
+	0x021b001c, 0x00008033,
+	0x021b001c, 0x00048031,
+	0x021b001c, 0x05208030,
+	0x021b001c, 0x04008040,
+	0x021b0020, 0x00005800,
+	0x021b0818, 0x00011117,
+	0x021b4818, 0x00011117,
+	0x021b0004, 0x00025565,
+	0x021b0404, 0x00011006,
+	0x021b001c, 0x00000000,
+	0x020c4068, 0x00C03F3F,
+	0x020c406c, 0x0030FC03,
+	0x020c4070, 0x0FFFC000,
+	0x020c4074, 0x3FF00000,
+	0x020c4078, 0xFFFFF300,
+	0x020c407c, 0x0F0000C3,
+	0x020c4080, 0x00000FFF,
+	0x020e0010, 0xF00000CF,
+	0x020e0018, 0x007F007F,
+	0x020e001c, 0x007F007F,
+};
+
+static void ddr_init(int *table, int size)
+{
+	int i;
+
+	for (i = 0; i < size / 2 ; i++)
+		writel(table[2 * i + 1], table[2 * i]);
+}
+
+static void spl_dram_init(void)
+{
+	if (is_mx6dq())
+		ddr_init(mx6q_dcd_table, ARRAY_SIZE(mx6q_dcd_table));
+	else if (is_mx6dqp())
+		ddr_init(mx6qp_dcd_table, ARRAY_SIZE(mx6qp_dcd_table));
+	else if (is_mx6sdl())
+		ddr_init(mx6dl_dcd_table, ARRAY_SIZE(mx6dl_dcd_table));
+}
+
+void board_init_f(ulong dummy)
+{
+	/* DDR initialization */
+	spl_dram_init();
+
+	/* setup AIPS and disable watchdog */
+	arch_cpu_init();
+
+	ccgr_init();
+	gpr_init();
+
+	/* iomux and setup of i2c */
+	board_early_init_f();
+
+	/* setup GP timer */
+	timer_init();
+
+	/* UART clocks enabled and gd valid - init serial console */
+	preloader_console_init();
+
+	/* Clear the BSS. */
+	memset(__bss_start, 0, __bss_end - __bss_start);
+
+	/* load/boot image from boot device */
+	board_init_r(NULL, 0);
+}
+#endif
diff --git a/configs/mx6qsabreauto_spl_defconfig b/configs/mx6qsabreauto_spl_defconfig
new file mode 100644
index 0000000..ce2d1d2
--- /dev/null
+++ b/configs/mx6qsabreauto_spl_defconfig
@@ -0,0 +1,53 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TARGET_MX6QSABREAUTO=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
+CONFIG_BOOTDELAY=3
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SPL=y
+CONFIG_SPL_EXT_SUPPORT=y
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_DFU=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_DFU_MMC=y
+CONFIG_DFU_SF=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_OF_LIBFDT=y
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index 635c04a..99b48ca 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -9,6 +9,10 @@
 #ifndef __MX6QSABREAUTO_CONFIG_H
 #define __MX6QSABREAUTO_CONFIG_H
 
+#ifdef CONFIG_SPL
+#include "imx6_spl.h"
+#endif
+
 #define CONFIG_MACH_TYPE	3529
 #define CONFIG_MXC_UART_BASE	UART4_BASE
 #define CONSOLE_DEV		"ttymxc3"
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode
  2017-06-29 12:33 [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver Vanessa Maegima
  2017-06-29 12:33 ` [U-Boot] [PATCH next 2/3] mx6qsabreauto: Add SPL support Vanessa Maegima
@ 2017-06-29 12:33 ` Vanessa Maegima
  2017-06-29 19:37   ` Fabio Estevam
                     ` (2 more replies)
  2017-06-30  8:51 ` [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver Stefano Babic
  2 siblings, 3 replies; 12+ messages in thread
From: Vanessa Maegima @ 2017-06-29 12:33 UTC (permalink / raw)
  To: u-boot

As mx6sabreauto supports SPL now, all variants can boot using the same
defconfig.

This patch:
- Removes non-SPL targets.
- Renames target to mx6sabreauto_defconfig.
- Renames folder and board files to mx6sabreauto.
- Updates MAINTAINERS, Makefile and Kconfig accordingly.
- Removes .cfg files.
- Adds a README with instructions to build and flash SPL and u-boot.img.

Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
---
 arch/arm/cpu/armv7/mx6/Kconfig                     |   6 +-
 board/freescale/mx6qsabreauto/MAINTAINERS          |   9 --
 board/freescale/mx6qsabreauto/imximage.cfg         | 129 ------------------
 board/freescale/mx6qsabreauto/mx6dl.cfg            | 130 ------------------
 board/freescale/mx6qsabreauto/mx6qp.cfg            | 145 ---------------------
 .../{mx6qsabreauto => mx6sabreauto}/Kconfig        |   6 +-
 board/freescale/mx6sabreauto/MAINTAINERS           |   7 +
 .../{mx6qsabreauto => mx6sabreauto}/Makefile       |   2 +-
 board/freescale/mx6sabreauto/README                |  20 +++
 .../mx6sabreauto.c}                                |   0
 configs/mx6dlsabreauto_defconfig                   |  44 -------
 configs/mx6qpsabreauto_defconfig                   |  43 ------
 configs/mx6qsabreauto_defconfig                    |  44 -------
 ...reauto_spl_defconfig => mx6sabreauto_defconfig} |   2 +-
 .../configs/{mx6qsabreauto.h => mx6sabreauto.h}    |   6 +-
 15 files changed, 38 insertions(+), 555 deletions(-)
 delete mode 100644 board/freescale/mx6qsabreauto/MAINTAINERS
 delete mode 100644 board/freescale/mx6qsabreauto/imximage.cfg
 delete mode 100644 board/freescale/mx6qsabreauto/mx6dl.cfg
 delete mode 100644 board/freescale/mx6qsabreauto/mx6qp.cfg
 rename board/freescale/{mx6qsabreauto => mx6sabreauto}/Kconfig (54%)
 create mode 100644 board/freescale/mx6sabreauto/MAINTAINERS
 rename board/freescale/{mx6qsabreauto => mx6sabreauto}/Makefile (85%)
 create mode 100644 board/freescale/mx6sabreauto/README
 rename board/freescale/{mx6qsabreauto/mx6qsabreauto.c => mx6sabreauto/mx6sabreauto.c} (100%)
 delete mode 100644 configs/mx6dlsabreauto_defconfig
 delete mode 100644 configs/mx6qpsabreauto_defconfig
 delete mode 100644 configs/mx6qsabreauto_defconfig
 rename configs/{mx6qsabreauto_spl_defconfig => mx6sabreauto_defconfig} (97%)
 rename include/configs/{mx6qsabreauto.h => mx6sabreauto.h} (94%)

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 0d500aa..4a38dc2 100644
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -202,8 +202,8 @@ config TARGET_MX6Q_ICORE_RQS
 	select SUPPORT_SPL
 	select SPL_LOAD_FIT
 
-config TARGET_MX6QSABREAUTO
-	bool "mx6qsabreauto"
+config TARGET_MX6SABREAUTO
+	bool "mx6sabreauto"
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 	select DM
@@ -413,7 +413,7 @@ source "board/engicam/icorem6/Kconfig"
 source "board/engicam/icorem6_rqs/Kconfig"
 source "board/engicam/isiotmx6ul/Kconfig"
 source "board/freescale/mx6qarm2/Kconfig"
-source "board/freescale/mx6qsabreauto/Kconfig"
+source "board/freescale/mx6sabreauto/Kconfig"
 source "board/freescale/mx6sabresd/Kconfig"
 source "board/freescale/mx6slevk/Kconfig"
 source "board/freescale/mx6sllevk/Kconfig"
diff --git a/board/freescale/mx6qsabreauto/MAINTAINERS b/board/freescale/mx6qsabreauto/MAINTAINERS
deleted file mode 100644
index f148dac..0000000
--- a/board/freescale/mx6qsabreauto/MAINTAINERS
+++ /dev/null
@@ -1,9 +0,0 @@
-MX6QSABREAUTO BOARD
-M:	Fabio Estevam <fabio.estevam@nxp.com>
-M:	Peng Fan <peng.fan@nxp.com>
-S:	Maintained
-F:	board/freescale/mx6qsabreauto/
-F:	include/configs/mx6qsabreauto.h
-F:	configs/mx6dlsabreauto_defconfig
-F:	configs/mx6qsabreauto_defconfig
-F:	configs/mx6qpsabreauto_defconfig
diff --git a/board/freescale/mx6qsabreauto/imximage.cfg b/board/freescale/mx6qsabreauto/imximage.cfg
deleted file mode 100644
index 16bf473..0000000
--- a/board/freescale/mx6qsabreauto/imximage.cfg
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- *
- * Refer doc/README.imximage for more details about how-to configure
- * and create imximage boot image
- *
- * The syntax is taken as close as possible with the kwbimage
- */
-/* image version */
-
-IMAGE_VERSION 2
-
-/*
- * Boot Device : one of
- * spi, sd (the board has no nand neither onenand)
- */
-BOOT_FROM	sd
-
-/*
- * Device Configuration Data (DCD)
- *
- * Each entry must have the format:
- * Addr-type           Address        Value
- *
- * where:
- *	Addr-type register length (1,2 or 4 bytes)
- *	Address	  absolute address of the register
- *	value	  value to be stored in the register
- */
-DATA 4 0x020e0798 0x000C0000
-DATA 4 0x020e0758 0x00000000
-DATA 4 0x020e0588 0x00000030
-DATA 4 0x020e0594 0x00000030
-DATA 4 0x020e056c 0x00000030
-DATA 4 0x020e0578 0x00000030
-DATA 4 0x020e074c 0x00000030
-DATA 4 0x020e057c 0x00000030
-DATA 4 0x020e058c 0x00000000
-DATA 4 0x020e059c 0x00000030
-DATA 4 0x020e05a0 0x00000030
-DATA 4 0x020e078c 0x00000030
-DATA 4 0x020e0750 0x00020000
-DATA 4 0x020e05a8 0x00000028
-DATA 4 0x020e05b0 0x00000028
-DATA 4 0x020e0524 0x00000028
-DATA 4 0x020e051c 0x00000028
-DATA 4 0x020e0518 0x00000028
-DATA 4 0x020e050c 0x00000028
-DATA 4 0x020e05b8 0x00000028
-DATA 4 0x020e05c0 0x00000028
-DATA 4 0x020e0774 0x00020000
-DATA 4 0x020e0784 0x00000028
-DATA 4 0x020e0788 0x00000028
-DATA 4 0x020e0794 0x00000028
-DATA 4 0x020e079c 0x00000028
-DATA 4 0x020e07a0 0x00000028
-DATA 4 0x020e07a4 0x00000028
-DATA 4 0x020e07a8 0x00000028
-DATA 4 0x020e0748 0x00000028
-DATA 4 0x020e05ac 0x00000028
-DATA 4 0x020e05b4 0x00000028
-DATA 4 0x020e0528 0x00000028
-DATA 4 0x020e0520 0x00000028
-DATA 4 0x020e0514 0x00000028
-DATA 4 0x020e0510 0x00000028
-DATA 4 0x020e05bc 0x00000028
-DATA 4 0x020e05c4 0x00000028
-DATA 4 0x021b0800 0xa1390003
-DATA 4 0x021b080c 0x001F001F
-DATA 4 0x021b0810 0x001F001F
-DATA 4 0x021b480c 0x001F001F
-DATA 4 0x021b4810 0x001F001F
-DATA 4 0x021b083c 0x43260335
-DATA 4 0x021b0840 0x031A030B
-DATA 4 0x021b483c 0x4323033B
-DATA 4 0x021b4840 0x0323026F
-DATA 4 0x021b0848 0x483D4545
-DATA 4 0x021b4848 0x44433E48
-DATA 4 0x021b0850 0x41444840
-DATA 4 0x021b4850 0x4835483E
-DATA 4 0x021b081c 0x33333333
-DATA 4 0x021b0820 0x33333333
-DATA 4 0x021b0824 0x33333333
-DATA 4 0x021b0828 0x33333333
-DATA 4 0x021b481c 0x33333333
-DATA 4 0x021b4820 0x33333333
-DATA 4 0x021b4824 0x33333333
-DATA 4 0x021b4828 0x33333333
-DATA 4 0x021b08b8 0x00000800
-DATA 4 0x021b48b8 0x00000800
-DATA 4 0x021b0004 0x00020036
-DATA 4 0x021b0008 0x09444040
-DATA 4 0x021b000c 0x8A8F7955
-DATA 4 0x021b0010 0xFF328F64
-DATA 4 0x021b0014 0x01FF00DB
-DATA 4 0x021b0018 0x00001740
-DATA 4 0x021b001c 0x00008000
-DATA 4 0x021b002c 0x000026d2
-DATA 4 0x021b0030 0x008F1023
-DATA 4 0x021b0040 0x00000047
-DATA 4 0x021b0000 0x841A0000
-DATA 4 0x021b001c 0x04088032
-DATA 4 0x021b001c 0x00008033
-DATA 4 0x021b001c 0x00048031
-DATA 4 0x021b001c 0x09408030
-DATA 4 0x021b001c 0x04008040
-DATA 4 0x021b0020 0x00005800
-DATA 4 0x021b0818 0x00011117
-DATA 4 0x021b4818 0x00011117
-DATA 4 0x021b0004 0x00025576
-DATA 4 0x021b0404 0x00011006
-DATA 4 0x021b001c 0x00000000
-
-/* set the default clock gate to save power */
-DATA 4 0x020c4068 0x00C03F3F
-DATA 4 0x020c406c 0x0030FC03
-DATA 4 0x020c4070 0x0FFFC000
-DATA 4 0x020c4074 0x3FF00000
-DATA 4 0x020c4078 0xFFFFF300
-DATA 4 0x020c407c 0x0F0000F3
-DATA 4 0x020c4080 0x00000FFF
-
-/* enable AXI cache for VDOA/VPU/IPU */
-DATA 4 0x020e0010 0xF00000CF
-/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
-DATA 4 0x020e0018 0x007F007F
-DATA 4 0x020e001c 0x007F007F
diff --git a/board/freescale/mx6qsabreauto/mx6dl.cfg b/board/freescale/mx6qsabreauto/mx6dl.cfg
deleted file mode 100644
index 89078e5..0000000
--- a/board/freescale/mx6qsabreauto/mx6dl.cfg
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
- * Jason Liu <r64343@freescale.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- *
- * Refer doc/README.imximage for more details about how-to configure
- * and create imximage boot image
- *
- * The syntax is taken as close as possible with the kwbimage
- */
-/* image version */
-
-IMAGE_VERSION 2
-
-/*
- * Boot Device : one of
- * spi, sd (the board has no nand neither onenand)
- */
-BOOT_FROM	sd
-
-/*
- * Device Configuration Data (DCD)
- *
- * Each entry must have the format:
- * Addr-type           Address        Value
- *
- * where:
- *	Addr-type register length (1,2 or 4 bytes)
- *	Address	  absolute address of the register
- *	value	  value to be stored in the register
- */
-DATA 4 0x020e0774 0x000C0000
-DATA 4 0x020e0754 0x00000000
-DATA 4 0x020e04ac 0x00000030
-DATA 4 0x020e04b0 0x00000030
-DATA 4 0x020e0464 0x00000030
-DATA 4 0x020e0490 0x00000030
-DATA 4 0x020e074c 0x00000030
-DATA 4 0x020e0494 0x00000030
-DATA 4 0x020e04a0 0x00000000
-DATA 4 0x020e04b4 0x00000030
-DATA 4 0x020e04b8 0x00000030
-DATA 4 0x020e076c 0x00000030
-DATA 4 0x020e0750 0x00020000
-DATA 4 0x020e04bc 0x00000028
-DATA 4 0x020e04c0 0x00000028
-DATA 4 0x020e04c4 0x00000028
-DATA 4 0x020e04c8 0x00000028
-DATA 4 0x020e04cc 0x00000028
-DATA 4 0x020e04d0 0x00000028
-DATA 4 0x020e04d4 0x00000028
-DATA 4 0x020e04d8 0x00000028
-DATA 4 0x020e0760 0x00020000
-DATA 4 0x020e0764 0x00000028
-DATA 4 0x020e0770 0x00000028
-DATA 4 0x020e0778 0x00000028
-DATA 4 0x020e077c 0x00000028
-DATA 4 0x020e0780 0x00000028
-DATA 4 0x020e0784 0x00000028
-DATA 4 0x020e078c 0x00000028
-DATA 4 0x020e0748 0x00000028
-DATA 4 0x020e0470 0x00000028
-DATA 4 0x020e0474 0x00000028
-DATA 4 0x020e0478 0x00000028
-DATA 4 0x020e047c 0x00000028
-DATA 4 0x020e0480 0x00000028
-DATA 4 0x020e0484 0x00000028
-DATA 4 0x020e0488 0x00000028
-DATA 4 0x020e048c 0x00000028
-DATA 4 0x021b0800 0xa1390003
-DATA 4 0x021b080c 0x001F001F
-DATA 4 0x021b0810 0x001F001F
-DATA 4 0x021b480c 0x001F001F
-DATA 4 0x021b4810 0x001F001F
-DATA 4 0x021b083c 0x42190217
-DATA 4 0x021b0840 0x017B017B
-DATA 4 0x021b483c 0x4176017B
-DATA 4 0x021b4840 0x015F016C
-DATA 4 0x021b0848 0x4C4C4D4C
-DATA 4 0x021b4848 0x4A4D4C48
-DATA 4 0x021b0850 0x3F3F3F40
-DATA 4 0x021b4850 0x3538382E
-DATA 4 0x021b081c 0x33333333
-DATA 4 0x021b0820 0x33333333
-DATA 4 0x021b0824 0x33333333
-DATA 4 0x021b0828 0x33333333
-DATA 4 0x021b481c 0x33333333
-DATA 4 0x021b4820 0x33333333
-DATA 4 0x021b4824 0x33333333
-DATA 4 0x021b4828 0x33333333
-DATA 4 0x021b08b8 0x00000800
-DATA 4 0x021b48b8 0x00000800
-DATA 4 0x021b0004 0x00020025
-DATA 4 0x021b0008 0x00333030
-DATA 4 0x021b000c 0x676B5313
-DATA 4 0x021b0010 0xB66E8B63
-DATA 4 0x021b0014 0x01FF00DB
-DATA 4 0x021b0018 0x00001740
-DATA 4 0x021b001c 0x00008000
-DATA 4 0x021b002c 0x000026d2
-DATA 4 0x021b0030 0x006B1023
-DATA 4 0x021b0040 0x00000047
-DATA 4 0x021b0000 0x841A0000
-DATA 4 0x021b001c 0x04008032
-DATA 4 0x021b001c 0x00008033
-DATA 4 0x021b001c 0x00048031
-DATA 4 0x021b001c 0x05208030
-DATA 4 0x021b001c 0x04008040
-DATA 4 0x021b0020 0x00005800
-DATA 4 0x021b0818 0x00011117
-DATA 4 0x021b4818 0x00011117
-DATA 4 0x021b0004 0x00025565
-DATA 4 0x021b0404 0x00011006
-DATA 4 0x021b001c 0x00000000
-
-/* set the default clock gate to save power */
-DATA 4 0x020c4068 0x00C03F3F
-DATA 4 0x020c406c 0x0030FC03
-DATA 4 0x020c4070 0x0FFFC000
-DATA 4 0x020c4074 0x3FF00000
-DATA 4 0x020c4078 0xFFFFF300
-DATA 4 0x020c407c 0x0F0000C3
-DATA 4 0x020c4080 0x00000FFF
-
-/* enable AXI cache for VDOA/VPU/IPU */
-DATA 4 0x020e0010 0xF00000CF
-/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
-DATA 4 0x020e0018 0x007F007F
-DATA 4 0x020e001c 0x007F007F
diff --git a/board/freescale/mx6qsabreauto/mx6qp.cfg b/board/freescale/mx6qsabreauto/mx6qp.cfg
deleted file mode 100644
index 2298c77..0000000
--- a/board/freescale/mx6qsabreauto/mx6qp.cfg
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- *
- * Refer doc/README.imximage for more details about how-to configure
- * and create imximage boot image
- *
- * The syntax is taken as close as possible with the kwbimage
- */
-/* image version */
-
-#define __ASSEMBLY__
-#include <config.h>
-
-IMAGE_VERSION 2
-
-/*
- * Boot Device : one of spi, sd, eimnor, nand, sata:
- * spinor: flash_offset: 0x0400
- * nand:   flash_offset: 0x0400
- * sata:   flash_offset: 0x0400
- * sd/mmc: flash_offset: 0x0400
- * eimnor: flash_offset: 0x1000
- */
-BOOT_FROM	sd
-
-/*
- * Device Configuration Data (DCD)
- *
- * Each entry must have the format:
- * Addr-type           Address        Value
- *
- * where:
- *	Addr-type register length (1,2 or 4 bytes)
- *	Address	  absolute address of the register
- *	value	  value to be stored in the register
- */
-DATA 4 0x020e0798 0x000C0000
-DATA 4 0x020e0758 0x00000000
-DATA 4 0x020e0588 0x00000030
-DATA 4 0x020e0594 0x00000030
-DATA 4 0x020e056c 0x00000030
-DATA 4 0x020e0578 0x00000030
-DATA 4 0x020e074c 0x00000030
-DATA 4 0x020e057c 0x00000030
-DATA 4 0x020e058c 0x00000000
-DATA 4 0x020e059c 0x00000030
-DATA 4 0x020e05a0 0x00000030
-DATA 4 0x020e078c 0x00000030
-DATA 4 0x020e0750 0x00020000
-DATA 4 0x020e05a8 0x00000030
-DATA 4 0x020e05b0 0x00000030
-DATA 4 0x020e0524 0x00000030
-DATA 4 0x020e051c 0x00000030
-DATA 4 0x020e0518 0x00000030
-DATA 4 0x020e050c 0x00000030
-DATA 4 0x020e05b8 0x00000030
-DATA 4 0x020e05c0 0x00000030
-DATA 4 0x020e0774 0x00020000
-DATA 4 0x020e0784 0x00000030
-DATA 4 0x020e0788 0x00000030
-DATA 4 0x020e0794 0x00000030
-DATA 4 0x020e079c 0x00000030
-DATA 4 0x020e07a0 0x00000030
-DATA 4 0x020e07a4 0x00000030
-DATA 4 0x020e07a8 0x00000030
-DATA 4 0x020e0748 0x00000030
-DATA 4 0x020e05ac 0x00000030
-DATA 4 0x020e05b4 0x00000030
-DATA 4 0x020e0528 0x00000030
-DATA 4 0x020e0520 0x00000030
-DATA 4 0x020e0514 0x00000030
-DATA 4 0x020e0510 0x00000030
-DATA 4 0x020e05bc 0x00000030
-DATA 4 0x020e05c4 0x00000030
-DATA 4 0x021b0800 0xa1390003
-DATA 4 0x021b080c 0x001b001e
-DATA 4 0x021b0810 0x002e0029
-DATA 4 0x021b480c 0x001b002a
-DATA 4 0x021b4810 0x0019002c
-DATA 4 0x021b083c 0x43240334
-DATA 4 0x021b0840 0x0324031a
-DATA 4 0x021b483c 0x43340344
-DATA 4 0x021b4840 0x03280276
-DATA 4 0x021b0848 0x44383A3E
-DATA 4 0x021b4848 0x3C3C3846
-DATA 4 0x021b0850 0x2e303230
-DATA 4 0x021b4850 0x38283E34
-DATA 4 0x021b081c 0x33333333
-DATA 4 0x021b0820 0x33333333
-DATA 4 0x021b0824 0x33333333
-DATA 4 0x021b0828 0x33333333
-DATA 4 0x021b481c 0x33333333
-DATA 4 0x021b4820 0x33333333
-DATA 4 0x021b4824 0x33333333
-DATA 4 0x021b4828 0x33333333
-DATA 4 0x021b08c0 0x24912492
-DATA 4 0x021b48c0 0x24912492
-DATA 4 0x021b08b8 0x00000800
-DATA 4 0x021b48b8 0x00000800
-DATA 4 0x021b0004 0x00020036
-DATA 4 0x021b0008 0x09444040
-DATA 4 0x021b000c 0x898E7955
-DATA 4 0x021b0010 0xFF328F64
-DATA 4 0x021b0014 0x01FF00DB
-DATA 4 0x021b0018 0x00001740
-DATA 4 0x021b001c 0x00008000
-
-DATA 4 0x021b002c 0x000026d2
-DATA 4 0x021b0030 0x008E1023
-DATA 4 0x021b0040 0x00000047
-DATA 4 0x021b0400 0x14420000
-DATA 4 0x021b0000 0x841A0000
-DATA 4 0x00bb0008 0x00000004
-DATA 4 0x00bb000c 0x2891E41A
-DATA 4 0x00bb0038 0x00000564
-DATA 4 0x00bb0014 0x00000040
-DATA 4 0x00bb0028 0x00000020
-DATA 4 0x00bb002c 0x00000020
-DATA 4 0x021b001c 0x04088032
-DATA 4 0x021b001c 0x00008033
-DATA 4 0x021b001c 0x00048031
-DATA 4 0x021b001c 0x09408030
-DATA 4 0x021b001c 0x04008040
-DATA 4 0x021b0020 0x00005800
-DATA 4 0x021b0818 0x00011117
-DATA 4 0x021b4818 0x00011117
-DATA 4 0x021b0004 0x00025576
-DATA 4 0x021b0404 0x00011006
-DATA 4 0x021b001c 0x00000000
-/* set the default clock gate to save power */
-DATA 4, 0x020c4068, 0x00C03F3F
-DATA 4, 0x020c406c, 0x0030FC03
-DATA 4, 0x020c4070, 0x0FFFC000
-DATA 4, 0x020c4074, 0x3FF00000
-DATA 4, 0x020c4078, 0xFFFFF300
-DATA 4, 0x020c407c, 0x0F0000F3
-DATA 4, 0x020c4080, 0x00000FFF
-
-/* enable AXI cache for VDOA/VPU/IPU */
-DATA 4, 0x020e0010, 0xF00000CF
-/* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */
-DATA 4, 0x020e0018, 0x77177717
-DATA 4, 0x020e001c, 0x77177717
diff --git a/board/freescale/mx6qsabreauto/Kconfig b/board/freescale/mx6sabreauto/Kconfig
similarity index 54%
rename from board/freescale/mx6qsabreauto/Kconfig
rename to board/freescale/mx6sabreauto/Kconfig
index e579c0f..5b4faf6 100644
--- a/board/freescale/mx6qsabreauto/Kconfig
+++ b/board/freescale/mx6sabreauto/Kconfig
@@ -1,12 +1,12 @@
-if TARGET_MX6QSABREAUTO
+if TARGET_MX6SABREAUTO
 
 config SYS_BOARD
-	default "mx6qsabreauto"
+	default "mx6sabreauto"
 
 config SYS_VENDOR
 	default "freescale"
 
 config SYS_CONFIG_NAME
-	default "mx6qsabreauto"
+	default "mx6sabreauto"
 
 endif
diff --git a/board/freescale/mx6sabreauto/MAINTAINERS b/board/freescale/mx6sabreauto/MAINTAINERS
new file mode 100644
index 0000000..a89f05a
--- /dev/null
+++ b/board/freescale/mx6sabreauto/MAINTAINERS
@@ -0,0 +1,7 @@
+MX6SABREAUTO BOARD
+M:	Fabio Estevam <fabio.estevam@nxp.com>
+M:	Peng Fan <peng.fan@nxp.com>
+S:	Maintained
+F:	board/freescale/mx6sabreauto/
+F:	include/configs/mx6sabreauto.h
+F:	configs/mx6sabreauto_defconfig
diff --git a/board/freescale/mx6qsabreauto/Makefile b/board/freescale/mx6sabreauto/Makefile
similarity index 85%
rename from board/freescale/mx6qsabreauto/Makefile
rename to board/freescale/mx6sabreauto/Makefile
index ac5bc81..87f4ec0 100644
--- a/board/freescale/mx6qsabreauto/Makefile
+++ b/board/freescale/mx6sabreauto/Makefile
@@ -6,4 +6,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y  := mx6qsabreauto.o
+obj-y  := mx6sabreauto.o
diff --git a/board/freescale/mx6sabreauto/README b/board/freescale/mx6sabreauto/README
new file mode 100644
index 0000000..7e4596a
--- /dev/null
+++ b/board/freescale/mx6sabreauto/README
@@ -0,0 +1,20 @@
+How to use and build U-Boot on mx6sabreauto
+-------------------------------------------
+
+mx6sabreauto_defconfig target supports mx6q/mx6dl/mx6qp sabreauto variants.
+
+In order to build it:
+
+$ make mx6sabreauto_defconfig
+
+$ make
+
+This will generate the SPL and u-boot.img binaries.
+
+- Flash the SPL binary into the SD card:
+
+$ sudo dd if=SPL of=/dev/sdX bs=1K seek=1 && sync
+
+- Flash the u-boot.img binary into the SD card:
+
+$ sudo dd if=u-boot.img of=/dev/sdX bs=1K seek=69 && sync
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
similarity index 100%
rename from board/freescale/mx6qsabreauto/mx6qsabreauto.c
rename to board/freescale/mx6sabreauto/mx6sabreauto.c
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
deleted file mode 100644
index ba5ab8a..0000000
--- a/configs/mx6dlsabreauto_defconfig
+++ /dev/null
@@ -1,44 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_MX6=y
-CONFIG_TARGET_MX6QSABREAUTO=y
-CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
-CONFIG_BOOTDELAY=3
-# CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_MMC=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_SF=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
-# CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
deleted file mode 100644
index 96a248e..0000000
--- a/configs/mx6qpsabreauto_defconfig
+++ /dev/null
@@ -1,43 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_MX6=y
-CONFIG_TARGET_MX6QSABREAUTO=y
-CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6Q"
-CONFIG_BOOTDELAY=3
-# CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMLS is not set
-CONFIG_CMD_MMC=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_SF=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
-# CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
deleted file mode 100644
index 015207d..0000000
--- a/configs/mx6qsabreauto_defconfig
+++ /dev/null
@@ -1,44 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_MX6=y
-CONFIG_TARGET_MX6QSABREAUTO=y
-CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
-CONFIG_BOOTDELAY=3
-# CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_MMC=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_SF=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
-# CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6qsabreauto_spl_defconfig b/configs/mx6sabreauto_defconfig
similarity index 97%
rename from configs/mx6qsabreauto_spl_defconfig
rename to configs/mx6sabreauto_defconfig
index ce2d1d2..c1b3bbf 100644
--- a/configs/mx6qsabreauto_spl_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_TARGET_MX6QSABREAUTO=y
+CONFIG_TARGET_MX6SABREAUTO=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6sabreauto.h
similarity index 94%
rename from include/configs/mx6qsabreauto.h
rename to include/configs/mx6sabreauto.h
index 99b48ca..fd0d5ce 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef __MX6QSABREAUTO_CONFIG_H
-#define __MX6QSABREAUTO_CONFIG_H
+#ifndef __MX6SABREAUTO_CONFIG_H
+#define __MX6SABREAUTO_CONFIG_H
 
 #ifdef CONFIG_SPL
 #include "imx6_spl.h"
@@ -76,4 +76,4 @@
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
-#endif                         /* __MX6QSABREAUTO_CONFIG_H */
+#endif                         /* __MX6SABREAUTO_CONFIG_H */
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 2/3] mx6qsabreauto: Add SPL support
  2017-06-29 12:33 ` [U-Boot] [PATCH next 2/3] mx6qsabreauto: Add SPL support Vanessa Maegima
@ 2017-06-29 19:36   ` Fabio Estevam
  2017-06-30  8:53   ` Stefano Babic
  1 sibling, 0 replies; 12+ messages in thread
From: Fabio Estevam @ 2017-06-29 19:36 UTC (permalink / raw)
  To: u-boot

On Thu, Jun 29, 2017 at 9:33 AM, Vanessa Maegima
<vanessa.maegima@nxp.com> wrote:
> Add support for mx6q, mx6dl and mx6qp sabreauto boards in SPL.
>
> Retrieved the mx6q DCD table from:
> board/freescale/mx6qsabreauto/imximage.cfg
>
> Retrieved the mx6dl DCD table from:
> board/freescale/mx6qsabreauto/mx6dl.cfg
>
> Retrieved the mx6qp DCD table from:
> board/freescale/mx6qsabreauto/mx6qp.cfg
>
> Flashed SPL and u-boot.img to an SD card and could successfully boot it
> on mx6q, mx6qp and mx6dl sabreauto boards.
>
> Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode
  2017-06-29 12:33 ` [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode Vanessa Maegima
@ 2017-06-29 19:37   ` Fabio Estevam
  2017-06-30  8:54   ` Stefano Babic
  2017-07-05 10:05   ` Stefano Babic
  2 siblings, 0 replies; 12+ messages in thread
From: Fabio Estevam @ 2017-06-29 19:37 UTC (permalink / raw)
  To: u-boot

On Thu, Jun 29, 2017 at 9:33 AM, Vanessa Maegima
<vanessa.maegima@nxp.com> wrote:
> As mx6sabreauto supports SPL now, all variants can boot using the same
> defconfig.
>
> This patch:
> - Removes non-SPL targets.
> - Renames target to mx6sabreauto_defconfig.
> - Renames folder and board files to mx6sabreauto.
> - Updates MAINTAINERS, Makefile and Kconfig accordingly.
> - Removes .cfg files.
> - Adds a README with instructions to build and flash SPL and u-boot.img.
>
> Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver
  2017-06-29 12:33 [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver Vanessa Maegima
  2017-06-29 12:33 ` [U-Boot] [PATCH next 2/3] mx6qsabreauto: Add SPL support Vanessa Maegima
  2017-06-29 12:33 ` [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode Vanessa Maegima
@ 2017-06-30  8:51 ` Stefano Babic
  2017-06-30 11:21   ` Fabio Estevam
  2 siblings, 1 reply; 12+ messages in thread
From: Stefano Babic @ 2017-06-30  8:51 UTC (permalink / raw)
  To: u-boot

Hi Vanessa, hi Fabio,

On 29/06/2017 14:33, Vanessa Maegima wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Currently the following build error is seen when a board using MMC SPL
> is built and the MXS nand driver is also selected:
> 
> arch/arm/cpu/armv7/built-in.o: In function `arch_cpu_init':
> arch/arm/cpu/armv7/mx6/soc.c:432: undefined reference to 'mxs_dma_init'
> 
> On mx6 the only user of mxs_dma_init() is the mxs nand driver, so
> move it there.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
>  arch/arm/cpu/armv7/mx6/soc.c | 5 -----
>  drivers/mtd/nand/mxs_nand.c  | 1 +
>  2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
> index 2bedbdb..ecbc3b2 100644
> --- a/arch/arm/cpu/armv7/mx6/soc.c
> +++ b/arch/arm/cpu/armv7/mx6/soc.c
> @@ -427,11 +427,6 @@ int arch_cpu_init(void)
>  
>  	imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */
>  
> -#ifdef CONFIG_APBH_DMA
> -	/* Start APBH DMA */
> -	mxs_dma_init();
> -#endif
> -
>  	init_src();
>  
>  	return 0;
> diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
> index 9200544..5aa3608 100644
> --- a/drivers/mtd/nand/mxs_nand.c
> +++ b/drivers/mtd/nand/mxs_nand.c
> @@ -1114,6 +1114,7 @@ int mxs_nand_init(struct mxs_nand_info *info)
>  	}
>  
>  	/* Init the DMA controller. */
> +	mxs_dma_init();

But if this is the case, should we not also add a dependency in Kconfig
for NAND_MXS, selecting automatically APBH_DMA ?

config NAND_MXS
        bool "MXS NAND support"
        depends on MX6 || MX7
+ 	select APBH_DMA

>  	for (j = MXS_DMA_CHANNEL_AHB_APBH_GPMI0;
>  		j <= MXS_DMA_CHANNEL_AHB_APBH_GPMI7; j++) {
>  		ret = mxs_dma_init_channel(j);
> 

Best regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 2/3] mx6qsabreauto: Add SPL support
  2017-06-29 12:33 ` [U-Boot] [PATCH next 2/3] mx6qsabreauto: Add SPL support Vanessa Maegima
  2017-06-29 19:36   ` Fabio Estevam
@ 2017-06-30  8:53   ` Stefano Babic
  1 sibling, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2017-06-30  8:53 UTC (permalink / raw)
  To: u-boot

On 29/06/2017 14:33, Vanessa Maegima wrote:
> Add support for mx6q, mx6dl and mx6qp sabreauto boards in SPL.
> 
> Retrieved the mx6q DCD table from:
> board/freescale/mx6qsabreauto/imximage.cfg
> 
> Retrieved the mx6dl DCD table from:
> board/freescale/mx6qsabreauto/mx6dl.cfg
> 
> Retrieved the mx6qp DCD table from:
> board/freescale/mx6qsabreauto/mx6qp.cfg
> 
> Flashed SPL and u-boot.img to an SD card and could successfully boot it
> on mx6q, mx6qp and mx6dl sabreauto boards.
> 
> Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
> ---
>  arch/arm/cpu/armv7/mx6/Kconfig                |   1 +
>  board/freescale/mx6qsabreauto/mx6qsabreauto.c | 638 +++++++++++++++++++++-----
>  configs/mx6qsabreauto_spl_defconfig           |  53 +++
>  include/configs/mx6qsabreauto.h               |   4 +
>  4 files changed, 581 insertions(+), 115 deletions(-)
>  create mode 100644 configs/mx6qsabreauto_spl_defconfig
> 
> diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
> index 4fd60d4..0d500aa 100644
> --- a/arch/arm/cpu/armv7/mx6/Kconfig
> +++ b/arch/arm/cpu/armv7/mx6/Kconfig
> @@ -205,6 +205,7 @@ config TARGET_MX6Q_ICORE_RQS
>  config TARGET_MX6QSABREAUTO
>  	bool "mx6qsabreauto"
>  	select BOARD_LATE_INIT
> +	select SUPPORT_SPL
>  	select DM
>  	select DM_THERMAL
>  	select BOARD_EARLY_INIT_F
> diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
> index 51bbbc4..927ebe4 100644
> --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c
> +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
> @@ -70,38 +70,51 @@ int dram_init(void)
>  }
>  
>  static iomux_v3_cfg_t const uart4_pads[] = {
> -	MX6_PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
> -	MX6_PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
> +	IOMUX_PADS(PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
> +	IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
>  };
>  
>  static iomux_v3_cfg_t const enet_pads[] = {
> -	MX6_PAD_KEY_COL1__ENET_MDIO		| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_KEY_COL2__ENET_MDC		| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_TXC__RGMII_TXC	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_TD0__RGMII_TD0	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_TD1__RGMII_TD1	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_TD2__RGMII_TD2	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_TD3__RGMII_TD3	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_TX_CTL__RGMII_TX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_ENET_REF_CLK__ENET_TX_CLK	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_RXC__RGMII_RXC	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_RD0__RGMII_RD0	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_RD1__RGMII_RD1	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_RD2__RGMII_RD2	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_RD3__RGMII_RD3	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL),
> +	IOMUX_PADS(PAD_KEY_COL1__ENET_MDIO		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_KEY_COL2__ENET_MDC		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_TXC__RGMII_TXC		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_TD0__RGMII_TD0		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_TD1__RGMII_TD1		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_TD2__RGMII_TD2		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_TD3__RGMII_TD3		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_TX_CTL__RGMII_TX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_ENET_REF_CLK__ENET_TX_CLK	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3		| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> +	IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
>  };
>  
>  /* I2C2 PMIC, iPod, Tuner, Codec, Touch, HDMI EDID, MIPI CSI2 card */
> -static struct i2c_pads_info i2c_pad_info1 = {
> +static struct i2c_pads_info mx6q_i2c_pad_info1 = {
>  	.scl = {
> -		.i2c_mode = MX6_PAD_EIM_EB2__I2C2_SCL | PC,
> -		.gpio_mode = MX6_PAD_EIM_EB2__GPIO2_IO30 | PC,
> +		.i2c_mode = MX6Q_PAD_EIM_EB2__I2C2_SCL | PC,
> +		.gpio_mode = MX6Q_PAD_EIM_EB2__GPIO2_IO30 | PC,
>  		.gp = IMX_GPIO_NR(2, 30)
>  	},
>  	.sda = {
> -		.i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | PC,
> -		.gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | PC,
> +		.i2c_mode = MX6Q_PAD_KEY_ROW3__I2C2_SDA | PC,
> +		.gpio_mode = MX6Q_PAD_KEY_ROW3__GPIO4_IO13 | PC,
> +		.gp = IMX_GPIO_NR(4, 13)
> +	}
> +};
> +
> +static struct i2c_pads_info mx6dl_i2c_pad_info1 = {
> +	.scl = {
> +		.i2c_mode = MX6DL_PAD_EIM_EB2__I2C2_SCL | PC,
> +		.gpio_mode = MX6DL_PAD_EIM_EB2__GPIO2_IO30 | PC,
> +		.gp = IMX_GPIO_NR(2, 30)
> +	},
> +	.sda = {
> +		.i2c_mode = MX6DL_PAD_KEY_ROW3__I2C2_SDA | PC,
> +		.gpio_mode = MX6DL_PAD_KEY_ROW3__GPIO4_IO13 | PC,
>  		.gp = IMX_GPIO_NR(4, 13)
>  	}
>  };
> @@ -111,26 +124,39 @@ static struct i2c_pads_info i2c_pad_info1 = {
>   * I2C3 MLB, Port Expanders (A, B, C), Video ADC, Light Sensor,
>   * Compass Sensor, Accelerometer, Res Touch
>   */
> -static struct i2c_pads_info i2c_pad_info2 = {
> +static struct i2c_pads_info mx6q_i2c_pad_info2 = {
> +	.scl = {
> +		.i2c_mode = MX6Q_PAD_GPIO_3__I2C3_SCL | PC,
> +		.gpio_mode = MX6Q_PAD_GPIO_3__GPIO1_IO03 | PC,
> +		.gp = IMX_GPIO_NR(1, 3)
> +	},
> +	.sda = {
> +		.i2c_mode = MX6Q_PAD_EIM_D18__I2C3_SDA | PC,
> +		.gpio_mode = MX6Q_PAD_EIM_D18__GPIO3_IO18 | PC,
> +		.gp = IMX_GPIO_NR(3, 18)
> +	}
> +};
> +
> +static struct i2c_pads_info mx6dl_i2c_pad_info2 = {
>  	.scl = {
> -		.i2c_mode = MX6_PAD_GPIO_3__I2C3_SCL | PC,
> -		.gpio_mode = MX6_PAD_GPIO_3__GPIO1_IO03 | PC,
> +		.i2c_mode = MX6DL_PAD_GPIO_3__I2C3_SCL | PC,
> +		.gpio_mode = MX6DL_PAD_GPIO_3__GPIO1_IO03 | PC,
>  		.gp = IMX_GPIO_NR(1, 3)
>  	},
>  	.sda = {
> -		.i2c_mode = MX6_PAD_EIM_D18__I2C3_SDA | PC,
> -		.gpio_mode = MX6_PAD_EIM_D18__GPIO3_IO18 | PC,
> +		.i2c_mode = MX6DL_PAD_EIM_D18__I2C3_SDA | PC,
> +		.gpio_mode = MX6DL_PAD_EIM_D18__GPIO3_IO18 | PC,
>  		.gp = IMX_GPIO_NR(3, 18)
>  	}
>  };
>  #endif
>  
>  static iomux_v3_cfg_t const i2c3_pads[] = {
> -	MX6_PAD_EIM_A24__GPIO5_IO04		| MUX_PAD_CTRL(NO_PAD_CTRL),
> +	IOMUX_PADS(PAD_EIM_A24__GPIO5_IO04	| MUX_PAD_CTRL(NO_PAD_CTRL)),
>  };
>  
>  static iomux_v3_cfg_t const port_exp[] = {
> -	MX6_PAD_SD2_DAT0__GPIO1_IO15		| MUX_PAD_CTRL(NO_PAD_CTRL),
> +	IOMUX_PADS(PAD_SD2_DAT0__GPIO1_IO15	| MUX_PAD_CTRL(NO_PAD_CTRL)),
>  };
>  
>  /*Define for building port exp gpio, pin starts from 0*/
> @@ -172,49 +198,49 @@ static int port_exp_direction_output(unsigned gpio, int value)
>  }
>  
>  static iomux_v3_cfg_t const eimnor_pads[] = {
> -	MX6_PAD_EIM_D16__EIM_DATA16	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D17__EIM_DATA17	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D18__EIM_DATA18	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D19__EIM_DATA19	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D20__EIM_DATA20	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D21__EIM_DATA21	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D22__EIM_DATA22	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D23__EIM_DATA23	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D24__EIM_DATA24	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D25__EIM_DATA25	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D26__EIM_DATA26	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D27__EIM_DATA27	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D28__EIM_DATA28	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D29__EIM_DATA29	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D30__EIM_DATA30	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_D31__EIM_DATA31	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA0__EIM_AD00	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA1__EIM_AD01	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA2__EIM_AD02	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA3__EIM_AD03	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA4__EIM_AD04	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA5__EIM_AD05	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA6__EIM_AD06	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA7__EIM_AD07	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA8__EIM_AD08	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA9__EIM_AD09	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA10__EIM_AD10	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA11__EIM_AD11	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL) ,
> -	MX6_PAD_EIM_DA12__EIM_AD12	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA13__EIM_AD13	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA14__EIM_AD14	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_DA15__EIM_AD15	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_A16__EIM_ADDR16	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_A17__EIM_ADDR17	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_A18__EIM_ADDR18	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_A19__EIM_ADDR19	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_A20__EIM_ADDR20	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_A21__EIM_ADDR21	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_A22__EIM_ADDR22	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_A23__EIM_ADDR23	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
> -	MX6_PAD_EIM_OE__EIM_OE_B	| MUX_PAD_CTRL(NO_PAD_CTRL),
> -	MX6_PAD_EIM_RW__EIM_RW		| MUX_PAD_CTRL(NO_PAD_CTRL),
> -	MX6_PAD_EIM_CS0__EIM_CS0_B	| MUX_PAD_CTRL(NO_PAD_CTRL),
> +	IOMUX_PADS(PAD_EIM_D16__EIM_DATA16	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D17__EIM_DATA17	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D18__EIM_DATA18	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D19__EIM_DATA19	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D20__EIM_DATA20	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D21__EIM_DATA21	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D22__EIM_DATA22	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D23__EIM_DATA23	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D24__EIM_DATA24	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D25__EIM_DATA25	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D26__EIM_DATA26	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D27__EIM_DATA27	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D28__EIM_DATA28	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D29__EIM_DATA29	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D30__EIM_DATA30	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_D31__EIM_DATA31	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA0__EIM_AD00	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA1__EIM_AD01	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA2__EIM_AD02	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA3__EIM_AD03	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA4__EIM_AD04	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA5__EIM_AD05	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA6__EIM_AD06	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA7__EIM_AD07	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA8__EIM_AD08	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA9__EIM_AD09	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA10__EIM_AD10	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA11__EIM_AD11	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA12__EIM_AD12	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA13__EIM_AD13	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA14__EIM_AD14	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_DA15__EIM_AD15	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_A16__EIM_ADDR16	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_A17__EIM_ADDR17	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_A18__EIM_ADDR18	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_A19__EIM_ADDR19	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_A20__EIM_ADDR20	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_A21__EIM_ADDR21	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_A22__EIM_ADDR22	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_A23__EIM_ADDR23	| MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_OE__EIM_OE_B		| MUX_PAD_CTRL(NO_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_RW__EIM_RW		| MUX_PAD_CTRL(NO_PAD_CTRL)),
> +	IOMUX_PADS(PAD_EIM_CS0__EIM_CS0_B	| MUX_PAD_CTRL(NO_PAD_CTRL)),
>  };
>  
>  static void eimnor_cs_setup(void)
> @@ -260,7 +286,7 @@ static void eim_clk_setup(void)
>  
>  static void setup_iomux_eimnor(void)
>  {
> -	imx_iomux_v3_setup_multiple_pads(eimnor_pads, ARRAY_SIZE(eimnor_pads));
> +	SETUP_IOMUX_PADS(eimnor_pads);
>  
>  	gpio_direction_output(IMX_GPIO_NR(5, 4), 0);
>  
> @@ -269,27 +295,27 @@ static void setup_iomux_eimnor(void)
>  
>  static void setup_iomux_enet(void)
>  {
> -	imx_iomux_v3_setup_multiple_pads(enet_pads, ARRAY_SIZE(enet_pads));
> +	SETUP_IOMUX_PADS(enet_pads);
>  }
>  
>  static iomux_v3_cfg_t const usdhc3_pads[] = {
> -	MX6_PAD_SD3_CLK__SD3_CLK	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_SD3_CMD__SD3_CMD	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_SD3_DAT0__SD3_DATA0	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_SD3_DAT1__SD3_DATA1	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_SD3_DAT2__SD3_DATA2	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_SD3_DAT3__SD3_DATA3	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_SD3_DAT4__SD3_DATA4	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_SD3_DAT5__SD3_DATA5	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_SD3_DAT6__SD3_DATA6	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_SD3_DAT7__SD3_DATA7	| MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_GPIO_18__SD3_VSELECT | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -	MX6_PAD_NANDF_CS2__GPIO6_IO15   | MUX_PAD_CTRL(NO_PAD_CTRL),
> +	IOMUX_PADS(PAD_SD3_CLK__SD3_CLK		| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_SD3_CMD__SD3_CMD		| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_SD3_DAT4__SD3_DATA4	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_SD3_DAT5__SD3_DATA5	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_SD3_DAT6__SD3_DATA6	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_SD3_DAT7__SD3_DATA7	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_GPIO_18__SD3_VSELECT	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> +	IOMUX_PADS(PAD_NANDF_CS2__GPIO6_IO15	| MUX_PAD_CTRL(NO_PAD_CTRL)),
>  };
>  
>  static void setup_iomux_uart(void)
>  {
> -	imx_iomux_v3_setup_multiple_pads(uart4_pads, ARRAY_SIZE(uart4_pads));
> +	SETUP_IOMUX_PADS(uart4_pads);
>  }
>  
>  #ifdef CONFIG_FSL_ESDHC
> @@ -305,7 +331,7 @@ int board_mmc_getcd(struct mmc *mmc)
>  
>  int board_mmc_init(bd_t *bis)
>  {
> -	imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
> +	SETUP_IOMUX_PADS(usdhc3_pads);
>  
>  	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
>  	return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
> @@ -314,22 +340,22 @@ int board_mmc_init(bd_t *bis)
>  
>  #ifdef CONFIG_NAND_MXS
>  static iomux_v3_cfg_t gpmi_pads[] = {
> -	MX6_PAD_NANDF_CLE__NAND_CLE		| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_ALE__NAND_ALE		| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_WP_B__NAND_WP_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_RB0__NAND_READY_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL0),
> -	MX6_PAD_NANDF_CS0__NAND_CE0_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_SD4_CMD__NAND_RE_B		| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_SD4_CLK__NAND_WE_B		| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_D0__NAND_DATA00	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_D1__NAND_DATA01	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_D2__NAND_DATA02	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_D3__NAND_DATA03	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_D4__NAND_DATA04	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_D5__NAND_DATA05	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_D6__NAND_DATA06	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_NANDF_D7__NAND_DATA07	| MUX_PAD_CTRL(GPMI_PAD_CTRL2),
> -	MX6_PAD_SD4_DAT0__NAND_DQS		| MUX_PAD_CTRL(GPMI_PAD_CTRL1),
> +	IOMUX_PADS(PAD_NANDF_CLE__NAND_CLE	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_ALE__NAND_ALE	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_WP_B__NAND_WP_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_RB0__NAND_READY_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL0)),
> +	IOMUX_PADS(PAD_NANDF_CS0__NAND_CE0_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_SD4_CMD__NAND_RE_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_SD4_CLK__NAND_WE_B	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_D0__NAND_DATA00	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_D1__NAND_DATA01	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_D2__NAND_DATA02	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_D3__NAND_DATA03	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_D4__NAND_DATA04	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_D5__NAND_DATA05	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_D6__NAND_DATA06	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_NANDF_D7__NAND_DATA07	| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),
> +	IOMUX_PADS(PAD_SD4_DAT0__NAND_DQS	| MUX_PAD_CTRL(GPMI_PAD_CTRL1)),
>  };
>  
>  static void setup_gpmi_nand(void)
> @@ -337,7 +363,7 @@ static void setup_gpmi_nand(void)
>  	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
>  
>  	/* config gpmi nand iomux */
> -	imx_iomux_v3_setup_multiple_pads(gpmi_pads, ARRAY_SIZE(gpmi_pads));
> +	SETUP_IOMUX_PADS(gpmi_pads);
>  
>  	setup_gpmi_io_clk((MXC_CCM_CS2CDR_ENFC_CLK_PODF(0) |
>  			MXC_CCM_CS2CDR_ENFC_CLK_PRED(3) |
> @@ -465,14 +491,13 @@ struct display_info_t const displays[] = {{
>  size_t display_count = ARRAY_SIZE(displays);
>  
>  iomux_v3_cfg_t const backlight_pads[] = {
> -	MX6_PAD_SD4_DAT1__GPIO2_IO09 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> +	IOMUX_PADS(PAD_SD4_DAT1__GPIO2_IO09 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
>  };
>  
>  static void setup_iomux_backlight(void)
>  {
>  	gpio_direction_output(IMX_GPIO_NR(2, 9), 1);
> -	imx_iomux_v3_setup_multiple_pads(backlight_pads,
> -					 ARRAY_SIZE(backlight_pads));
> +	SETUP_IOMUX_PADS(backlight_pads);
>  }
>  
>  static void setup_display(void)
> @@ -557,15 +582,21 @@ int board_init(void)
>  	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
>  
>  	/* I2C 2 and 3 setup - I2C 3 hw mux with EIM */
> -	setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
> +	if (is_mx6dq() || is_mx6dqp())
> +		setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c_pad_info1);
> +	else
> +		setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info1);
>  	/* I2C 3 Steer */
>  	gpio_direction_output(IMX_GPIO_NR(5, 4), 1);
> -	imx_iomux_v3_setup_multiple_pads(i2c3_pads, ARRAY_SIZE(i2c3_pads));
> +	SETUP_IOMUX_PADS(i2c3_pads);
>  #ifndef CONFIG_SYS_FLASH_CFI
> -	setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info2);
> +	if (is_mx6dq() || is_mx6dqp())
> +		setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c_pad_info2);
> +	else
> +		setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info2);
>  #endif
>  	gpio_direction_output(IMX_GPIO_NR(1, 15), 1);
> -	imx_iomux_v3_setup_multiple_pads(port_exp, ARRAY_SIZE(port_exp));
> +	SETUP_IOMUX_PADS(port_exp);
>  
>  #ifdef CONFIG_VIDEO_IPUV3
>  	setup_display();
> @@ -654,15 +685,14 @@ int checkboard(void)
>  #define USB_OTG_PWR       PORTEXP_IO_NR(0x34, 1)
>  
>  iomux_v3_cfg_t const usb_otg_pads[] = {
> -	MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL),
> +	IOMUX_PADS(PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL)),
>  };
>  
>  int board_ehci_hcd_init(int port)
>  {
>  	switch (port) {
>  	case 0:
> -		imx_iomux_v3_setup_multiple_pads(usb_otg_pads,
> -			ARRAY_SIZE(usb_otg_pads));
> +		SETUP_IOMUX_PADS(usb_otg_pads);
>  
>  		/*
>  		  * Set daisy chain for otg_pin_id on 6q.
> @@ -702,3 +732,381 @@ int board_ehci_power(int port, int on)
>  	return 0;
>  }
>  #endif
> +
> +#ifdef CONFIG_SPL_BUILD
> +#include <asm/arch/mx6-ddr.h>
> +#include <spl.h>
> +#include <libfdt.h>
> +
> +static void ccgr_init(void)
> +{
> +	struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
> +
> +	writel(0x00C03F3F, &ccm->CCGR0);
> +	writel(0x0030FC03, &ccm->CCGR1);
> +	writel(0x0FFFC000, &ccm->CCGR2);
> +	writel(0x3FF00000, &ccm->CCGR3);
> +	writel(0x00FFF300, &ccm->CCGR4);
> +	writel(0x0F0000C3, &ccm->CCGR5);
> +	writel(0x000003FF, &ccm->CCGR6);
> +}
> +
> +static void gpr_init(void)
> +{
> +	struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
> +
> +	/* enable AXI cache for VDOA/VPU/IPU */
> +	writel(0xF00000CF, &iomux->gpr[4]);
> +	if (is_mx6dqp()) {
> +		/* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */
> +		writel(0x007F007F, &iomux->gpr[6]);
> +		writel(0x007F007F, &iomux->gpr[7]);
> +	} else {
> +		/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
> +		writel(0x007F007F, &iomux->gpr[6]);
> +		writel(0x007F007F, &iomux->gpr[7]);
> +	}
> +}
> +
> +static int mx6q_dcd_table[] = {
> +	0x020e0798, 0x000C0000,
> +	0x020e0758, 0x00000000,
> +	0x020e0588, 0x00000030,
> +	0x020e0594, 0x00000030,
> +	0x020e056c, 0x00000030,
> +	0x020e0578, 0x00000030,
> +	0x020e074c, 0x00000030,
> +	0x020e057c, 0x00000030,
> +	0x020e058c, 0x00000000,
> +	0x020e059c, 0x00000030,
> +	0x020e05a0, 0x00000030,
> +	0x020e078c, 0x00000030,
> +	0x020e0750, 0x00020000,
> +	0x020e05a8, 0x00000028,
> +	0x020e05b0, 0x00000028,
> +	0x020e0524, 0x00000028,
> +	0x020e051c, 0x00000028,
> +	0x020e0518, 0x00000028,
> +	0x020e050c, 0x00000028,
> +	0x020e05b8, 0x00000028,
> +	0x020e05c0, 0x00000028,
> +	0x020e0774, 0x00020000,
> +	0x020e0784, 0x00000028,
> +	0x020e0788, 0x00000028,
> +	0x020e0794, 0x00000028,
> +	0x020e079c, 0x00000028,
> +	0x020e07a0, 0x00000028,
> +	0x020e07a4, 0x00000028,
> +	0x020e07a8, 0x00000028,
> +	0x020e0748, 0x00000028,
> +	0x020e05ac, 0x00000028,
> +	0x020e05b4, 0x00000028,
> +	0x020e0528, 0x00000028,
> +	0x020e0520, 0x00000028,
> +	0x020e0514, 0x00000028,
> +	0x020e0510, 0x00000028,
> +	0x020e05bc, 0x00000028,
> +	0x020e05c4, 0x00000028,
> +	0x021b0800, 0xa1390003,
> +	0x021b080c, 0x001F001F,
> +	0x021b0810, 0x001F001F,
> +	0x021b480c, 0x001F001F,
> +	0x021b4810, 0x001F001F,
> +	0x021b083c, 0x43260335,
> +	0x021b0840, 0x031A030B,
> +	0x021b483c, 0x4323033B,
> +	0x021b4840, 0x0323026F,
> +	0x021b0848, 0x483D4545,
> +	0x021b4848, 0x44433E48,
> +	0x021b0850, 0x41444840,
> +	0x021b4850, 0x4835483E,
> +	0x021b081c, 0x33333333,
> +	0x021b0820, 0x33333333,
> +	0x021b0824, 0x33333333,
> +	0x021b0828, 0x33333333,
> +	0x021b481c, 0x33333333,
> +	0x021b4820, 0x33333333,
> +	0x021b4824, 0x33333333,
> +	0x021b4828, 0x33333333,
> +	0x021b08b8, 0x00000800,
> +	0x021b48b8, 0x00000800,
> +	0x021b0004, 0x00020036,
> +	0x021b0008, 0x09444040,
> +	0x021b000c, 0x8A8F7955,
> +	0x021b0010, 0xFF328F64,
> +	0x021b0014, 0x01FF00DB,
> +	0x021b0018, 0x00001740,
> +	0x021b001c, 0x00008000,
> +	0x021b002c, 0x000026d2,
> +	0x021b0030, 0x008F1023,
> +	0x021b0040, 0x00000047,
> +	0x021b0000, 0x841A0000,
> +	0x021b001c, 0x04088032,
> +	0x021b001c, 0x00008033,
> +	0x021b001c, 0x00048031,
> +	0x021b001c, 0x09408030,
> +	0x021b001c, 0x04008040,
> +	0x021b0020, 0x00005800,
> +	0x021b0818, 0x00011117,
> +	0x021b4818, 0x00011117,
> +	0x021b0004, 0x00025576,
> +	0x021b0404, 0x00011006,
> +	0x021b001c, 0x00000000,
> +	0x020c4068, 0x00C03F3F,
> +	0x020c406c, 0x0030FC03,
> +	0x020c4070, 0x0FFFC000,
> +	0x020c4074, 0x3FF00000,
> +	0x020c4078, 0xFFFFF300,
> +	0x020c407c, 0x0F0000F3,
> +	0x020c4080, 0x00000FFF,
> +	0x020e0010, 0xF00000CF,
> +	0x020e0018, 0x007F007F,
> +	0x020e001c, 0x007F007F,
> +};
> +
> +static int mx6qp_dcd_table[] = {
> +	0x020e0798, 0x000C0000,
> +	0x020e0758, 0x00000000,
> +	0x020e0588, 0x00000030,
> +	0x020e0594, 0x00000030,
> +	0x020e056c, 0x00000030,
> +	0x020e0578, 0x00000030,
> +	0x020e074c, 0x00000030,
> +	0x020e057c, 0x00000030,
> +	0x020e058c, 0x00000000,
> +	0x020e059c, 0x00000030,
> +	0x020e05a0, 0x00000030,
> +	0x020e078c, 0x00000030,
> +	0x020e0750, 0x00020000,
> +	0x020e05a8, 0x00000030,
> +	0x020e05b0, 0x00000030,
> +	0x020e0524, 0x00000030,
> +	0x020e051c, 0x00000030,
> +	0x020e0518, 0x00000030,
> +	0x020e050c, 0x00000030,
> +	0x020e05b8, 0x00000030,
> +	0x020e05c0, 0x00000030,
> +	0x020e0774, 0x00020000,
> +	0x020e0784, 0x00000030,
> +	0x020e0788, 0x00000030,
> +	0x020e0794, 0x00000030,
> +	0x020e079c, 0x00000030,
> +	0x020e07a0, 0x00000030,
> +	0x020e07a4, 0x00000030,
> +	0x020e07a8, 0x00000030,
> +	0x020e0748, 0x00000030,
> +	0x020e05ac, 0x00000030,
> +	0x020e05b4, 0x00000030,
> +	0x020e0528, 0x00000030,
> +	0x020e0520, 0x00000030,
> +	0x020e0514, 0x00000030,
> +	0x020e0510, 0x00000030,
> +	0x020e05bc, 0x00000030,
> +	0x020e05c4, 0x00000030,
> +	0x021b0800, 0xa1390003,
> +	0x021b080c, 0x001b001e,
> +	0x021b0810, 0x002e0029,
> +	0x021b480c, 0x001b002a,
> +	0x021b4810, 0x0019002c,
> +	0x021b083c, 0x43240334,
> +	0x021b0840, 0x0324031a,
> +	0x021b483c, 0x43340344,
> +	0x021b4840, 0x03280276,
> +	0x021b0848, 0x44383A3E,
> +	0x021b4848, 0x3C3C3846,
> +	0x021b0850, 0x2e303230,
> +	0x021b4850, 0x38283E34,
> +	0x021b081c, 0x33333333,
> +	0x021b0820, 0x33333333,
> +	0x021b0824, 0x33333333,
> +	0x021b0828, 0x33333333,
> +	0x021b481c, 0x33333333,
> +	0x021b4820, 0x33333333,
> +	0x021b4824, 0x33333333,
> +	0x021b4828, 0x33333333,
> +	0x021b08c0, 0x24912492,
> +	0x021b48c0, 0x24912492,
> +	0x021b08b8, 0x00000800,
> +	0x021b48b8, 0x00000800,
> +	0x021b0004, 0x00020036,
> +	0x021b0008, 0x09444040,
> +	0x021b000c, 0x898E7955,
> +	0x021b0010, 0xFF328F64,
> +	0x021b0014, 0x01FF00DB,
> +	0x021b0018, 0x00001740,
> +	0x021b001c, 0x00008000,
> +	0x021b002c, 0x000026d2,
> +	0x021b0030, 0x008E1023,
> +	0x021b0040, 0x00000047,
> +	0x021b0400, 0x14420000,
> +	0x021b0000, 0x841A0000,
> +	0x00bb0008, 0x00000004,
> +	0x00bb000c, 0x2891E41A,
> +	0x00bb0038, 0x00000564,
> +	0x00bb0014, 0x00000040,
> +	0x00bb0028, 0x00000020,
> +	0x00bb002c, 0x00000020,
> +	0x021b001c, 0x04088032,
> +	0x021b001c, 0x00008033,
> +	0x021b001c, 0x00048031,
> +	0x021b001c, 0x09408030,
> +	0x021b001c, 0x04008040,
> +	0x021b0020, 0x00005800,
> +	0x021b0818, 0x00011117,
> +	0x021b4818, 0x00011117,
> +	0x021b0004, 0x00025576,
> +	0x021b0404, 0x00011006,
> +	0x021b001c, 0x00000000,
> +	0x020c4068, 0x00C03F3F,
> +	0x020c406c, 0x0030FC03,
> +	0x020c4070, 0x0FFFC000,
> +	0x020c4074, 0x3FF00000,
> +	0x020c4078, 0xFFFFF300,
> +	0x020c407c, 0x0F0000F3,
> +	0x020c4080, 0x00000FFF,
> +	0x020e0010, 0xF00000CF,
> +	0x020e0018, 0x77177717,
> +	0x020e001c, 0x77177717,
> +};
> +
> +static int mx6dl_dcd_table[] = {
> +	0x020e0774, 0x000C0000,
> +	0x020e0754, 0x00000000,
> +	0x020e04ac, 0x00000030,
> +	0x020e04b0, 0x00000030,
> +	0x020e0464, 0x00000030,
> +	0x020e0490, 0x00000030,
> +	0x020e074c, 0x00000030,
> +	0x020e0494, 0x00000030,
> +	0x020e04a0, 0x00000000,
> +	0x020e04b4, 0x00000030,
> +	0x020e04b8, 0x00000030,
> +	0x020e076c, 0x00000030,
> +	0x020e0750, 0x00020000,
> +	0x020e04bc, 0x00000028,
> +	0x020e04c0, 0x00000028,
> +	0x020e04c4, 0x00000028,
> +	0x020e04c8, 0x00000028,
> +	0x020e04cc, 0x00000028,
> +	0x020e04d0, 0x00000028,
> +	0x020e04d4, 0x00000028,
> +	0x020e04d8, 0x00000028,
> +	0x020e0760, 0x00020000,
> +	0x020e0764, 0x00000028,
> +	0x020e0770, 0x00000028,
> +	0x020e0778, 0x00000028,
> +	0x020e077c, 0x00000028,
> +	0x020e0780, 0x00000028,
> +	0x020e0784, 0x00000028,
> +	0x020e078c, 0x00000028,
> +	0x020e0748, 0x00000028,
> +	0x020e0470, 0x00000028,
> +	0x020e0474, 0x00000028,
> +	0x020e0478, 0x00000028,
> +	0x020e047c, 0x00000028,
> +	0x020e0480, 0x00000028,
> +	0x020e0484, 0x00000028,
> +	0x020e0488, 0x00000028,
> +	0x020e048c, 0x00000028,
> +	0x021b0800, 0xa1390003,
> +	0x021b080c, 0x001F001F,
> +	0x021b0810, 0x001F001F,
> +	0x021b480c, 0x001F001F,
> +	0x021b4810, 0x001F001F,
> +	0x021b083c, 0x42190217,
> +	0x021b0840, 0x017B017B,
> +	0x021b483c, 0x4176017B,
> +	0x021b4840, 0x015F016C,
> +	0x021b0848, 0x4C4C4D4C,
> +	0x021b4848, 0x4A4D4C48,
> +	0x021b0850, 0x3F3F3F40,
> +	0x021b4850, 0x3538382E,
> +	0x021b081c, 0x33333333,
> +	0x021b0820, 0x33333333,
> +	0x021b0824, 0x33333333,
> +	0x021b0828, 0x33333333,
> +	0x021b481c, 0x33333333,
> +	0x021b4820, 0x33333333,
> +	0x021b4824, 0x33333333,
> +	0x021b4828, 0x33333333,
> +	0x021b08b8, 0x00000800,
> +	0x021b48b8, 0x00000800,
> +	0x021b0004, 0x00020025,
> +	0x021b0008, 0x00333030,
> +	0x021b000c, 0x676B5313,
> +	0x021b0010, 0xB66E8B63,
> +	0x021b0014, 0x01FF00DB,
> +	0x021b0018, 0x00001740,
> +	0x021b001c, 0x00008000,
> +	0x021b002c, 0x000026d2,
> +	0x021b0030, 0x006B1023,
> +	0x021b0040, 0x00000047,
> +	0x021b0000, 0x841A0000,
> +	0x021b001c, 0x04008032,
> +	0x021b001c, 0x00008033,
> +	0x021b001c, 0x00048031,
> +	0x021b001c, 0x05208030,
> +	0x021b001c, 0x04008040,
> +	0x021b0020, 0x00005800,
> +	0x021b0818, 0x00011117,
> +	0x021b4818, 0x00011117,
> +	0x021b0004, 0x00025565,
> +	0x021b0404, 0x00011006,
> +	0x021b001c, 0x00000000,
> +	0x020c4068, 0x00C03F3F,
> +	0x020c406c, 0x0030FC03,
> +	0x020c4070, 0x0FFFC000,
> +	0x020c4074, 0x3FF00000,
> +	0x020c4078, 0xFFFFF300,
> +	0x020c407c, 0x0F0000C3,
> +	0x020c4080, 0x00000FFF,
> +	0x020e0010, 0xF00000CF,
> +	0x020e0018, 0x007F007F,
> +	0x020e001c, 0x007F007F,
> +};
> +
> +static void ddr_init(int *table, int size)
> +{
> +	int i;
> +
> +	for (i = 0; i < size / 2 ; i++)
> +		writel(table[2 * i + 1], table[2 * i]);
> +}
> +
> +static void spl_dram_init(void)
> +{
> +	if (is_mx6dq())
> +		ddr_init(mx6q_dcd_table, ARRAY_SIZE(mx6q_dcd_table));
> +	else if (is_mx6dqp())
> +		ddr_init(mx6qp_dcd_table, ARRAY_SIZE(mx6qp_dcd_table));
> +	else if (is_mx6sdl())
> +		ddr_init(mx6dl_dcd_table, ARRAY_SIZE(mx6dl_dcd_table));
> +}
> +
> +void board_init_f(ulong dummy)
> +{
> +	/* DDR initialization */
> +	spl_dram_init();
> +
> +	/* setup AIPS and disable watchdog */
> +	arch_cpu_init();
> +
> +	ccgr_init();
> +	gpr_init();
> +
> +	/* iomux and setup of i2c */
> +	board_early_init_f();
> +
> +	/* setup GP timer */
> +	timer_init();
> +
> +	/* UART clocks enabled and gd valid - init serial console */
> +	preloader_console_init();
> +
> +	/* Clear the BSS. */
> +	memset(__bss_start, 0, __bss_end - __bss_start);
> +
> +	/* load/boot image from boot device */
> +	board_init_r(NULL, 0);
> +}
> +#endif
> diff --git a/configs/mx6qsabreauto_spl_defconfig b/configs/mx6qsabreauto_spl_defconfig
> new file mode 100644
> index 0000000..ce2d1d2
> --- /dev/null
> +++ b/configs/mx6qsabreauto_spl_defconfig
> @@ -0,0 +1,53 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_MX6=y
> +CONFIG_SPL_GPIO_SUPPORT=y
> +CONFIG_SPL_LIBCOMMON_SUPPORT=y
> +CONFIG_SPL_LIBGENERIC_SUPPORT=y
> +CONFIG_TARGET_MX6QSABREAUTO=y
> +CONFIG_SPL_MMC_SUPPORT=y
> +CONFIG_SPL_SERIAL_SUPPORT=y
> +CONFIG_SPL_LIBDISK_SUPPORT=y
> +CONFIG_SPL_WATCHDOG_SUPPORT=y
> +CONFIG_VIDEO=y
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
> +CONFIG_BOOTDELAY=3
> +# CONFIG_CONSOLE_MUX is not set
> +CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> +CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> +CONFIG_SPL=y
> +CONFIG_SPL_EXT_SUPPORT=y
> +CONFIG_SPL_I2C_SUPPORT=y
> +CONFIG_HUSH_PARSER=y
> +CONFIG_CMD_BOOTZ=y
> +# CONFIG_CMD_IMLS is not set
> +# CONFIG_CMD_FLASH is not set
> +CONFIG_CMD_MMC=y
> +CONFIG_CMD_SF=y
> +CONFIG_CMD_I2C=y
> +CONFIG_CMD_USB=y
> +CONFIG_CMD_DFU=y
> +CONFIG_CMD_GPIO=y
> +CONFIG_CMD_DHCP=y
> +CONFIG_CMD_MII=y
> +CONFIG_CMD_PING=y
> +CONFIG_CMD_CACHE=y
> +CONFIG_CMD_EXT2=y
> +CONFIG_CMD_EXT4=y
> +CONFIG_CMD_EXT4_WRITE=y
> +CONFIG_CMD_FAT=y
> +CONFIG_CMD_FS_GENERIC=y
> +CONFIG_DFU_MMC=y
> +CONFIG_DFU_SF=y
> +CONFIG_MTD_NOR_FLASH=y
> +CONFIG_SPI_FLASH=y
> +CONFIG_SPI_FLASH_STMICRO=y
> +CONFIG_USB=y
> +CONFIG_USB_STORAGE=y
> +CONFIG_USB_GADGET=y
> +CONFIG_CI_UDC=y
> +CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_G_DNL_MANUFACTURER="FSL"
> +CONFIG_G_DNL_VENDOR_NUM=0x0525
> +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +# CONFIG_VIDEO_SW_CURSOR is not set
> +CONFIG_OF_LIBFDT=y
> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
> index 635c04a..99b48ca 100644
> --- a/include/configs/mx6qsabreauto.h
> +++ b/include/configs/mx6qsabreauto.h
> @@ -9,6 +9,10 @@
>  #ifndef __MX6QSABREAUTO_CONFIG_H
>  #define __MX6QSABREAUTO_CONFIG_H
>  
> +#ifdef CONFIG_SPL
> +#include "imx6_spl.h"
> +#endif
> +
>  #define CONFIG_MACH_TYPE	3529
>  #define CONFIG_MXC_UART_BASE	UART4_BASE
>  #define CONSOLE_DEV		"ttymxc3"
> 

It looks ok to me.

Reviewed-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode
  2017-06-29 12:33 ` [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode Vanessa Maegima
  2017-06-29 19:37   ` Fabio Estevam
@ 2017-06-30  8:54   ` Stefano Babic
  2017-07-05 10:05   ` Stefano Babic
  2 siblings, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2017-06-30  8:54 UTC (permalink / raw)
  To: u-boot

On 29/06/2017 14:33, Vanessa Maegima wrote:
> As mx6sabreauto supports SPL now, all variants can boot using the same
> defconfig.
> 
> This patch:
> - Removes non-SPL targets.
> - Renames target to mx6sabreauto_defconfig.
> - Renames folder and board files to mx6sabreauto.
> - Updates MAINTAINERS, Makefile and Kconfig accordingly.
> - Removes .cfg files.
> - Adds a README with instructions to build and flash SPL and u-boot.img.
> 
> Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
> ---
>  arch/arm/cpu/armv7/mx6/Kconfig                     |   6 +-
>  board/freescale/mx6qsabreauto/MAINTAINERS          |   9 --
>  board/freescale/mx6qsabreauto/imximage.cfg         | 129 ------------------
>  board/freescale/mx6qsabreauto/mx6dl.cfg            | 130 ------------------
>  board/freescale/mx6qsabreauto/mx6qp.cfg            | 145 ---------------------
>  .../{mx6qsabreauto => mx6sabreauto}/Kconfig        |   6 +-
>  board/freescale/mx6sabreauto/MAINTAINERS           |   7 +
>  .../{mx6qsabreauto => mx6sabreauto}/Makefile       |   2 +-
>  board/freescale/mx6sabreauto/README                |  20 +++
>  .../mx6sabreauto.c}                                |   0
>  configs/mx6dlsabreauto_defconfig                   |  44 -------
>  configs/mx6qpsabreauto_defconfig                   |  43 ------
>  configs/mx6qsabreauto_defconfig                    |  44 -------
>  ...reauto_spl_defconfig => mx6sabreauto_defconfig} |   2 +-
>  .../configs/{mx6qsabreauto.h => mx6sabreauto.h}    |   6 +-
>  15 files changed, 38 insertions(+), 555 deletions(-)
>  delete mode 100644 board/freescale/mx6qsabreauto/MAINTAINERS
>  delete mode 100644 board/freescale/mx6qsabreauto/imximage.cfg
>  delete mode 100644 board/freescale/mx6qsabreauto/mx6dl.cfg
>  delete mode 100644 board/freescale/mx6qsabreauto/mx6qp.cfg
>  rename board/freescale/{mx6qsabreauto => mx6sabreauto}/Kconfig (54%)
>  create mode 100644 board/freescale/mx6sabreauto/MAINTAINERS
>  rename board/freescale/{mx6qsabreauto => mx6sabreauto}/Makefile (85%)
>  create mode 100644 board/freescale/mx6sabreauto/README
>  rename board/freescale/{mx6qsabreauto/mx6qsabreauto.c => mx6sabreauto/mx6sabreauto.c} (100%)
>  delete mode 100644 configs/mx6dlsabreauto_defconfig
>  delete mode 100644 configs/mx6qpsabreauto_defconfig
>  delete mode 100644 configs/mx6qsabreauto_defconfig
>  rename configs/{mx6qsabreauto_spl_defconfig => mx6sabreauto_defconfig} (97%)
>  rename include/configs/{mx6qsabreauto.h => mx6sabreauto.h} (94%)
> 
> diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
> index 0d500aa..4a38dc2 100644
> --- a/arch/arm/cpu/armv7/mx6/Kconfig
> +++ b/arch/arm/cpu/armv7/mx6/Kconfig
> @@ -202,8 +202,8 @@ config TARGET_MX6Q_ICORE_RQS
>  	select SUPPORT_SPL
>  	select SPL_LOAD_FIT
>  
> -config TARGET_MX6QSABREAUTO
> -	bool "mx6qsabreauto"
> +config TARGET_MX6SABREAUTO
> +	bool "mx6sabreauto"
>  	select BOARD_LATE_INIT
>  	select SUPPORT_SPL
>  	select DM
> @@ -413,7 +413,7 @@ source "board/engicam/icorem6/Kconfig"
>  source "board/engicam/icorem6_rqs/Kconfig"
>  source "board/engicam/isiotmx6ul/Kconfig"
>  source "board/freescale/mx6qarm2/Kconfig"
> -source "board/freescale/mx6qsabreauto/Kconfig"
> +source "board/freescale/mx6sabreauto/Kconfig"
>  source "board/freescale/mx6sabresd/Kconfig"
>  source "board/freescale/mx6slevk/Kconfig"
>  source "board/freescale/mx6sllevk/Kconfig"
> diff --git a/board/freescale/mx6qsabreauto/MAINTAINERS b/board/freescale/mx6qsabreauto/MAINTAINERS
> deleted file mode 100644
> index f148dac..0000000
> --- a/board/freescale/mx6qsabreauto/MAINTAINERS
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -MX6QSABREAUTO BOARD
> -M:	Fabio Estevam <fabio.estevam@nxp.com>
> -M:	Peng Fan <peng.fan@nxp.com>
> -S:	Maintained
> -F:	board/freescale/mx6qsabreauto/
> -F:	include/configs/mx6qsabreauto.h
> -F:	configs/mx6dlsabreauto_defconfig
> -F:	configs/mx6qsabreauto_defconfig
> -F:	configs/mx6qpsabreauto_defconfig
> diff --git a/board/freescale/mx6qsabreauto/imximage.cfg b/board/freescale/mx6qsabreauto/imximage.cfg
> deleted file mode 100644
> index 16bf473..0000000
> --- a/board/freescale/mx6qsabreauto/imximage.cfg
> +++ /dev/null
> @@ -1,129 +0,0 @@
> -/*
> - * Copyright (C) 2012 Freescale Semiconductor, Inc.
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - *
> - * Refer doc/README.imximage for more details about how-to configure
> - * and create imximage boot image
> - *
> - * The syntax is taken as close as possible with the kwbimage
> - */
> -/* image version */
> -
> -IMAGE_VERSION 2
> -
> -/*
> - * Boot Device : one of
> - * spi, sd (the board has no nand neither onenand)
> - */
> -BOOT_FROM	sd
> -
> -/*
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type           Address        Value
> - *
> - * where:
> - *	Addr-type register length (1,2 or 4 bytes)
> - *	Address	  absolute address of the register
> - *	value	  value to be stored in the register
> - */
> -DATA 4 0x020e0798 0x000C0000
> -DATA 4 0x020e0758 0x00000000
> -DATA 4 0x020e0588 0x00000030
> -DATA 4 0x020e0594 0x00000030
> -DATA 4 0x020e056c 0x00000030
> -DATA 4 0x020e0578 0x00000030
> -DATA 4 0x020e074c 0x00000030
> -DATA 4 0x020e057c 0x00000030
> -DATA 4 0x020e058c 0x00000000
> -DATA 4 0x020e059c 0x00000030
> -DATA 4 0x020e05a0 0x00000030
> -DATA 4 0x020e078c 0x00000030
> -DATA 4 0x020e0750 0x00020000
> -DATA 4 0x020e05a8 0x00000028
> -DATA 4 0x020e05b0 0x00000028
> -DATA 4 0x020e0524 0x00000028
> -DATA 4 0x020e051c 0x00000028
> -DATA 4 0x020e0518 0x00000028
> -DATA 4 0x020e050c 0x00000028
> -DATA 4 0x020e05b8 0x00000028
> -DATA 4 0x020e05c0 0x00000028
> -DATA 4 0x020e0774 0x00020000
> -DATA 4 0x020e0784 0x00000028
> -DATA 4 0x020e0788 0x00000028
> -DATA 4 0x020e0794 0x00000028
> -DATA 4 0x020e079c 0x00000028
> -DATA 4 0x020e07a0 0x00000028
> -DATA 4 0x020e07a4 0x00000028
> -DATA 4 0x020e07a8 0x00000028
> -DATA 4 0x020e0748 0x00000028
> -DATA 4 0x020e05ac 0x00000028
> -DATA 4 0x020e05b4 0x00000028
> -DATA 4 0x020e0528 0x00000028
> -DATA 4 0x020e0520 0x00000028
> -DATA 4 0x020e0514 0x00000028
> -DATA 4 0x020e0510 0x00000028
> -DATA 4 0x020e05bc 0x00000028
> -DATA 4 0x020e05c4 0x00000028
> -DATA 4 0x021b0800 0xa1390003
> -DATA 4 0x021b080c 0x001F001F
> -DATA 4 0x021b0810 0x001F001F
> -DATA 4 0x021b480c 0x001F001F
> -DATA 4 0x021b4810 0x001F001F
> -DATA 4 0x021b083c 0x43260335
> -DATA 4 0x021b0840 0x031A030B
> -DATA 4 0x021b483c 0x4323033B
> -DATA 4 0x021b4840 0x0323026F
> -DATA 4 0x021b0848 0x483D4545
> -DATA 4 0x021b4848 0x44433E48
> -DATA 4 0x021b0850 0x41444840
> -DATA 4 0x021b4850 0x4835483E
> -DATA 4 0x021b081c 0x33333333
> -DATA 4 0x021b0820 0x33333333
> -DATA 4 0x021b0824 0x33333333
> -DATA 4 0x021b0828 0x33333333
> -DATA 4 0x021b481c 0x33333333
> -DATA 4 0x021b4820 0x33333333
> -DATA 4 0x021b4824 0x33333333
> -DATA 4 0x021b4828 0x33333333
> -DATA 4 0x021b08b8 0x00000800
> -DATA 4 0x021b48b8 0x00000800
> -DATA 4 0x021b0004 0x00020036
> -DATA 4 0x021b0008 0x09444040
> -DATA 4 0x021b000c 0x8A8F7955
> -DATA 4 0x021b0010 0xFF328F64
> -DATA 4 0x021b0014 0x01FF00DB
> -DATA 4 0x021b0018 0x00001740
> -DATA 4 0x021b001c 0x00008000
> -DATA 4 0x021b002c 0x000026d2
> -DATA 4 0x021b0030 0x008F1023
> -DATA 4 0x021b0040 0x00000047
> -DATA 4 0x021b0000 0x841A0000
> -DATA 4 0x021b001c 0x04088032
> -DATA 4 0x021b001c 0x00008033
> -DATA 4 0x021b001c 0x00048031
> -DATA 4 0x021b001c 0x09408030
> -DATA 4 0x021b001c 0x04008040
> -DATA 4 0x021b0020 0x00005800
> -DATA 4 0x021b0818 0x00011117
> -DATA 4 0x021b4818 0x00011117
> -DATA 4 0x021b0004 0x00025576
> -DATA 4 0x021b0404 0x00011006
> -DATA 4 0x021b001c 0x00000000
> -
> -/* set the default clock gate to save power */
> -DATA 4 0x020c4068 0x00C03F3F
> -DATA 4 0x020c406c 0x0030FC03
> -DATA 4 0x020c4070 0x0FFFC000
> -DATA 4 0x020c4074 0x3FF00000
> -DATA 4 0x020c4078 0xFFFFF300
> -DATA 4 0x020c407c 0x0F0000F3
> -DATA 4 0x020c4080 0x00000FFF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4 0x020e0010 0xF00000CF
> -/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
> -DATA 4 0x020e0018 0x007F007F
> -DATA 4 0x020e001c 0x007F007F
> diff --git a/board/freescale/mx6qsabreauto/mx6dl.cfg b/board/freescale/mx6qsabreauto/mx6dl.cfg
> deleted file mode 100644
> index 89078e5..0000000
> --- a/board/freescale/mx6qsabreauto/mx6dl.cfg
> +++ /dev/null
> @@ -1,130 +0,0 @@
> -/*
> - * Copyright (C) 2013 Freescale Semiconductor, Inc.
> - * Jason Liu <r64343@freescale.com>
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - *
> - * Refer doc/README.imximage for more details about how-to configure
> - * and create imximage boot image
> - *
> - * The syntax is taken as close as possible with the kwbimage
> - */
> -/* image version */
> -
> -IMAGE_VERSION 2
> -
> -/*
> - * Boot Device : one of
> - * spi, sd (the board has no nand neither onenand)
> - */
> -BOOT_FROM	sd
> -
> -/*
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type           Address        Value
> - *
> - * where:
> - *	Addr-type register length (1,2 or 4 bytes)
> - *	Address	  absolute address of the register
> - *	value	  value to be stored in the register
> - */
> -DATA 4 0x020e0774 0x000C0000
> -DATA 4 0x020e0754 0x00000000
> -DATA 4 0x020e04ac 0x00000030
> -DATA 4 0x020e04b0 0x00000030
> -DATA 4 0x020e0464 0x00000030
> -DATA 4 0x020e0490 0x00000030
> -DATA 4 0x020e074c 0x00000030
> -DATA 4 0x020e0494 0x00000030
> -DATA 4 0x020e04a0 0x00000000
> -DATA 4 0x020e04b4 0x00000030
> -DATA 4 0x020e04b8 0x00000030
> -DATA 4 0x020e076c 0x00000030
> -DATA 4 0x020e0750 0x00020000
> -DATA 4 0x020e04bc 0x00000028
> -DATA 4 0x020e04c0 0x00000028
> -DATA 4 0x020e04c4 0x00000028
> -DATA 4 0x020e04c8 0x00000028
> -DATA 4 0x020e04cc 0x00000028
> -DATA 4 0x020e04d0 0x00000028
> -DATA 4 0x020e04d4 0x00000028
> -DATA 4 0x020e04d8 0x00000028
> -DATA 4 0x020e0760 0x00020000
> -DATA 4 0x020e0764 0x00000028
> -DATA 4 0x020e0770 0x00000028
> -DATA 4 0x020e0778 0x00000028
> -DATA 4 0x020e077c 0x00000028
> -DATA 4 0x020e0780 0x00000028
> -DATA 4 0x020e0784 0x00000028
> -DATA 4 0x020e078c 0x00000028
> -DATA 4 0x020e0748 0x00000028
> -DATA 4 0x020e0470 0x00000028
> -DATA 4 0x020e0474 0x00000028
> -DATA 4 0x020e0478 0x00000028
> -DATA 4 0x020e047c 0x00000028
> -DATA 4 0x020e0480 0x00000028
> -DATA 4 0x020e0484 0x00000028
> -DATA 4 0x020e0488 0x00000028
> -DATA 4 0x020e048c 0x00000028
> -DATA 4 0x021b0800 0xa1390003
> -DATA 4 0x021b080c 0x001F001F
> -DATA 4 0x021b0810 0x001F001F
> -DATA 4 0x021b480c 0x001F001F
> -DATA 4 0x021b4810 0x001F001F
> -DATA 4 0x021b083c 0x42190217
> -DATA 4 0x021b0840 0x017B017B
> -DATA 4 0x021b483c 0x4176017B
> -DATA 4 0x021b4840 0x015F016C
> -DATA 4 0x021b0848 0x4C4C4D4C
> -DATA 4 0x021b4848 0x4A4D4C48
> -DATA 4 0x021b0850 0x3F3F3F40
> -DATA 4 0x021b4850 0x3538382E
> -DATA 4 0x021b081c 0x33333333
> -DATA 4 0x021b0820 0x33333333
> -DATA 4 0x021b0824 0x33333333
> -DATA 4 0x021b0828 0x33333333
> -DATA 4 0x021b481c 0x33333333
> -DATA 4 0x021b4820 0x33333333
> -DATA 4 0x021b4824 0x33333333
> -DATA 4 0x021b4828 0x33333333
> -DATA 4 0x021b08b8 0x00000800
> -DATA 4 0x021b48b8 0x00000800
> -DATA 4 0x021b0004 0x00020025
> -DATA 4 0x021b0008 0x00333030
> -DATA 4 0x021b000c 0x676B5313
> -DATA 4 0x021b0010 0xB66E8B63
> -DATA 4 0x021b0014 0x01FF00DB
> -DATA 4 0x021b0018 0x00001740
> -DATA 4 0x021b001c 0x00008000
> -DATA 4 0x021b002c 0x000026d2
> -DATA 4 0x021b0030 0x006B1023
> -DATA 4 0x021b0040 0x00000047
> -DATA 4 0x021b0000 0x841A0000
> -DATA 4 0x021b001c 0x04008032
> -DATA 4 0x021b001c 0x00008033
> -DATA 4 0x021b001c 0x00048031
> -DATA 4 0x021b001c 0x05208030
> -DATA 4 0x021b001c 0x04008040
> -DATA 4 0x021b0020 0x00005800
> -DATA 4 0x021b0818 0x00011117
> -DATA 4 0x021b4818 0x00011117
> -DATA 4 0x021b0004 0x00025565
> -DATA 4 0x021b0404 0x00011006
> -DATA 4 0x021b001c 0x00000000
> -
> -/* set the default clock gate to save power */
> -DATA 4 0x020c4068 0x00C03F3F
> -DATA 4 0x020c406c 0x0030FC03
> -DATA 4 0x020c4070 0x0FFFC000
> -DATA 4 0x020c4074 0x3FF00000
> -DATA 4 0x020c4078 0xFFFFF300
> -DATA 4 0x020c407c 0x0F0000C3
> -DATA 4 0x020c4080 0x00000FFF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4 0x020e0010 0xF00000CF
> -/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
> -DATA 4 0x020e0018 0x007F007F
> -DATA 4 0x020e001c 0x007F007F
> diff --git a/board/freescale/mx6qsabreauto/mx6qp.cfg b/board/freescale/mx6qsabreauto/mx6qp.cfg
> deleted file mode 100644
> index 2298c77..0000000
> --- a/board/freescale/mx6qsabreauto/mx6qp.cfg
> +++ /dev/null
> @@ -1,145 +0,0 @@
> -/*
> - * Copyright (C) 2015 Freescale Semiconductor, Inc.
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - *
> - * Refer doc/README.imximage for more details about how-to configure
> - * and create imximage boot image
> - *
> - * The syntax is taken as close as possible with the kwbimage
> - */
> -/* image version */
> -
> -#define __ASSEMBLY__
> -#include <config.h>
> -
> -IMAGE_VERSION 2
> -
> -/*
> - * Boot Device : one of spi, sd, eimnor, nand, sata:
> - * spinor: flash_offset: 0x0400
> - * nand:   flash_offset: 0x0400
> - * sata:   flash_offset: 0x0400
> - * sd/mmc: flash_offset: 0x0400
> - * eimnor: flash_offset: 0x1000
> - */
> -BOOT_FROM	sd
> -
> -/*
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type           Address        Value
> - *
> - * where:
> - *	Addr-type register length (1,2 or 4 bytes)
> - *	Address	  absolute address of the register
> - *	value	  value to be stored in the register
> - */
> -DATA 4 0x020e0798 0x000C0000
> -DATA 4 0x020e0758 0x00000000
> -DATA 4 0x020e0588 0x00000030
> -DATA 4 0x020e0594 0x00000030
> -DATA 4 0x020e056c 0x00000030
> -DATA 4 0x020e0578 0x00000030
> -DATA 4 0x020e074c 0x00000030
> -DATA 4 0x020e057c 0x00000030
> -DATA 4 0x020e058c 0x00000000
> -DATA 4 0x020e059c 0x00000030
> -DATA 4 0x020e05a0 0x00000030
> -DATA 4 0x020e078c 0x00000030
> -DATA 4 0x020e0750 0x00020000
> -DATA 4 0x020e05a8 0x00000030
> -DATA 4 0x020e05b0 0x00000030
> -DATA 4 0x020e0524 0x00000030
> -DATA 4 0x020e051c 0x00000030
> -DATA 4 0x020e0518 0x00000030
> -DATA 4 0x020e050c 0x00000030
> -DATA 4 0x020e05b8 0x00000030
> -DATA 4 0x020e05c0 0x00000030
> -DATA 4 0x020e0774 0x00020000
> -DATA 4 0x020e0784 0x00000030
> -DATA 4 0x020e0788 0x00000030
> -DATA 4 0x020e0794 0x00000030
> -DATA 4 0x020e079c 0x00000030
> -DATA 4 0x020e07a0 0x00000030
> -DATA 4 0x020e07a4 0x00000030
> -DATA 4 0x020e07a8 0x00000030
> -DATA 4 0x020e0748 0x00000030
> -DATA 4 0x020e05ac 0x00000030
> -DATA 4 0x020e05b4 0x00000030
> -DATA 4 0x020e0528 0x00000030
> -DATA 4 0x020e0520 0x00000030
> -DATA 4 0x020e0514 0x00000030
> -DATA 4 0x020e0510 0x00000030
> -DATA 4 0x020e05bc 0x00000030
> -DATA 4 0x020e05c4 0x00000030
> -DATA 4 0x021b0800 0xa1390003
> -DATA 4 0x021b080c 0x001b001e
> -DATA 4 0x021b0810 0x002e0029
> -DATA 4 0x021b480c 0x001b002a
> -DATA 4 0x021b4810 0x0019002c
> -DATA 4 0x021b083c 0x43240334
> -DATA 4 0x021b0840 0x0324031a
> -DATA 4 0x021b483c 0x43340344
> -DATA 4 0x021b4840 0x03280276
> -DATA 4 0x021b0848 0x44383A3E
> -DATA 4 0x021b4848 0x3C3C3846
> -DATA 4 0x021b0850 0x2e303230
> -DATA 4 0x021b4850 0x38283E34
> -DATA 4 0x021b081c 0x33333333
> -DATA 4 0x021b0820 0x33333333
> -DATA 4 0x021b0824 0x33333333
> -DATA 4 0x021b0828 0x33333333
> -DATA 4 0x021b481c 0x33333333
> -DATA 4 0x021b4820 0x33333333
> -DATA 4 0x021b4824 0x33333333
> -DATA 4 0x021b4828 0x33333333
> -DATA 4 0x021b08c0 0x24912492
> -DATA 4 0x021b48c0 0x24912492
> -DATA 4 0x021b08b8 0x00000800
> -DATA 4 0x021b48b8 0x00000800
> -DATA 4 0x021b0004 0x00020036
> -DATA 4 0x021b0008 0x09444040
> -DATA 4 0x021b000c 0x898E7955
> -DATA 4 0x021b0010 0xFF328F64
> -DATA 4 0x021b0014 0x01FF00DB
> -DATA 4 0x021b0018 0x00001740
> -DATA 4 0x021b001c 0x00008000
> -
> -DATA 4 0x021b002c 0x000026d2
> -DATA 4 0x021b0030 0x008E1023
> -DATA 4 0x021b0040 0x00000047
> -DATA 4 0x021b0400 0x14420000
> -DATA 4 0x021b0000 0x841A0000
> -DATA 4 0x00bb0008 0x00000004
> -DATA 4 0x00bb000c 0x2891E41A
> -DATA 4 0x00bb0038 0x00000564
> -DATA 4 0x00bb0014 0x00000040
> -DATA 4 0x00bb0028 0x00000020
> -DATA 4 0x00bb002c 0x00000020
> -DATA 4 0x021b001c 0x04088032
> -DATA 4 0x021b001c 0x00008033
> -DATA 4 0x021b001c 0x00048031
> -DATA 4 0x021b001c 0x09408030
> -DATA 4 0x021b001c 0x04008040
> -DATA 4 0x021b0020 0x00005800
> -DATA 4 0x021b0818 0x00011117
> -DATA 4 0x021b4818 0x00011117
> -DATA 4 0x021b0004 0x00025576
> -DATA 4 0x021b0404 0x00011006
> -DATA 4 0x021b001c 0x00000000
> -/* set the default clock gate to save power */
> -DATA 4, 0x020c4068, 0x00C03F3F
> -DATA 4, 0x020c406c, 0x0030FC03
> -DATA 4, 0x020c4070, 0x0FFFC000
> -DATA 4, 0x020c4074, 0x3FF00000
> -DATA 4, 0x020c4078, 0xFFFFF300
> -DATA 4, 0x020c407c, 0x0F0000F3
> -DATA 4, 0x020c4080, 0x00000FFF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4, 0x020e0010, 0xF00000CF
> -/* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */
> -DATA 4, 0x020e0018, 0x77177717
> -DATA 4, 0x020e001c, 0x77177717
> diff --git a/board/freescale/mx6qsabreauto/Kconfig b/board/freescale/mx6sabreauto/Kconfig
> similarity index 54%
> rename from board/freescale/mx6qsabreauto/Kconfig
> rename to board/freescale/mx6sabreauto/Kconfig
> index e579c0f..5b4faf6 100644
> --- a/board/freescale/mx6qsabreauto/Kconfig
> +++ b/board/freescale/mx6sabreauto/Kconfig
> @@ -1,12 +1,12 @@
> -if TARGET_MX6QSABREAUTO
> +if TARGET_MX6SABREAUTO
>  
>  config SYS_BOARD
> -	default "mx6qsabreauto"
> +	default "mx6sabreauto"
>  
>  config SYS_VENDOR
>  	default "freescale"
>  
>  config SYS_CONFIG_NAME
> -	default "mx6qsabreauto"
> +	default "mx6sabreauto"
>  
>  endif
> diff --git a/board/freescale/mx6sabreauto/MAINTAINERS b/board/freescale/mx6sabreauto/MAINTAINERS
> new file mode 100644
> index 0000000..a89f05a
> --- /dev/null
> +++ b/board/freescale/mx6sabreauto/MAINTAINERS
> @@ -0,0 +1,7 @@
> +MX6SABREAUTO BOARD
> +M:	Fabio Estevam <fabio.estevam@nxp.com>
> +M:	Peng Fan <peng.fan@nxp.com>
> +S:	Maintained
> +F:	board/freescale/mx6sabreauto/
> +F:	include/configs/mx6sabreauto.h
> +F:	configs/mx6sabreauto_defconfig
> diff --git a/board/freescale/mx6qsabreauto/Makefile b/board/freescale/mx6sabreauto/Makefile
> similarity index 85%
> rename from board/freescale/mx6qsabreauto/Makefile
> rename to board/freescale/mx6sabreauto/Makefile
> index ac5bc81..87f4ec0 100644
> --- a/board/freescale/mx6qsabreauto/Makefile
> +++ b/board/freescale/mx6sabreauto/Makefile
> @@ -6,4 +6,4 @@
>  # SPDX-License-Identifier:	GPL-2.0+
>  #
>  
> -obj-y  := mx6qsabreauto.o
> +obj-y  := mx6sabreauto.o
> diff --git a/board/freescale/mx6sabreauto/README b/board/freescale/mx6sabreauto/README
> new file mode 100644
> index 0000000..7e4596a
> --- /dev/null
> +++ b/board/freescale/mx6sabreauto/README
> @@ -0,0 +1,20 @@
> +How to use and build U-Boot on mx6sabreauto
> +-------------------------------------------
> +
> +mx6sabreauto_defconfig target supports mx6q/mx6dl/mx6qp sabreauto variants.
> +
> +In order to build it:
> +
> +$ make mx6sabreauto_defconfig
> +
> +$ make
> +
> +This will generate the SPL and u-boot.img binaries.
> +
> +- Flash the SPL binary into the SD card:
> +
> +$ sudo dd if=SPL of=/dev/sdX bs=1K seek=1 && sync
> +
> +- Flash the u-boot.img binary into the SD card:
> +
> +$ sudo dd if=u-boot.img of=/dev/sdX bs=1K seek=69 && sync
> diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
> similarity index 100%
> rename from board/freescale/mx6qsabreauto/mx6qsabreauto.c
> rename to board/freescale/mx6sabreauto/mx6sabreauto.c
> diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
> deleted file mode 100644
> index ba5ab8a..0000000
> --- a/configs/mx6dlsabreauto_defconfig
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> -CONFIG_VIDEO=y
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_SF=y
> -CONFIG_MTD_NOR_FLASH=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="FSL"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> -# CONFIG_VIDEO_SW_CURSOR is not set
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
> deleted file mode 100644
> index 96a248e..0000000
> --- a/configs/mx6qpsabreauto_defconfig
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> -CONFIG_VIDEO=y
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6Q"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_SF=y
> -CONFIG_MTD_NOR_FLASH=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="FSL"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> -# CONFIG_VIDEO_SW_CURSOR is not set
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
> deleted file mode 100644
> index 015207d..0000000
> --- a/configs/mx6qsabreauto_defconfig
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> -CONFIG_VIDEO=y
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_SF=y
> -CONFIG_MTD_NOR_FLASH=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="FSL"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> -# CONFIG_VIDEO_SW_CURSOR is not set
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6qsabreauto_spl_defconfig b/configs/mx6sabreauto_defconfig
> similarity index 97%
> rename from configs/mx6qsabreauto_spl_defconfig
> rename to configs/mx6sabreauto_defconfig
> index ce2d1d2..c1b3bbf 100644
> --- a/configs/mx6qsabreauto_spl_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
>  CONFIG_SPL_GPIO_SUPPORT=y
>  CONFIG_SPL_LIBCOMMON_SUPPORT=y
>  CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> +CONFIG_TARGET_MX6SABREAUTO=y
>  CONFIG_SPL_MMC_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
>  CONFIG_SPL_LIBDISK_SUPPORT=y
> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6sabreauto.h
> similarity index 94%
> rename from include/configs/mx6qsabreauto.h
> rename to include/configs/mx6sabreauto.h
> index 99b48ca..fd0d5ce 100644
> --- a/include/configs/mx6qsabreauto.h
> +++ b/include/configs/mx6sabreauto.h
> @@ -6,8 +6,8 @@
>   * SPDX-License-Identifier:	GPL-2.0+
>   */
>  
> -#ifndef __MX6QSABREAUTO_CONFIG_H
> -#define __MX6QSABREAUTO_CONFIG_H
> +#ifndef __MX6SABREAUTO_CONFIG_H
> +#define __MX6SABREAUTO_CONFIG_H
>  
>  #ifdef CONFIG_SPL
>  #include "imx6_spl.h"
> @@ -76,4 +76,4 @@
>  #define CONFIG_POWER_PFUZE100
>  #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
>  
> -#endif                         /* __MX6QSABREAUTO_CONFIG_H */
> +#endif                         /* __MX6SABREAUTO_CONFIG_H */
> 

Nice cleanup, thanks !

Reviewed-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver
  2017-06-30  8:51 ` [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver Stefano Babic
@ 2017-06-30 11:21   ` Fabio Estevam
  2017-06-30 11:49     ` Stefano Babic
  0 siblings, 1 reply; 12+ messages in thread
From: Fabio Estevam @ 2017-06-30 11:21 UTC (permalink / raw)
  To: u-boot

Hi Stefano,

On Fri, Jun 30, 2017 at 5:51 AM, Stefano Babic <sbabic@denx.de> wrote:

> But if this is the case, should we not also add a dependency in Kconfig
> for NAND_MXS, selecting automatically APBH_DMA ?
>
> config NAND_MXS
>         bool "MXS NAND support"
>         depends on MX6 || MX7
> +       select APBH_DMA
>

Doing like this still causes the build to fail:

arch/arm/cpu/armv7/built-in.o: In function `arch_cpu_init':
/home/fabio/u-boot/arch/arm/cpu/armv7/mx6/soc.c:432: undefined
reference to `mxs_dma_init'
  LD      u-boot
scripts/Makefile.spl:333: recipe for target 'spl/u-boot-spl' failed
make[1]: *** [spl/u-boot-spl] Error 1
Makefile:1382: recipe for target 'spl/u-boot-spl' failed
make: *** [spl/u-boot-spl] Error 2
make: *** Waiting for unfinished jobs....

SPL builds arch/arm/cpu/armv7/mx6/soc.c, but does not build the
APBH_DMA driver, which provides mxs_dma_init().

That's why I thought in removing mxs_dma_init() from soc.c and put it
inside the mxs_nand.c driver.

If there is some other alternative, please let me know.

Thanks

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver
  2017-06-30 11:21   ` Fabio Estevam
@ 2017-06-30 11:49     ` Stefano Babic
  2017-06-30 12:19       ` Fabio Estevam
  0 siblings, 1 reply; 12+ messages in thread
From: Stefano Babic @ 2017-06-30 11:49 UTC (permalink / raw)
  To: u-boot

Hi Fabio,

On 30/06/2017 13:21, Fabio Estevam wrote:
> Hi Stefano,
> 
> On Fri, Jun 30, 2017 at 5:51 AM, Stefano Babic <sbabic@denx.de> wrote:
> 
>> But if this is the case, should we not also add a dependency in Kconfig
>> for NAND_MXS, selecting automatically APBH_DMA ?
>>
>> config NAND_MXS
>>         bool "MXS NAND support"
>>         depends on MX6 || MX7
>> +       select APBH_DMA
>>
> 
> Doing like this still causes the build to fail:
> 
> arch/arm/cpu/armv7/built-in.o: In function `arch_cpu_init':
> /home/fabio/u-boot/arch/arm/cpu/armv7/mx6/soc.c:432: undefined
> reference to `mxs_dma_init'
>   LD      u-boot
> scripts/Makefile.spl:333: recipe for target 'spl/u-boot-spl' failed
> make[1]: *** [spl/u-boot-spl] Error 1
> Makefile:1382: recipe for target 'spl/u-boot-spl' failed
> make: *** [spl/u-boot-spl] Error 2
> make: *** Waiting for unfinished jobs....
> 
> SPL builds arch/arm/cpu/armv7/mx6/soc.c, but does not build the
> APBH_DMA driver, which provides mxs_dma_init().
> 
> That's why I thought in removing mxs_dma_init() from soc.c and put it
> inside the mxs_nand.c driver.
> 

Agree on this - my concern is if NAND_MXS is set, but APBH_DMA not. I
see that APBH_DMA is not in Kconfig, and there are some other options
that are really set by all MX6-MX7 boards:

#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8

I understand now that we can do this with a follow-up patch. The best
way will be if, activating NAND_MXS, all 3 above are set for i.MX6 and
i.MX7 but just CONFIG_APBH_DMA for MX23-MX28, dropping them from
include/configs/<board>

> If there is some other alternative, please let me know.

I agree with you, the rest requires more cleanup and should be done in
separate patches.

Regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver
  2017-06-30 11:49     ` Stefano Babic
@ 2017-06-30 12:19       ` Fabio Estevam
  0 siblings, 0 replies; 12+ messages in thread
From: Fabio Estevam @ 2017-06-30 12:19 UTC (permalink / raw)
  To: u-boot

Hi Stefano,

On Fri, Jun 30, 2017 at 8:49 AM, Stefano Babic <sbabic@denx.de> wrote:

> I agree with you, the rest requires more cleanup and should be done in
> separate patches.

Great, so I will submit the Kconfig cleanups separately as suggested.

Thanks

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode
  2017-06-29 12:33 ` [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode Vanessa Maegima
  2017-06-29 19:37   ` Fabio Estevam
  2017-06-30  8:54   ` Stefano Babic
@ 2017-07-05 10:05   ` Stefano Babic
  2 siblings, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2017-07-05 10:05 UTC (permalink / raw)
  To: u-boot

On 29/06/2017 14:33, Vanessa Maegima wrote:
> As mx6sabreauto supports SPL now, all variants can boot using the same
> defconfig.
> 
> This patch:
> - Removes non-SPL targets.
> - Renames target to mx6sabreauto_defconfig.
> - Renames folder and board files to mx6sabreauto.
> - Updates MAINTAINERS, Makefile and Kconfig accordingly.
> - Removes .cfg files.
> - Adds a README with instructions to build and flash SPL and u-boot.img.
> 
> Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
> ---
>  arch/arm/cpu/armv7/mx6/Kconfig                     |   6 +-
>  board/freescale/mx6qsabreauto/MAINTAINERS          |   9 --
>  board/freescale/mx6qsabreauto/imximage.cfg         | 129 ------------------
>  board/freescale/mx6qsabreauto/mx6dl.cfg            | 130 ------------------
>  board/freescale/mx6qsabreauto/mx6qp.cfg            | 145 ---------------------
>  .../{mx6qsabreauto => mx6sabreauto}/Kconfig        |   6 +-
>  board/freescale/mx6sabreauto/MAINTAINERS           |   7 +
>  .../{mx6qsabreauto => mx6sabreauto}/Makefile       |   2 +-
>  board/freescale/mx6sabreauto/README                |  20 +++
>  .../mx6sabreauto.c}                                |   0
>  configs/mx6dlsabreauto_defconfig                   |  44 -------
>  configs/mx6qpsabreauto_defconfig                   |  43 ------
>  configs/mx6qsabreauto_defconfig                    |  44 -------
>  ...reauto_spl_defconfig => mx6sabreauto_defconfig} |   2 +-
>  .../configs/{mx6qsabreauto.h => mx6sabreauto.h}    |   6 +-
>  15 files changed, 38 insertions(+), 555 deletions(-)
>  delete mode 100644 board/freescale/mx6qsabreauto/MAINTAINERS
>  delete mode 100644 board/freescale/mx6qsabreauto/imximage.cfg
>  delete mode 100644 board/freescale/mx6qsabreauto/mx6dl.cfg
>  delete mode 100644 board/freescale/mx6qsabreauto/mx6qp.cfg
>  rename board/freescale/{mx6qsabreauto => mx6sabreauto}/Kconfig (54%)
>  create mode 100644 board/freescale/mx6sabreauto/MAINTAINERS
>  rename board/freescale/{mx6qsabreauto => mx6sabreauto}/Makefile (85%)
>  create mode 100644 board/freescale/mx6sabreauto/README
>  rename board/freescale/{mx6qsabreauto/mx6qsabreauto.c => mx6sabreauto/mx6sabreauto.c} (100%)
>  delete mode 100644 configs/mx6dlsabreauto_defconfig
>  delete mode 100644 configs/mx6qpsabreauto_defconfig
>  delete mode 100644 configs/mx6qsabreauto_defconfig
>  rename configs/{mx6qsabreauto_spl_defconfig => mx6sabreauto_defconfig} (97%)
>  rename include/configs/{mx6qsabreauto.h => mx6sabreauto.h} (94%)
> 
> diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
> index 0d500aa..4a38dc2 100644
> --- a/arch/arm/cpu/armv7/mx6/Kconfig
> +++ b/arch/arm/cpu/armv7/mx6/Kconfig
> @@ -202,8 +202,8 @@ config TARGET_MX6Q_ICORE_RQS
>  	select SUPPORT_SPL
>  	select SPL_LOAD_FIT
>  
> -config TARGET_MX6QSABREAUTO
> -	bool "mx6qsabreauto"
> +config TARGET_MX6SABREAUTO
> +	bool "mx6sabreauto"
>  	select BOARD_LATE_INIT
>  	select SUPPORT_SPL
>  	select DM
> @@ -413,7 +413,7 @@ source "board/engicam/icorem6/Kconfig"
>  source "board/engicam/icorem6_rqs/Kconfig"
>  source "board/engicam/isiotmx6ul/Kconfig"
>  source "board/freescale/mx6qarm2/Kconfig"
> -source "board/freescale/mx6qsabreauto/Kconfig"
> +source "board/freescale/mx6sabreauto/Kconfig"
>  source "board/freescale/mx6sabresd/Kconfig"
>  source "board/freescale/mx6slevk/Kconfig"
>  source "board/freescale/mx6sllevk/Kconfig"
> diff --git a/board/freescale/mx6qsabreauto/MAINTAINERS b/board/freescale/mx6qsabreauto/MAINTAINERS
> deleted file mode 100644
> index f148dac..0000000
> --- a/board/freescale/mx6qsabreauto/MAINTAINERS
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -MX6QSABREAUTO BOARD
> -M:	Fabio Estevam <fabio.estevam@nxp.com>
> -M:	Peng Fan <peng.fan@nxp.com>
> -S:	Maintained
> -F:	board/freescale/mx6qsabreauto/
> -F:	include/configs/mx6qsabreauto.h
> -F:	configs/mx6dlsabreauto_defconfig
> -F:	configs/mx6qsabreauto_defconfig
> -F:	configs/mx6qpsabreauto_defconfig
> diff --git a/board/freescale/mx6qsabreauto/imximage.cfg b/board/freescale/mx6qsabreauto/imximage.cfg
> deleted file mode 100644
> index 16bf473..0000000
> --- a/board/freescale/mx6qsabreauto/imximage.cfg
> +++ /dev/null
> @@ -1,129 +0,0 @@
> -/*
> - * Copyright (C) 2012 Freescale Semiconductor, Inc.
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - *
> - * Refer doc/README.imximage for more details about how-to configure
> - * and create imximage boot image
> - *
> - * The syntax is taken as close as possible with the kwbimage
> - */
> -/* image version */
> -
> -IMAGE_VERSION 2
> -
> -/*
> - * Boot Device : one of
> - * spi, sd (the board has no nand neither onenand)
> - */
> -BOOT_FROM	sd
> -
> -/*
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type           Address        Value
> - *
> - * where:
> - *	Addr-type register length (1,2 or 4 bytes)
> - *	Address	  absolute address of the register
> - *	value	  value to be stored in the register
> - */
> -DATA 4 0x020e0798 0x000C0000
> -DATA 4 0x020e0758 0x00000000
> -DATA 4 0x020e0588 0x00000030
> -DATA 4 0x020e0594 0x00000030
> -DATA 4 0x020e056c 0x00000030
> -DATA 4 0x020e0578 0x00000030
> -DATA 4 0x020e074c 0x00000030
> -DATA 4 0x020e057c 0x00000030
> -DATA 4 0x020e058c 0x00000000
> -DATA 4 0x020e059c 0x00000030
> -DATA 4 0x020e05a0 0x00000030
> -DATA 4 0x020e078c 0x00000030
> -DATA 4 0x020e0750 0x00020000
> -DATA 4 0x020e05a8 0x00000028
> -DATA 4 0x020e05b0 0x00000028
> -DATA 4 0x020e0524 0x00000028
> -DATA 4 0x020e051c 0x00000028
> -DATA 4 0x020e0518 0x00000028
> -DATA 4 0x020e050c 0x00000028
> -DATA 4 0x020e05b8 0x00000028
> -DATA 4 0x020e05c0 0x00000028
> -DATA 4 0x020e0774 0x00020000
> -DATA 4 0x020e0784 0x00000028
> -DATA 4 0x020e0788 0x00000028
> -DATA 4 0x020e0794 0x00000028
> -DATA 4 0x020e079c 0x00000028
> -DATA 4 0x020e07a0 0x00000028
> -DATA 4 0x020e07a4 0x00000028
> -DATA 4 0x020e07a8 0x00000028
> -DATA 4 0x020e0748 0x00000028
> -DATA 4 0x020e05ac 0x00000028
> -DATA 4 0x020e05b4 0x00000028
> -DATA 4 0x020e0528 0x00000028
> -DATA 4 0x020e0520 0x00000028
> -DATA 4 0x020e0514 0x00000028
> -DATA 4 0x020e0510 0x00000028
> -DATA 4 0x020e05bc 0x00000028
> -DATA 4 0x020e05c4 0x00000028
> -DATA 4 0x021b0800 0xa1390003
> -DATA 4 0x021b080c 0x001F001F
> -DATA 4 0x021b0810 0x001F001F
> -DATA 4 0x021b480c 0x001F001F
> -DATA 4 0x021b4810 0x001F001F
> -DATA 4 0x021b083c 0x43260335
> -DATA 4 0x021b0840 0x031A030B
> -DATA 4 0x021b483c 0x4323033B
> -DATA 4 0x021b4840 0x0323026F
> -DATA 4 0x021b0848 0x483D4545
> -DATA 4 0x021b4848 0x44433E48
> -DATA 4 0x021b0850 0x41444840
> -DATA 4 0x021b4850 0x4835483E
> -DATA 4 0x021b081c 0x33333333
> -DATA 4 0x021b0820 0x33333333
> -DATA 4 0x021b0824 0x33333333
> -DATA 4 0x021b0828 0x33333333
> -DATA 4 0x021b481c 0x33333333
> -DATA 4 0x021b4820 0x33333333
> -DATA 4 0x021b4824 0x33333333
> -DATA 4 0x021b4828 0x33333333
> -DATA 4 0x021b08b8 0x00000800
> -DATA 4 0x021b48b8 0x00000800
> -DATA 4 0x021b0004 0x00020036
> -DATA 4 0x021b0008 0x09444040
> -DATA 4 0x021b000c 0x8A8F7955
> -DATA 4 0x021b0010 0xFF328F64
> -DATA 4 0x021b0014 0x01FF00DB
> -DATA 4 0x021b0018 0x00001740
> -DATA 4 0x021b001c 0x00008000
> -DATA 4 0x021b002c 0x000026d2
> -DATA 4 0x021b0030 0x008F1023
> -DATA 4 0x021b0040 0x00000047
> -DATA 4 0x021b0000 0x841A0000
> -DATA 4 0x021b001c 0x04088032
> -DATA 4 0x021b001c 0x00008033
> -DATA 4 0x021b001c 0x00048031
> -DATA 4 0x021b001c 0x09408030
> -DATA 4 0x021b001c 0x04008040
> -DATA 4 0x021b0020 0x00005800
> -DATA 4 0x021b0818 0x00011117
> -DATA 4 0x021b4818 0x00011117
> -DATA 4 0x021b0004 0x00025576
> -DATA 4 0x021b0404 0x00011006
> -DATA 4 0x021b001c 0x00000000
> -
> -/* set the default clock gate to save power */
> -DATA 4 0x020c4068 0x00C03F3F
> -DATA 4 0x020c406c 0x0030FC03
> -DATA 4 0x020c4070 0x0FFFC000
> -DATA 4 0x020c4074 0x3FF00000
> -DATA 4 0x020c4078 0xFFFFF300
> -DATA 4 0x020c407c 0x0F0000F3
> -DATA 4 0x020c4080 0x00000FFF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4 0x020e0010 0xF00000CF
> -/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
> -DATA 4 0x020e0018 0x007F007F
> -DATA 4 0x020e001c 0x007F007F
> diff --git a/board/freescale/mx6qsabreauto/mx6dl.cfg b/board/freescale/mx6qsabreauto/mx6dl.cfg
> deleted file mode 100644
> index 89078e5..0000000
> --- a/board/freescale/mx6qsabreauto/mx6dl.cfg
> +++ /dev/null
> @@ -1,130 +0,0 @@
> -/*
> - * Copyright (C) 2013 Freescale Semiconductor, Inc.
> - * Jason Liu <r64343@freescale.com>
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - *
> - * Refer doc/README.imximage for more details about how-to configure
> - * and create imximage boot image
> - *
> - * The syntax is taken as close as possible with the kwbimage
> - */
> -/* image version */
> -
> -IMAGE_VERSION 2
> -
> -/*
> - * Boot Device : one of
> - * spi, sd (the board has no nand neither onenand)
> - */
> -BOOT_FROM	sd
> -
> -/*
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type           Address        Value
> - *
> - * where:
> - *	Addr-type register length (1,2 or 4 bytes)
> - *	Address	  absolute address of the register
> - *	value	  value to be stored in the register
> - */
> -DATA 4 0x020e0774 0x000C0000
> -DATA 4 0x020e0754 0x00000000
> -DATA 4 0x020e04ac 0x00000030
> -DATA 4 0x020e04b0 0x00000030
> -DATA 4 0x020e0464 0x00000030
> -DATA 4 0x020e0490 0x00000030
> -DATA 4 0x020e074c 0x00000030
> -DATA 4 0x020e0494 0x00000030
> -DATA 4 0x020e04a0 0x00000000
> -DATA 4 0x020e04b4 0x00000030
> -DATA 4 0x020e04b8 0x00000030
> -DATA 4 0x020e076c 0x00000030
> -DATA 4 0x020e0750 0x00020000
> -DATA 4 0x020e04bc 0x00000028
> -DATA 4 0x020e04c0 0x00000028
> -DATA 4 0x020e04c4 0x00000028
> -DATA 4 0x020e04c8 0x00000028
> -DATA 4 0x020e04cc 0x00000028
> -DATA 4 0x020e04d0 0x00000028
> -DATA 4 0x020e04d4 0x00000028
> -DATA 4 0x020e04d8 0x00000028
> -DATA 4 0x020e0760 0x00020000
> -DATA 4 0x020e0764 0x00000028
> -DATA 4 0x020e0770 0x00000028
> -DATA 4 0x020e0778 0x00000028
> -DATA 4 0x020e077c 0x00000028
> -DATA 4 0x020e0780 0x00000028
> -DATA 4 0x020e0784 0x00000028
> -DATA 4 0x020e078c 0x00000028
> -DATA 4 0x020e0748 0x00000028
> -DATA 4 0x020e0470 0x00000028
> -DATA 4 0x020e0474 0x00000028
> -DATA 4 0x020e0478 0x00000028
> -DATA 4 0x020e047c 0x00000028
> -DATA 4 0x020e0480 0x00000028
> -DATA 4 0x020e0484 0x00000028
> -DATA 4 0x020e0488 0x00000028
> -DATA 4 0x020e048c 0x00000028
> -DATA 4 0x021b0800 0xa1390003
> -DATA 4 0x021b080c 0x001F001F
> -DATA 4 0x021b0810 0x001F001F
> -DATA 4 0x021b480c 0x001F001F
> -DATA 4 0x021b4810 0x001F001F
> -DATA 4 0x021b083c 0x42190217
> -DATA 4 0x021b0840 0x017B017B
> -DATA 4 0x021b483c 0x4176017B
> -DATA 4 0x021b4840 0x015F016C
> -DATA 4 0x021b0848 0x4C4C4D4C
> -DATA 4 0x021b4848 0x4A4D4C48
> -DATA 4 0x021b0850 0x3F3F3F40
> -DATA 4 0x021b4850 0x3538382E
> -DATA 4 0x021b081c 0x33333333
> -DATA 4 0x021b0820 0x33333333
> -DATA 4 0x021b0824 0x33333333
> -DATA 4 0x021b0828 0x33333333
> -DATA 4 0x021b481c 0x33333333
> -DATA 4 0x021b4820 0x33333333
> -DATA 4 0x021b4824 0x33333333
> -DATA 4 0x021b4828 0x33333333
> -DATA 4 0x021b08b8 0x00000800
> -DATA 4 0x021b48b8 0x00000800
> -DATA 4 0x021b0004 0x00020025
> -DATA 4 0x021b0008 0x00333030
> -DATA 4 0x021b000c 0x676B5313
> -DATA 4 0x021b0010 0xB66E8B63
> -DATA 4 0x021b0014 0x01FF00DB
> -DATA 4 0x021b0018 0x00001740
> -DATA 4 0x021b001c 0x00008000
> -DATA 4 0x021b002c 0x000026d2
> -DATA 4 0x021b0030 0x006B1023
> -DATA 4 0x021b0040 0x00000047
> -DATA 4 0x021b0000 0x841A0000
> -DATA 4 0x021b001c 0x04008032
> -DATA 4 0x021b001c 0x00008033
> -DATA 4 0x021b001c 0x00048031
> -DATA 4 0x021b001c 0x05208030
> -DATA 4 0x021b001c 0x04008040
> -DATA 4 0x021b0020 0x00005800
> -DATA 4 0x021b0818 0x00011117
> -DATA 4 0x021b4818 0x00011117
> -DATA 4 0x021b0004 0x00025565
> -DATA 4 0x021b0404 0x00011006
> -DATA 4 0x021b001c 0x00000000
> -
> -/* set the default clock gate to save power */
> -DATA 4 0x020c4068 0x00C03F3F
> -DATA 4 0x020c406c 0x0030FC03
> -DATA 4 0x020c4070 0x0FFFC000
> -DATA 4 0x020c4074 0x3FF00000
> -DATA 4 0x020c4078 0xFFFFF300
> -DATA 4 0x020c407c 0x0F0000C3
> -DATA 4 0x020c4080 0x00000FFF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4 0x020e0010 0xF00000CF
> -/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
> -DATA 4 0x020e0018 0x007F007F
> -DATA 4 0x020e001c 0x007F007F
> diff --git a/board/freescale/mx6qsabreauto/mx6qp.cfg b/board/freescale/mx6qsabreauto/mx6qp.cfg
> deleted file mode 100644
> index 2298c77..0000000
> --- a/board/freescale/mx6qsabreauto/mx6qp.cfg
> +++ /dev/null
> @@ -1,145 +0,0 @@
> -/*
> - * Copyright (C) 2015 Freescale Semiconductor, Inc.
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - *
> - * Refer doc/README.imximage for more details about how-to configure
> - * and create imximage boot image
> - *
> - * The syntax is taken as close as possible with the kwbimage
> - */
> -/* image version */
> -
> -#define __ASSEMBLY__
> -#include <config.h>
> -
> -IMAGE_VERSION 2
> -
> -/*
> - * Boot Device : one of spi, sd, eimnor, nand, sata:
> - * spinor: flash_offset: 0x0400
> - * nand:   flash_offset: 0x0400
> - * sata:   flash_offset: 0x0400
> - * sd/mmc: flash_offset: 0x0400
> - * eimnor: flash_offset: 0x1000
> - */
> -BOOT_FROM	sd
> -
> -/*
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type           Address        Value
> - *
> - * where:
> - *	Addr-type register length (1,2 or 4 bytes)
> - *	Address	  absolute address of the register
> - *	value	  value to be stored in the register
> - */
> -DATA 4 0x020e0798 0x000C0000
> -DATA 4 0x020e0758 0x00000000
> -DATA 4 0x020e0588 0x00000030
> -DATA 4 0x020e0594 0x00000030
> -DATA 4 0x020e056c 0x00000030
> -DATA 4 0x020e0578 0x00000030
> -DATA 4 0x020e074c 0x00000030
> -DATA 4 0x020e057c 0x00000030
> -DATA 4 0x020e058c 0x00000000
> -DATA 4 0x020e059c 0x00000030
> -DATA 4 0x020e05a0 0x00000030
> -DATA 4 0x020e078c 0x00000030
> -DATA 4 0x020e0750 0x00020000
> -DATA 4 0x020e05a8 0x00000030
> -DATA 4 0x020e05b0 0x00000030
> -DATA 4 0x020e0524 0x00000030
> -DATA 4 0x020e051c 0x00000030
> -DATA 4 0x020e0518 0x00000030
> -DATA 4 0x020e050c 0x00000030
> -DATA 4 0x020e05b8 0x00000030
> -DATA 4 0x020e05c0 0x00000030
> -DATA 4 0x020e0774 0x00020000
> -DATA 4 0x020e0784 0x00000030
> -DATA 4 0x020e0788 0x00000030
> -DATA 4 0x020e0794 0x00000030
> -DATA 4 0x020e079c 0x00000030
> -DATA 4 0x020e07a0 0x00000030
> -DATA 4 0x020e07a4 0x00000030
> -DATA 4 0x020e07a8 0x00000030
> -DATA 4 0x020e0748 0x00000030
> -DATA 4 0x020e05ac 0x00000030
> -DATA 4 0x020e05b4 0x00000030
> -DATA 4 0x020e0528 0x00000030
> -DATA 4 0x020e0520 0x00000030
> -DATA 4 0x020e0514 0x00000030
> -DATA 4 0x020e0510 0x00000030
> -DATA 4 0x020e05bc 0x00000030
> -DATA 4 0x020e05c4 0x00000030
> -DATA 4 0x021b0800 0xa1390003
> -DATA 4 0x021b080c 0x001b001e
> -DATA 4 0x021b0810 0x002e0029
> -DATA 4 0x021b480c 0x001b002a
> -DATA 4 0x021b4810 0x0019002c
> -DATA 4 0x021b083c 0x43240334
> -DATA 4 0x021b0840 0x0324031a
> -DATA 4 0x021b483c 0x43340344
> -DATA 4 0x021b4840 0x03280276
> -DATA 4 0x021b0848 0x44383A3E
> -DATA 4 0x021b4848 0x3C3C3846
> -DATA 4 0x021b0850 0x2e303230
> -DATA 4 0x021b4850 0x38283E34
> -DATA 4 0x021b081c 0x33333333
> -DATA 4 0x021b0820 0x33333333
> -DATA 4 0x021b0824 0x33333333
> -DATA 4 0x021b0828 0x33333333
> -DATA 4 0x021b481c 0x33333333
> -DATA 4 0x021b4820 0x33333333
> -DATA 4 0x021b4824 0x33333333
> -DATA 4 0x021b4828 0x33333333
> -DATA 4 0x021b08c0 0x24912492
> -DATA 4 0x021b48c0 0x24912492
> -DATA 4 0x021b08b8 0x00000800
> -DATA 4 0x021b48b8 0x00000800
> -DATA 4 0x021b0004 0x00020036
> -DATA 4 0x021b0008 0x09444040
> -DATA 4 0x021b000c 0x898E7955
> -DATA 4 0x021b0010 0xFF328F64
> -DATA 4 0x021b0014 0x01FF00DB
> -DATA 4 0x021b0018 0x00001740
> -DATA 4 0x021b001c 0x00008000
> -
> -DATA 4 0x021b002c 0x000026d2
> -DATA 4 0x021b0030 0x008E1023
> -DATA 4 0x021b0040 0x00000047
> -DATA 4 0x021b0400 0x14420000
> -DATA 4 0x021b0000 0x841A0000
> -DATA 4 0x00bb0008 0x00000004
> -DATA 4 0x00bb000c 0x2891E41A
> -DATA 4 0x00bb0038 0x00000564
> -DATA 4 0x00bb0014 0x00000040
> -DATA 4 0x00bb0028 0x00000020
> -DATA 4 0x00bb002c 0x00000020
> -DATA 4 0x021b001c 0x04088032
> -DATA 4 0x021b001c 0x00008033
> -DATA 4 0x021b001c 0x00048031
> -DATA 4 0x021b001c 0x09408030
> -DATA 4 0x021b001c 0x04008040
> -DATA 4 0x021b0020 0x00005800
> -DATA 4 0x021b0818 0x00011117
> -DATA 4 0x021b4818 0x00011117
> -DATA 4 0x021b0004 0x00025576
> -DATA 4 0x021b0404 0x00011006
> -DATA 4 0x021b001c 0x00000000
> -/* set the default clock gate to save power */
> -DATA 4, 0x020c4068, 0x00C03F3F
> -DATA 4, 0x020c406c, 0x0030FC03
> -DATA 4, 0x020c4070, 0x0FFFC000
> -DATA 4, 0x020c4074, 0x3FF00000
> -DATA 4, 0x020c4078, 0xFFFFF300
> -DATA 4, 0x020c407c, 0x0F0000F3
> -DATA 4, 0x020c4080, 0x00000FFF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4, 0x020e0010, 0xF00000CF
> -/* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */
> -DATA 4, 0x020e0018, 0x77177717
> -DATA 4, 0x020e001c, 0x77177717
> diff --git a/board/freescale/mx6qsabreauto/Kconfig b/board/freescale/mx6sabreauto/Kconfig
> similarity index 54%
> rename from board/freescale/mx6qsabreauto/Kconfig
> rename to board/freescale/mx6sabreauto/Kconfig
> index e579c0f..5b4faf6 100644
> --- a/board/freescale/mx6qsabreauto/Kconfig
> +++ b/board/freescale/mx6sabreauto/Kconfig
> @@ -1,12 +1,12 @@
> -if TARGET_MX6QSABREAUTO
> +if TARGET_MX6SABREAUTO
>  
>  config SYS_BOARD
> -	default "mx6qsabreauto"
> +	default "mx6sabreauto"
>  
>  config SYS_VENDOR
>  	default "freescale"
>  
>  config SYS_CONFIG_NAME
> -	default "mx6qsabreauto"
> +	default "mx6sabreauto"
>  
>  endif
> diff --git a/board/freescale/mx6sabreauto/MAINTAINERS b/board/freescale/mx6sabreauto/MAINTAINERS
> new file mode 100644
> index 0000000..a89f05a
> --- /dev/null
> +++ b/board/freescale/mx6sabreauto/MAINTAINERS
> @@ -0,0 +1,7 @@
> +MX6SABREAUTO BOARD
> +M:	Fabio Estevam <fabio.estevam@nxp.com>
> +M:	Peng Fan <peng.fan@nxp.com>
> +S:	Maintained
> +F:	board/freescale/mx6sabreauto/
> +F:	include/configs/mx6sabreauto.h
> +F:	configs/mx6sabreauto_defconfig
> diff --git a/board/freescale/mx6qsabreauto/Makefile b/board/freescale/mx6sabreauto/Makefile
> similarity index 85%
> rename from board/freescale/mx6qsabreauto/Makefile
> rename to board/freescale/mx6sabreauto/Makefile
> index ac5bc81..87f4ec0 100644
> --- a/board/freescale/mx6qsabreauto/Makefile
> +++ b/board/freescale/mx6sabreauto/Makefile
> @@ -6,4 +6,4 @@
>  # SPDX-License-Identifier:	GPL-2.0+
>  #
>  
> -obj-y  := mx6qsabreauto.o
> +obj-y  := mx6sabreauto.o
> diff --git a/board/freescale/mx6sabreauto/README b/board/freescale/mx6sabreauto/README
> new file mode 100644
> index 0000000..7e4596a
> --- /dev/null
> +++ b/board/freescale/mx6sabreauto/README
> @@ -0,0 +1,20 @@
> +How to use and build U-Boot on mx6sabreauto
> +-------------------------------------------
> +
> +mx6sabreauto_defconfig target supports mx6q/mx6dl/mx6qp sabreauto variants.
> +
> +In order to build it:
> +
> +$ make mx6sabreauto_defconfig
> +
> +$ make
> +
> +This will generate the SPL and u-boot.img binaries.
> +
> +- Flash the SPL binary into the SD card:
> +
> +$ sudo dd if=SPL of=/dev/sdX bs=1K seek=1 && sync
> +
> +- Flash the u-boot.img binary into the SD card:
> +
> +$ sudo dd if=u-boot.img of=/dev/sdX bs=1K seek=69 && sync
> diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
> similarity index 100%
> rename from board/freescale/mx6qsabreauto/mx6qsabreauto.c
> rename to board/freescale/mx6sabreauto/mx6sabreauto.c
> diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
> deleted file mode 100644
> index ba5ab8a..0000000
> --- a/configs/mx6dlsabreauto_defconfig
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> -CONFIG_VIDEO=y
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_SF=y
> -CONFIG_MTD_NOR_FLASH=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="FSL"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> -# CONFIG_VIDEO_SW_CURSOR is not set
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
> deleted file mode 100644
> index 96a248e..0000000
> --- a/configs/mx6qpsabreauto_defconfig
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> -CONFIG_VIDEO=y
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6Q"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_SF=y
> -CONFIG_MTD_NOR_FLASH=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="FSL"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> -# CONFIG_VIDEO_SW_CURSOR is not set
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
> deleted file mode 100644
> index 015207d..0000000
> --- a/configs/mx6qsabreauto_defconfig
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> -CONFIG_VIDEO=y
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_SF=y
> -CONFIG_MTD_NOR_FLASH=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="FSL"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> -# CONFIG_VIDEO_SW_CURSOR is not set
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6qsabreauto_spl_defconfig b/configs/mx6sabreauto_defconfig
> similarity index 97%
> rename from configs/mx6qsabreauto_spl_defconfig
> rename to configs/mx6sabreauto_defconfig
> index ce2d1d2..c1b3bbf 100644
> --- a/configs/mx6qsabreauto_spl_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
>  CONFIG_SPL_GPIO_SUPPORT=y
>  CONFIG_SPL_LIBCOMMON_SUPPORT=y
>  CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> +CONFIG_TARGET_MX6SABREAUTO=y
>  CONFIG_SPL_MMC_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
>  CONFIG_SPL_LIBDISK_SUPPORT=y
> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6sabreauto.h
> similarity index 94%
> rename from include/configs/mx6qsabreauto.h
> rename to include/configs/mx6sabreauto.h
> index 99b48ca..fd0d5ce 100644
> --- a/include/configs/mx6qsabreauto.h
> +++ b/include/configs/mx6sabreauto.h
> @@ -6,8 +6,8 @@
>   * SPDX-License-Identifier:	GPL-2.0+
>   */
>  
> -#ifndef __MX6QSABREAUTO_CONFIG_H
> -#define __MX6QSABREAUTO_CONFIG_H
> +#ifndef __MX6SABREAUTO_CONFIG_H
> +#define __MX6SABREAUTO_CONFIG_H
>  
>  #ifdef CONFIG_SPL
>  #include "imx6_spl.h"
> @@ -76,4 +76,4 @@
>  #define CONFIG_POWER_PFUZE100
>  #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
>  
> -#endif                         /* __MX6QSABREAUTO_CONFIG_H */
> +#endif                         /* __MX6SABREAUTO_CONFIG_H */
> 

Applied (whole series) to u-boot-imx, -next, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-07-05 10:05 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-29 12:33 [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver Vanessa Maegima
2017-06-29 12:33 ` [U-Boot] [PATCH next 2/3] mx6qsabreauto: Add SPL support Vanessa Maegima
2017-06-29 19:36   ` Fabio Estevam
2017-06-30  8:53   ` Stefano Babic
2017-06-29 12:33 ` [U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode Vanessa Maegima
2017-06-29 19:37   ` Fabio Estevam
2017-06-30  8:54   ` Stefano Babic
2017-07-05 10:05   ` Stefano Babic
2017-06-30  8:51 ` [U-Boot] [PATCH next 1/3] mx6: soc: Move mxs_dma_init() into the mxs nand driver Stefano Babic
2017-06-30 11:21   ` Fabio Estevam
2017-06-30 11:49     ` Stefano Babic
2017-06-30 12:19       ` Fabio Estevam

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.