Skip to contentSkip to conversation

dm: Convert TPC70 to use DM and DTS in SPL and u-boot proper

PATCH New Lukasz Majewski 2 participants 18 messages Oct 10, 2019 – Oct 14, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v3 cover dm: Convert TPC70 to use DM and DTS in SPL and u-boot proper

This patch series converts imx6q based tpc70 board to use driver model and device tree description in SPL and U-Boot proper.

All the non-DM parts of the code has been removed.
This patch series also uses the Common Clock Framework [CCF] as a base for clock management on imx6q board.

Those patches are applied on top of i.MX -next branch:
SHA1: caa336588d8b9be3d1ac011ddb62af7d1d060cb5
URL: git at gitlab.denx.de:u-boot/custodians/u-boot-imx.git

Changes in v3:
- Squash
'imx: tpc70: dts: Add TPC70 board (imx6q based) device tree description' with
'imx: tpc70: DTS: Explicitly add imx6q-kp.dtb to Makefile for DTB compilation'
- Adjust the code to being applicable on top of v2019.10
- Move CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Lukasz Majewski (9):
imx: tpc70: config: Add script commands to update u-boot and OE's wic
imx: tpc70: config: Update TPC70 config to support eMMC's boot0 SPL
update
imx: tpc70: Add board_boot_order() to distinguish between eMMC and SD
boot
imx: tpc70: cosmetic: Replace magic numbers when setting ENET clock
imx: tpc70: led: Enable LED default state
imx: tpc70: dts: Add TPC70 board (imx6q based) device tree description
imx: dts: Add u-boot specific set of device tree properties for tpc70
imx: tpc70: Convert TPC70 (imx6q) board to use DM/DTS in SPL and
u-boot
imx: config: Update KP's TPC70 config to support SWUpdate

 arch/arm/dts/Makefile                     |   1 +
 arch/arm/dts/imx6q-kp-u-boot.dtsi         |  59 ++++++
 arch/arm/dts/imx6q-kp.dts                 | 219 ++++++++++++++++++++++
 arch/arm/mach-imx/mx6/Kconfig             |  10 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c     | 172 +----------------
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 137 ++------------
 configs/kp_imx6q_tpc_defconfig            |  31 ++-
 include/configs/kp_imx6q_tpc.h            |  52 ++---
 8 files changed, 373 insertions(+), 308 deletions(-)
 create mode 100644 arch/arm/dts/imx6q-kp-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6q-kp.dts
Signature · 1 line
2.20.1
#1 lore raw

PATCH v3 1/9 imx: tpc70: config: Add script commands to update u-boot and OE's wic

---

Changes in v3: None

 include/configs/kp_imx6q_tpc.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
include/configs/kp_imx6q_tpc.h +21 -0
index 2435ebbc7f..fae45cbf3e 100644
@@ -82,11 +82,32 @@
 	"rdinit=/sbin/init\0" \
 	"addinitrd=setenv bootargs ${bootargs} rdinit=${rdinit} ${debug} \0" \
 	"fit_config=mx6q_tpc70_conf\0" \
+	"uboot_file=u-boot.img\0" \
+	"SPL_file=SPL\0" \
+	"wic_file=kp-image-kpimx6qtpc.wic\0" \
 	"upd_image=st.4k\0" \
 	"updargs=setenv bootargs console=${console} ${smp}"\
 	       "rdinit=${rdinit} ${debug} ${displayargs}\0" \
 	"loadusb=usb start; " \
 	       "fatload usb 0 ${loadaddr} ${upd_image}\0" \
+	"upd_uboot_sd=" \
+	    "if tftp ${loadaddr} ${uboot_file}; then " \
+	       "setexpr blkc ${filesize} / 0x200;" \
+	       "setexpr blkc ${blkc} + 1;" \
+	       "mmc write ${loadaddr} 0x8A ${blkc};" \
+	    "fi;\0" \
+	"upd_SPL_sd=" \
+	    "if tftp ${loadaddr} ${SPL_file}; then " \
+	       "setexpr blkc ${filesize} / 0x200;" \
+	       "setexpr blkc ${blkc} + 1;" \
+	       "mmc write ${loadaddr} 0x2 ${blkc};" \
+	    "fi;\0" \
+	"upd_wic=" \
+	    "if tftp ${loadaddr} ${wic_file}; then " \
+	       "setexpr blkc ${filesize} / 0x200;" \
+	       "setexpr blkc ${blkc} + 1;" \
+	       "mmc write ${loadaddr} 0x0 ${blkc};" \
+	    "fi;\0" \
 	"usbupd=echo Booting update from usb ...; " \
 	       "setenv bootargs; " \
 	       "run updargs; " \
