From 22a5a94a297df6ccf79f2864824ef49a219caa8b Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Tue, 16 Nov 2021 20:44:48 +0800
Subject: [PATCH] update uboot patch to add boot command
---
bsp/bootloader/patch/uboot-imx-imx6ull.patch | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/bsp/bootloader/patch/uboot-imx-imx6ull.patch b/bsp/bootloader/patch/uboot-imx-imx6ull.patch
index 7fc1098..5a6438a 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-16 12:55:12.665468988 +0800
@@ -83,6 +83,9 @@
pinctrl-0 = <&pinctrl_enet1>;
phy-mode = "rmii";
@@ -98,7 +98,7 @@
};
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 14:19:38.710849946 +0800
++++ uboot-imx-imx6ull/.cfg-imx6ull 2021-11-16 20:42:43.127648377 +0800
@@ -0,0 +1,1644 @@
+#
+# Automatically generated file; DO NOT EDIT.
@@ -540,7 +540,7 @@
+#
+# Boot commands
+#
-+# CONFIG_CMD_BOOTD is not set
++CONFIG_CMD_BOOTD=y
+CONFIG_CMD_BOOTM=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_BOOTM_LINUX=y
@@ -1746,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-16 12:55:12.665468988 +0800
@@ -182,6 +182,9 @@
{
int result;
@@ -1759,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 14:04:39.590289783 +0800
-@@ -100,124 +100,33 @@
++++ uboot-imx-imx6ull/include/configs/mx6ullevk.h 2021-11-16 12:55:12.665468988 +0800
+@@ -100,124 +100,34 @@
#else
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -1896,11 +1896,12 @@
+ "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 +147,9 @@
+@@ -238,7 +148,9 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* environment organization */
@@ -1912,7 +1913,7 @@
#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 14:17:15.073367046 +0800
++++ uboot-imx-imx6ull/Makefile 2021-11-16 20:40:25.974293682 +0800
@@ -263,6 +263,9 @@
CROSS_COMPILE ?=
endif
--
Gitblit v1.9.1