Skip to contentSkip to conversation

mx6memcal: launder through savedefconfig

PATCH New Eric Nelson 3 participants 6 messages Jan 18, 2018 – Feb 4, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mx6memcal: launder through savedefconfig

This patch just changes the order of configuration items in mx6memcal_defconfig to match the Kconfig layout, making it easier to track changes made using menuconfig.

---
 configs/mx6memcal_defconfig | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
configs/mx6memcal_defconfig +4 -5
index 9a3bb83..b27330c 100644
@@ -9,25 +9,24 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
-# CONFIG_MMC is not set
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
-# CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
-CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
+# CONFIG_MMC is not set
 CONFIG_REGEX=y
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 mx6memcal: enable SDP support

The initial implementation of mx6memcal reset the CPU after running the memory calibration procedure because the generic board has no information about which boot devices are available.

Now that we have SDP support in SPL, use it to allow a full U-Boot to be uploaded (i.e. to use "mtest").

---
 board/freescale/mx6memcal/spl.c |  1 -
 configs/mx6memcal_defconfig     | 10 ++++++++++
 include/configs/mx6memcal.h     |  2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)
board/freescale/mx6memcal/spl.c +0 -1
index 8ee89ff..805fdab 100644
@@ -452,5 +452,4 @@ void board_init_f(ulong dummy)
 			display_calibration(&calibration);
 		}
 	}
-	reset_cpu(0);
 }
configs/mx6memcal_defconfig +10 -0
index b27330c..d3720dc 100644
@@ -8,6 +8,10 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_SPL=y
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
+CONFIG_SPL_USBETH_SUPPORT=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_BOOTM is not set
@@ -29,4 +33,10 @@ CONFIG_CMD_MEMTEST=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 # CONFIG_MMC is not set
+CONFIG_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
+CONFIG_CI_UDC=y
 CONFIG_REGEX=y
include/configs/mx6memcal.h +2 -0
index f5238a5..28c67c4 100644
@@ -56,4 +56,6 @@
 
 #define CONFIG_ENV_SIZE			(8 * 1024)
 
+#define CONFIG_MXC_USB_PORTSC	PORT_PTS_UTMI
+
 #endif	       /* __CONFIG_H */
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/2 mx6memcal: enable SDP support

Quoted 8 lines · Eric Nelson

The initial implementation of mx6memcal reset the CPU after running the memory calibration procedure because the generic board has no information about which boot devices are available.

Now that we have SDP support in SPL, use it to allow a full U-Boot to be uploaded (i.e. to use "mtest").

#3 lore raw

PATCH 2/2 mx6memcal: enable SDP support

In reply to Eric Nelson
Quoted 56 lines · Eric Nelson

The initial implementation of mx6memcal reset the CPU after running the memory calibration procedure because the generic board has no information about which boot devices are available.

Now that we have SDP support in SPL, use it to allow a full U-Boot to be uploaded (i.e. to use "mtest").

---
 board/freescale/mx6memcal/spl.c |  1 -
 configs/mx6memcal_defconfig     | 10 ++++++++++
 include/configs/mx6memcal.h     |  2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)
board/freescale/mx6memcal/spl.c +0 -1
index 8ee89ff..805fdab 100644
@@ -452,5 +452,4 @@ void board_init_f(ulong dummy)
 			display_calibration(&calibration);
 		}
 	}
-	reset_cpu(0);
 }
configs/mx6memcal_defconfig +10 -0
index b27330c..d3720dc 100644
@@ -8,6 +8,10 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_SPL=y
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
+CONFIG_SPL_USBETH_SUPPORT=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_BOOTM is not set
@@ -29,4 +33,10 @@ CONFIG_CMD_MEMTEST=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 # CONFIG_MMC is not set
+CONFIG_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
+CONFIG_CI_UDC=y
 CONFIG_REGEX=y
include/configs/mx6memcal.h +0 -0
index f5238a5..28c67c4 100644

include/configs/mx6memcal.h line 61

Quoted 6 lines
include/configs/mx6memcal.h +2 -0
@@ -56,4 +56,6 @@
 
 #define CONFIG_ENV_SIZE			(8 * 1024)
 
+#define CONFIG_MXC_USB_PORTSC	PORT_PTS_UTMI
+
 #endif	       /* __CONFIG_H */

Applied to u-boot-imx, 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
=====================================================================
#5 lore raw

PATCH 1/2 mx6memcal: launder through savedefconfig

In reply to Eric Nelson
Quoted 34 lines · Eric Nelson

This patch just changes the order of configuration items in mx6memcal_defconfig to match the Kconfig layout, making it easier to track changes made using menuconfig.

---
 configs/mx6memcal_defconfig | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
configs/mx6memcal_defconfig +0 -5
index 9a3bb83..b27330c 100644
@@ -9,25 +9,24 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
-# CONFIG_MMC is not set
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
-# CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
-CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set

configs/mx6memcal_defconfig CONFIG_SPL_WATCHDOG_SUPPORT=y · line 32

Quoted 10 lines
configs/mx6memcal_defconfig +4 -0
+CONFIG_CMD_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
+# CONFIG_MMC is not set
 CONFIG_REGEX=y

Applied to u-boot-imx, 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
=====================================================================