Merge tag 'u-boot-imx-20190405' of git://git.denx.de/u-boot-imx

Fixes for 2019.04 - fix bashism for MX8 - fix ethernet for MX53 - fix docs for i.MX8
imaami · Apr 5, 2019 · 0e62d5b · 0e62d5b
2 parents 0e708ab + da60b43
commit 0e62d5b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 25 deletions.
diff --git a/arch/arm/dts/imx53-kp.dts b/arch/arm/dts/imx53-kp.dts
@@ -23,7 +23,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_eth>;
 	phy-mode = "rmii";
-	phy-reset-gpios = <&gpio7 6 0>;
+	phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
 

diff --git a/board/freescale/imx8mq_evk/README b/board/freescale/imx8mq_evk/README
@@ -1,29 +1,30 @@
 U-Boot for the NXP i.MX8MQ EVK board
 
 Quick Start
-====================
+===========
 - Build the ARM Trusted firmware binary
 - Get ddr and hdmi fimware
 - Build U-Boot
 - Boot
 
 Get and Build the ARM Trusted firmware
-====================
+======================================
+Note: srctree is U-Boot source directory
 Get ATF from: https://source.codeaurora.org/external/imx/imx-atf
 branch: imx_4.14.62_1.0.0_beta
 $ make PLAT=imx8mq bl31
+$ cp build/imx8mq/release/bl31.bin $(srctree)
 
 Get the ddr and hdmi firmware
-====================
-Note: srctree is U-Boot source directory
+=============================
 $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-7.9.bin
 $ chmod +x firmware-imx-7.9.bin
 $ ./firmware-imx-7.9.bin
 $ cp firmware-imx-7.9/firmware/hdmi/cadence/signed_hdmi_imx8m.bin $(srctree)
-$ cp firmware-imx-7.9/firmware/ddr/synopsys/lpddr4*.bin $(srctee)
+$ cp firmware-imx-7.9/firmware/ddr/synopsys/lpddr4*.bin $(srctree)
 
 Build U-Boot
-====================
+============
 $ export CROSS_COMPILE=aarch64-poky-linux-
 $ make imx8mq_evk_defconfig
 $ make flash.bin
@@ -32,5 +33,5 @@ Burn the flash.bin to MicroSD card offset 33KB
 $sudo dd if=flash.bin of=/dev/sd[x] bs=1024 seek=33
 
 Boot
-====================
+====
 Set Boot switch SW801: 1100 and Bmode: 10 to boot from Micro SD.
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
@@ -19,10 +19,6 @@
 #define CONFIG_FEC_MXC
 #endif
 
-/* SPI FLASH */
-#ifdef CONFIG_CMD_SF
-#endif
-
 /* Boot Linux */
 #define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_BOOTCOMMAND	"bootm"

diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
@@ -34,9 +34,6 @@
 #define CONFIG_ENV_SECT_SIZE		0x10000	/* 64k */
 #endif
 
-#ifdef CONFIG_CMD_SF
-#endif
-
 /*
  * max 4k env size is enough, but in case of nand
  * it has to be rounded to sector size

diff --git a/include/configs/ds109.h b/include/configs/ds109.h
@@ -37,9 +37,6 @@
 #define CONFIG_ENV_SECT_SIZE		0x10000	/* 64k */
 #endif
 
-#ifdef CONFIG_CMD_SF
-#endif
-
 /*
  * max 4k env size is enough, but in case of nand
  * it has to be rounded to sector size

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
@@ -34,9 +34,6 @@
 
 /* SPI NOR Flash default params, used by sf commands */
 
-#if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
-#endif
-
 /* Reserve 4 MB for malloc */
 #define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
 

diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
@@ -20,8 +20,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_ESDHC_NUM	1
 
-/* Eth Configs */
-
 /* USB Configs */
 #define CONFIG_USB_EHCI_MX5
 #define CONFIG_MXC_USB_PORT	1

diff --git a/tools/imx8m_image.sh b/tools/imx8m_image.sh
@@ -12,7 +12,7 @@ blobs=`awk '/^SIGNED_HDMI/ {print $2} /^LOADER/ {print $2} /^SECOND_LOADER/ {pri
 for f in $blobs; do
 	tmp=$srctree/$f
 
-	if [ $f == "spl/u-boot-spl-ddr.bin" ] || [ $f == "u-boot.itb" ]; then
+	if [ $f = "spl/u-boot-spl-ddr.bin" ] || [ $f = "u-boot.itb" ]; then
 		continue
 	fi
 
@@ -28,7 +28,7 @@ for f in $blobs; do
 	sed -in "s;$f;$tmp;" $file
 done
 
-if [ $post_process == 1 ]; then
+if [ $post_process = 1 ]; then
 	if [ -f $srctree/lpddr4_pmu_train_1d_imem.bin ]; then
 		objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 $srctree/lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
 		objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 $srctree/lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_dmem_pad.bin