Signature · 1 line
2.20.1
#2 lore raw

PATCH v3 2/9 imx: tpc70: config: Update TPC70 config to support eMMC's boot0 SPL update

In reply to Lukasz Majewski

The TPC70 can boot from eMMC's boot0. This patch allows it to update this HW partition's SPL.

---

Changes in v3: None

 include/configs/kp_imx6q_tpc.h | 5 +++++
 1 file changed, 5 insertions(+)
include/configs/kp_imx6q_tpc.h +5 -0
index fae45cbf3e..df419a95f6 100644
@@ -42,6 +42,7 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_MMC_ENV_DEV		1 /* 0 = SDHC2, 1 = SDHC4 (eMMC) */
+#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* UART */
 #define CONFIG_MXC_UART
@@ -102,6 +103,10 @@
 	       "setexpr blkc ${blkc} + 1;" \
 	       "mmc write ${loadaddr} 0x2 ${blkc};" \
 	    "fi;\0" \
+	"upd_SPL_mmc=mmc dev 1; mmc partconf 1 0 1 1; run upd_SPL_sd\0" \
+	"upd_uboot_mmc=mmc dev 1; mmc partconf 1 0 1 1; run upd_uboot_sd\0" \
+	"up_mmc=run upd_SPL_mmc; run upd_uboot_mmc\0" \
+	"up_sd=run upd_SPL_sd; run upd_uboot_sd\0" \
 	"upd_wic=" \
 	    "if tftp ${loadaddr} ${wic_file}; then " \
 	       "setexpr blkc ${filesize} / 0x200;" \
Signature · 1 line
2.20.1
#3 lore raw

PATCH v3 2/9 imx: tpc70: config: Update TPC70 config to support eMMC's boot0 SPL update

Quoted 3 lines

The TPC70 can boot from eMMC's boot0. This patch allows it to update this HW partition's SPL.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#4 lore raw

PATCH v3 3/9 imx: tpc70: Add board_boot_order() to distinguish between eMMC and SD boot

In reply to Lukasz Majewski

The TPC70 can boot from SD card (debug/development) and eMMC (production). The board_boot_order() function provides a run time check for the device from which one wants to boot (it is selected by GPIO pins setup).

Moreover, a fallback to SD card is provided if the detection is not possible or working properly.

---

Changes in v3: None

 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c +20 -0
index e284d5ec57..e48a577f79 100644
@@ -308,6 +308,26 @@ int board_mmc_init(bd_t *bd)
 	return fsl_esdhc_initialize(bd, &usdhc_cfg[0]);
 }
 
