From 2808bf2f594f9ffb3017481b3f3b0940bbc29012 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 14 Nov 2021 21:29:04 +0800
Subject: [PATCH] update uboot patch file, add bbl env support
---
bsp/bootloader/patch/uboot-imx-imx6ull.patch | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/bsp/bootloader/patch/uboot-imx-imx6ull.patch b/bsp/bootloader/patch/uboot-imx-imx6ull.patch
index ffdea30..d33f2e4 100644
--- a/bsp/bootloader/patch/uboot-imx-imx6ull.patch
+++ b/bsp/bootloader/patch/uboot-imx-imx6ull.patch
@@ -1,6 +1,6 @@
diff -Nuar uboot-imx/arch/arm/dts/imx6ul-14x14-evk.dtsi uboot-imx-imx6ull/arch/arm/dts/imx6ul-14x14-evk.dtsi
--- uboot-imx/arch/arm/dts/imx6ul-14x14-evk.dtsi 2021-09-06 16:48:23.000000000 +0800
-+++ uboot-imx-imx6ull/arch/arm/dts/imx6ul-14x14-evk.dtsi 2021-11-14 13:27:59.306153563 +0800
++++ uboot-imx-imx6ull/arch/arm/dts/imx6ul-14x14-evk.dtsi 2021-11-14 19:56:16.924626040 +0800
@@ -83,6 +83,9 @@
pinctrl-0 = <&pinctrl_enet1>;
phy-mode = "rmii";
@@ -98,8 +98,8 @@
};
diff -Nuar uboot-imx/.cfg-imx6ull uboot-imx-imx6ull/.cfg-imx6ull
--- uboot-imx/.cfg-imx6ull 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-imx6ull/.cfg-imx6ull 2021-11-14 13:57:01.556273286 +0800
-@@ -0,0 +1,1648 @@
++++ uboot-imx-imx6ull/.cfg-imx6ull 2021-11-14 21:11:40.019795524 +0800
+@@ -0,0 +1,1644 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# U-Boot 2021.04 Configuration
@@ -330,7 +330,7 @@
+# CONFIG_IMX_OPTEE_DEK_ENCAP is not set
+# CONFIG_IMX_SECO_DEK_ENCAP is not set
+# CONFIG_CMD_HDMIDETECT is not set
-+CONFIG_CMD_QSPIHDR=y
++# CONFIG_CMD_QSPIHDR is not set
+# CONFIG_IMX_CAAM_MFG_PROT is not set
+# CONFIG_IMX_SECO_MFG_PROT is not set
+# CONFIG_DBG_MONITOR is not set
@@ -365,7 +365,7 @@
+# General setup
+#
+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
++# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_OPTIMIZE_INLINING is not set
+CONFIG_CC_HAS_ASM_INLINE=y
@@ -520,7 +520,7 @@
+CONFIG_CMDLINE_EDITING=y
+CONFIG_AUTO_COMPLETE=y
+CONFIG_SYS_LONGHELP=y
-+CONFIG_SYS_PROMPT="=> "
++CONFIG_SYS_PROMPT="[u-boot@iMX6ULL]# "
+CONFIG_SYS_PROMPT_HUSH_PS2="> "
+CONFIG_SYS_XTRACE="y"
+
@@ -540,30 +540,27 @@
+#
+# Boot commands
+#
-+CONFIG_CMD_BOOTD=y
++# CONFIG_CMD_BOOTD is not set
+CONFIG_CMD_BOOTM=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_BOOTM_LINUX=y
-+CONFIG_BOOTM_NETBSD=y
++# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_OPENRTOS is not set
+# CONFIG_BOOTM_OSE is not set
-+CONFIG_BOOTM_PLAN9=y
-+CONFIG_BOOTM_RTEMS=y
-+CONFIG_BOOTM_VXWORKS=y
-+CONFIG_CMD_BOOTEFI=y
-+CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
-+# CONFIG_CMD_BOOTEFI_HELLO is not set
-+# CONFIG_CMD_BOOTEFI_SELFTEST is not set
++# CONFIG_BOOTM_PLAN9 is not set
++# CONFIG_BOOTM_RTEMS is not set
++# CONFIG_BOOTM_VXWORKS is not set
++# CONFIG_CMD_BOOTEFI is not set
+# CONFIG_CMD_BOOTMENU is not set
+# CONFIG_CMD_ADTIMG is not set
+# CONFIG_CMD_ABOOTIMG is not set
-+CONFIG_CMD_ELF=y
++# CONFIG_CMD_ELF is not set
+CONFIG_CMD_FDT=y
+CONFIG_CMD_GO=y
+CONFIG_CMD_RUN=y
+CONFIG_CMD_IMI=y
+# CONFIG_CMD_IMLS is not set
-+CONFIG_CMD_XIMG=y
++# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FSL_CAAM_KB is not set
+# CONFIG_CMD_THOR_DOWNLOAD is not set
+# CONFIG_CMD_ZBOOT is not set
@@ -574,7 +571,7 @@
+# CONFIG_CMD_ASKENV is not set
+CONFIG_CMD_EXPORTENV=y
+CONFIG_CMD_IMPORTENV=y
-+CONFIG_CMD_EDITENV=y
++# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_GREPENV is not set
+CONFIG_CMD_SAVEENV=y
+# CONFIG_CMD_ERASEENV is not set
@@ -836,7 +833,7 @@
+CONFIG_NET=y
+# CONFIG_PROT_UDP is not set
+# CONFIG_BOOTP_SEND_HOSTNAME is not set
-+# CONFIG_NET_RANDOM_ETHADDR is not set
++CONFIG_NET_RANDOM_ETHADDR=y
+# CONFIG_NETCONSOLE is not set
+# CONFIG_IP_DEFRAG is not set
+CONFIG_TFTP_BLOCKSIZE=1468
@@ -1739,7 +1736,6 @@
+# CONFIG_EFI_LOAD_FILE2_INITRD is not set
+# CONFIG_EFI_SECURE_BOOT is not set
+# CONFIG_TEST_FDTDEC is not set
-+CONFIG_LIB_ELF=y
+# CONFIG_PHANDLE_CHECK_SEQ is not set
+# CONFIG_UNIT_TEST is not set
+# CONFIG_SPL_UNIT_TEST is not set
@@ -1750,7 +1746,7 @@
+CONFIG_MKIMAGE_DTC_PATH="dtc"
diff -Nuar uboot-imx/drivers/net/phy/phy.c uboot-imx-imx6ull/drivers/net/phy/phy.c
--- uboot-imx/drivers/net/phy/phy.c 2021-09-06 16:48:23.000000000 +0800
-+++ uboot-imx-imx6ull/drivers/net/phy/phy.c 2021-11-14 13:28:43.737904373 +0800
++++ uboot-imx-imx6ull/drivers/net/phy/phy.c 2021-11-14 19:56:16.924626040 +0800
@@ -182,6 +182,9 @@
{
int result;
@@ -1763,8 +1759,8 @@
diff -Nuar uboot-imx/include/configs/mx6ullevk.h uboot-imx-imx6ull/include/configs/mx6ullevk.h
--- uboot-imx/include/configs/mx6ullevk.h 2021-09-06 16:48:23.000000000 +0800
-+++ uboot-imx-imx6ull/include/configs/mx6ullevk.h 2021-11-14 13:53:59.469274456 +0800
-@@ -100,124 +100,33 @@
++++ uboot-imx-imx6ull/include/configs/mx6ullevk.h 2021-11-14 20:55:47.745008838 +0800
+@@ -100,124 +100,34 @@
#else
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -1900,13 +1896,24 @@
+ "tftp $loadaddr $image; tftp $fdt_addr ${fdt_file};" \
+ "run mmcargs; " \
+ "bootz ${loadaddr} - ${fdt_addr}\0" \
-+ "bootcmd=run mmcboot\0"
++ "bootcmd=run mmcboot\0" \
++ "bbl=tftp ${loadaddr} u-boot-imx6ull-emmc.imx && mmc dev ${mmcdev} 1 && mmc write ${loadaddr} 2 0x500\0"
#endif
/* Miscellaneous configurable options */
+@@ -238,7 +148,9 @@
+ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
+ /* environment organization */
++#ifndef CONFIG_SYS_MMC_ENV_DEV
+ #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */
++#endif
+ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
+
+ #define CONFIG_IOMUX_LPSR
diff -Nuar uboot-imx/Makefile uboot-imx-imx6ull/Makefile
--- uboot-imx/Makefile 2021-09-06 16:48:23.000000000 +0800
-+++ uboot-imx-imx6ull/Makefile 2021-11-14 13:54:05.045108519 +0800
++++ uboot-imx-imx6ull/Makefile 2021-11-14 21:05:41.391745547 +0800
@@ -263,6 +263,9 @@
CROSS_COMPILE ?=
endif
--
Gitblit v1.9.1