Manually build u-boot to add traceimx_v2018.03_4.14.78_1.0.0_ga-mbl-debugging-removing-spl

Also fix some build failures in manual build case.

Signed-off-by: Jun Nie <jun.nie@linaro.org>

6 files changed, 47 insertions, 11 deletions

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 2715b3b3d4..5c3c574db6 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -26,6 +26,7 @@ u32 spl_boot_device(void)
 	unsigned int bmode = readl(&src_base->sbmr2);
 	u32 reg = imx6_src_get_boot_mode();
 
+#if 0
 	/*
 	 * Check for BMODE if serial downloader is enabled
 	 * BOOT_MODE - see IMX6DQRM Table 8-1
@@ -44,6 +45,7 @@ u32 spl_boot_device(void)
 	 */
 	if (is_usbotg_phy_active())
 		return BOOT_DEVICE_BOARD;
+#endif
 
 	/* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */
 	switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) {
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index 8ceea9c36b..3975223ab4 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -194,6 +194,7 @@ int power_init_board(void)
 
 void spl_board_init(void)
 {
+#if 0
 #ifndef CONFIG_SPL_USB_SDP_SUPPORT
 	/* Serial download mode */
 	if (is_usb_boot()) {
@@ -201,6 +202,7 @@ void spl_board_init(void)
 		restore_boot_params();
 	}
 #endif
+#endif
 	puts("Normal Boot\n");
 }
 
diff --git a/build64.sh b/build64.sh
new file mode 100644
index 0000000000..4da34d418d
--- /dev/null
+++ b/build64.sh
@@ -0,0 +1,17 @@
+export PATH=/home/niej/toolchain/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu/bin:$PATH
+echo $PATH
+export CROSS_COMPILE=aarch64-linux-gnu-
+export ARCH=arm64
+rm spl/*bin
+#make sopine_baseboard_defconfig
+make imx8mm_evk_defconfig
+#make imx8mm_evk_mbl_defconfig
+#make mkimage
+#make pine64_plus_defconfig 
+#make menuconfig
+make savedefconfig
+make -j4 2>&1
+make u-boot.itb
+#make -j4 flash.bin
+#make u-boot.dtb
+
diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
index 529ed44f61..1b0bce01f5 100644
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -29,7 +29,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_OF_CONTROL=y
 CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
+#CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FSL_FASTBOOT=y
@@ -57,19 +57,21 @@ CONFIG_DM_SPI=y
 CONFIG_FSL_FSPI=y
 CONFIG_NXP_TMU=y
 CONFIG_DM_THERMAL=y
-CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB=n
+CONFIG_USB_GADGET=n
+CONFIG_DM_USB=n
+CONFIG_USB_EHCI_HCD=n
 
-CONFIG_SPL_USB_HOST_SUPPORT=y
-CONFIG_SPL_USB_GADGET_SUPPORT=y
-CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_HOST_SUPPORT=n
+CONFIG_SPL_USB_GADGET_SUPPORT=n
 CONFIG_SDP_LOADADDR=0x40400000
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 
-CONFIG_VIDEO=y
-CONFIG_IMX_SEC_MIPI_DSI=y
-CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_SPL_USB_SDP_SUPPORT=n
+CONFIG_USB_STORAGE=n
+CONFIG_ANDROID_BOOT_IMAGE=n
+CONFIG_DEBUG=y
+CONFIG_MMC_VERBOSE=y
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index cb454d55b1..5bc37112b2 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -404,6 +404,16 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc,
 	u32	flags = IRQSTAT_CC | IRQSTAT_CTOE;
 	struct fsl_esdhc *regs = priv->esdhc_regs;
 
+#if 0
+if (cmd->cmdidx == 8)
+{
+	int lop;
+	unsigned u32 *ptr= &regs->dsaddr;
+	for(lop = 0; lop <= 0x100; lop +=4, ptr++) {
+		printf("off 0x%x val 0x%08x\n", ptr, esdhc_read32(ptr));
+	}
+}
+#endif
 #ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC111
 	if (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION)
 		return 0;
@@ -1537,6 +1547,7 @@ static int fsl_esdhc_probe(struct udevice *dev)
 	init_clk_usdhc(dev->seq);
 
 	priv->sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK + dev->seq);
+dev_err(dev, "get clk %d\n", priv->sdhc_clk);
 	if (priv->sdhc_clk <= 0) {
 		dev_err(dev, "Unable to get clk for %s\n", dev->name);
 		return -EINVAL;
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 0a7191319f..1371c630e3 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -361,6 +361,7 @@
 #define CONFIG_SYS_I2C_SPEED		100000
 
 /* USB configs */
+#if 0
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE
@@ -371,6 +372,7 @@
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 #endif
+#endif
 
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_GADGET_VBUS_DRAW 2