+void board_boot_order(u32 *spl_boot_list)
+{
+	u32 boot_device = spl_boot_device();
+	u32 reg = imx6_src_get_boot_mode();
+
+	reg = (reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT;
+
+	debug("%s: boot device: 0x%x (0x4 SD, 0x6 eMMC)\n", __func__, reg);
+	if (boot_device == BOOT_DEVICE_MMC1)
+		if (reg == IMX6_BMODE_MMC || reg == IMX6_BMODE_EMMC)
+			boot_device = BOOT_DEVICE_MMC2;
+
+	spl_boot_list[0] = boot_device;
+	/*
+	 * Below boot device is a 'fallback' - it shall always be possible to
+	 * boot from SD card
+	 */
+	spl_boot_list[1] = BOOT_DEVICE_MMC1;
+}
+
 void board_init_f(ulong dummy)
 {
 	/* setup AIPS and disable watchdog */
Signature · 1 line
2.20.1
#5 lore raw

PATCH v3 3/9 imx: tpc70: Add board_boot_order() to distinguish between eMMC and SD boot

Quoted 6 lines

The TPC70 can boot from SD card (debug/development) and eMMC (production). The board_boot_order() function provides a run time check for the device from which one wants to boot (it is selected by GPIO pins setup). Moreover, a fallback to SD card is provided if the detection is not possible or working properly.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#6 lore raw

PATCH v3 4/9 imx: tpc70: cosmetic: Replace magic numbers when setting ENET clock

In reply to Lukasz Majewski

This is a cosmetic change, just to use proper define instead of magic numbers.

---

Changes in v3: None

 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c +2 -1
index 2c541ace02..144d2c58c4 100644
@@ -119,7 +119,8 @@ static int setup_fec_clock(void)
 	struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
 
 	/* set gpr1[21] to select anatop clock */
-	clrsetbits_le32(&iomuxc_regs->gpr[1], 0x1 << 21, 0x1 << 21);
+	clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUXC_GPR1_ENET_CLK_SEL_MASK,
+			IOMUXC_GPR1_ENET_CLK_SEL_MASK);
 
 	return enable_fec_anatop_clock(0, ENET_50MHZ);
 }
Signature · 1 line
2.20.1
#7 lore raw

PATCH v3 4/9 imx: tpc70: cosmetic: Replace magic numbers when setting ENET clock

Quoted 3 lines

This is a cosmetic change, just to use proper define instead of magic numbers.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#8 lore raw

PATCH v3 5/9 imx: tpc70: led: Enable LED default state

In reply to Lukasz Majewski

This change sets the default state of LEDs on TPC70.

---

Changes in v3: None

 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 4 ++++
 1 file changed, 4 insertions(+)
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c +4 -0
index 144d2c58c4..7876a63068 100644
@@ -28,6 +28,7 @@
 #include <netdev.h>
 #include <usb.h>
 #include <usb/ehci-ci.h>
+#include <led.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -291,6 +292,9 @@ int board_late_init(void)
 	add_board_boot_modes(board_boot_modes);
 #endif
 
+	if (IS_ENABLED(CONFIG_LED))
+		led_default_state();
+
 	env_set("boardname", "kp-tpc");
 	env_set("boardsoc", "imx6q");
 	return 0;
Signature · 1 line
2.20.1
#9 lore raw

PATCH v3 5/9 imx: tpc70: led: Enable LED default state

Quoted 2 lines

This change sets the default state of LEDs on TPC70.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#10 lore raw

PATCH v3 6/9 imx: tpc70: dts: Add TPC70 board (imx6q based) device tree description

In reply to Lukasz Majewski

This commit defines the TPC70 imx6q board with device tree description.

---

Changes in v3:
- Squash
'imx: tpc70: dts: Add TPC70 board (imx6q based) device tree description' with
'imx: tpc70: DTS: Explicitly add imx6q-kp.dtb to Makefile for DTB compilation'

 arch/arm/dts/Makefile     |   1 +
 arch/arm/dts/imx6q-kp.dts | 219 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)
 create mode 100644 arch/arm/dts/imx6q-kp.dts
arch/arm/dts/Makefile +1 -0
index 2c86b293a8..13a00200a7 100644
@@ -576,6 +576,7 @@ dtb-y += \
 	imx6q-icore.dtb \
 	imx6q-icore-mipi.dtb \
 	imx6q-icore-rqs.dtb \
+	imx6q-kp.dtb \
 	imx6q-logicpd.dtb \
 	imx6q-nitrogen6x.dtb \
 	imx6q-novena.dtb \
arch/arm/dts/imx6q-kp.dts new file +219 -0

219 lines not on this page · raw message

Signature · 1 line
2.20.1
#11 lore raw

PATCH v3 6/9 imx: tpc70: dts: Add TPC70 board (imx6q based) device tree description

Quoted 2 lines

This commit defines the TPC70 imx6q board with device tree description.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#12 lore raw

PATCH v3 7/9 imx: dts: Add u-boot specific set of device tree properties for tpc70

In reply to Lukasz Majewski

This commit adds new file - imx6q-kp-u-boot.dtsi with a set of u-boot specific properties for imx6q KP device.

---

Changes in v3: None

 arch/arm/dts/imx6q-kp-u-boot.dtsi | 59 +++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 arch/arm/dts/imx6q-kp-u-boot.dtsi
arch/arm/dts/imx6q-kp-u-boot.dtsi new file +59 -0
new file mode 100644
index 0000000000..e6b71b22ae
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2019
+ * Lukasz Majewski, DENX Software Engineering, lukma at denx.de
+ *
+ * SPDX-License-Identifier:     GPL-2.0+ or X11
+ */
+
+#include "imx6qdl-u-boot.dtsi"
+
+/ {
+	clocks {
+		u-boot,dm-spl;
+		osc {
+			u-boot,dm-spl;
+		};
+	};
+
+	wdt-reboot {
+		compatible = "wdt-reboot";
+		wdt = <&wdog1>;
+	};
+};
+
+&clks {
+	u-boot,dm-pre-reloc;
+};
+
+&gpio2 {
+	u-boot,dm-spl;
+};
+
+&pinctrl_uart1 {
+	u-boot,dm-spl;
+};
+
+&pinctrl_usdhc2 {
+	u-boot,dm-spl;
+};
+
+&pinctrl_usdhc4 {
+	u-boot,dm-spl;
+};
+
+&uart1 {
+	u-boot,dm-spl;
+};
+
+&usdhc2 {
+	u-boot,dm-spl;
+};
+
+&usdhc4 {
+	u-boot,dm-spl;
+};
+
+&wdog1 {
+	u-boot,dm-spl;
+};
Signature · 1 line
2.20.1
#13 lore raw

PATCH v3 7/9 imx: dts: Add u-boot specific set of device tree properties for tpc70

Quoted 3 lines

This commit adds new file - imx6q-kp-u-boot.dtsi with a set of u-boot specific properties for imx6q KP device.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#14 lore raw

PATCH v3 8/9 imx: tpc70: Convert TPC70 (imx6q) board to use DM/DTS in SPL and u-boot

In reply to Lukasz Majewski

This patch converts the TPC70 to use driver model and device tree description in both SPL and u-boot proper.

Notable changes (DM/DTS conversion):

- PINCTRL{_IMX6}
- DM_I2C
- enable 'regulator' and 'pmic' commands
- DM_MMC and BLK (USDHC)
- DM_ETH
- DM WDT (including SYSRESET)

---

Changes in v3:
- Adjust the code to being applicable on top of v2019.10
- Move CONFIG_SUPPORT_EMMC_BOOT to Kconfig

 arch/arm/mach-imx/mx6/Kconfig             |  10 ++
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c     | 165 +---------------------
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 133 +----------------
 configs/kp_imx6q_tpc_defconfig            |  31 +++-
 include/configs/kp_imx6q_tpc.h            |  21 ---
 5 files changed, 46 insertions(+), 314 deletions(-)
arch/arm/mach-imx/mx6/Kconfig +10 -0
index 7e5a667e81..00e3c486bc 100644
@@ -510,9 +510,19 @@ config TARGET_KP_IMX6Q_TPC
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select DM
+	select SPL_DM if SPL
 	select DM_THERMAL
+	select DM_MMC
+	select DM_ETH
+	select DM_REGULATOR
+	select SPL_DM_REGULATOR if SPL
+	select DM_SERIAL
+	select DM_I2C
+	select DM_GPIO
+	select DM_USB
 	select MX6QDL
 	select SUPPORT_SPL
+	select SPL_SEPARATE_BSS if SPL
 	imply CMD_DM
 	imply CMD_SPL
 
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c +4 -161

219 lines not on this page · raw message

board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c +2 -131

167 lines not on this page · raw message

configs/kp_imx6q_tpc_defconfig +30 -1
index 75dd9d7c7a..686fa2b503 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x2200
 CONFIG_MX6_DDRCAL=y
 CONFIG_TARGET_KP_IMX6Q_TPC=y
 CONFIG_SPL_MMC_SUPPORT=y
@@ -14,11 +15,14 @@ CONFIG_SPL_TEXT_BASE=0x00908000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
+CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SPL_RAW_IMAGE_SUPPORT=y
+CONFIG_SPL_PAYLOAD="u-boot.img"
+CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="."
@@ -27,19 +31,44 @@ CONFIG_AUTOBOOT_STOP_STR="."
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+# CONFIG_CMD_PINMUX is not set
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-kp"
+CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents interrupts dmas dma-names"
 CONFIG_ENV_IS_IN_MMC=y
+# CONFIG_BLOCK_CACHE is not set
+CONFIG_SPL_CLK_IMX6Q=y
+CONFIG_CLK_IMX6Q=y
+CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_I2C_MXC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_ATHEROS=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_SPL_DM_REGULATOR_FIXED=y
+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
+CONFIG_MXC_UART=y
+CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_IMX_THERMAL=y
 CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
 CONFIG_IMX_WATCHDOG=y
-CONFIG_OF_LIBFDT=y
include/configs/kp_imx6q_tpc.h +0 -21
index df419a95f6..9377750e7a 100644
@@ -25,30 +25,9 @@
 #define CONFIG_SYS_MALLOC_LEN		(4 * SZ_1M)
 
 /* FEC ethernet */
-#define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE		RGMII
-#define CONFIG_ETHPRIME			"FEC"
-#define CONFIG_FEC_MXC_PHYADDR		0
 #define CONFIG_ARP_TIMEOUT		200UL
 
-/* I2C Configs */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_SPEED		100000
-
-/* MMC Configs */
-#define CONFIG_SYS_FSL_ESDHC_ADDR	0
-#define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_MMC_ENV_DEV		1 /* 0 = SDHC2, 1 = SDHC4 (eMMC) */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
-/* UART */
-#define CONFIG_MXC_UART
-#define CONFIG_MXC_UART_BASE		UART1_BASE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
Signature · 1 line
2.20.1
#15 lore raw

PATCH v3 8/9 imx: tpc70: Convert TPC70 (imx6q) board to use DM/DTS in SPL and u-boot

Quoted 10 lines

This patch converts the TPC70 to use driver model and device tree description in both SPL and u-boot proper.
Notable changes (DM/DTS conversion):
- PINCTRL{_IMX6}
- DM_I2C
- enable 'regulator' and 'pmic' commands
- DM_MMC and BLK (USDHC)
- DM_ETH
- DM WDT (including SYSRESET)

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#16 lore raw

PATCH v3 9/9 imx: config: Update KP's TPC70 config to support SWUpdate

In reply to Lukasz Majewski

This patch updates envs responsible for using USB pendrive as a SWUpdate based tool for recovery and update.

---

Changes in v3: None

 include/configs/kp_imx6q_tpc.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
include/configs/kp_imx6q_tpc.h +5 -2
index 9377750e7a..77a93d7265 100644
@@ -66,8 +66,9 @@
 	"SPL_file=SPL\0" \
 	"wic_file=kp-image-kpimx6qtpc.wic\0" \
 	"upd_image=st.4k\0" \
-	"updargs=setenv bootargs console=${console} ${smp}"\
-	       "rdinit=${rdinit} ${debug} ${displayargs}\0" \
+	"updargs=setenv bootargs console=${console} ${smp} ${displayargs}\0" \
+	"initrd_ram_dev=/dev/ram\0" \
+	"addswupdate=setenv bootargs ${bootargs} root=${initrd_ram_dev} rw\0" \
 	"loadusb=usb start; " \
 	       "fatload usb 0 ${loadaddr} ${upd_image}\0" \
 	"upd_uboot_sd=" \
@@ -95,6 +96,8 @@
 	"usbupd=echo Booting update from usb ...; " \
 	       "setenv bootargs; " \
 	       "run updargs; " \
+	       "run addinitrd; " \
+	       "run addswupdate; " \
 	       "run loadusb; " \
 	       "bootm ${loadaddr}#${fit_config}\0" \
 	BOOTENV
Signature · 1 line
2.20.1
#17 lore raw

PATCH v3 9/9 imx: config: Update KP's TPC70 config to support SWUpdate

Quoted 3 lines

This patch updates envs responsible for using USB pendrive as a SWUpdate based tool for recovery and update.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================