From 894137cedecc302f52a364b3600dc66735861208 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Thu, 18 Nov 2021 23:31:48 +0800
Subject: [PATCH] update uboot patch, add default network configure and bsys write kernel image support
---
bsp/bootloader/patch/uboot-imx-imx6ull.patch | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/bsp/bootloader/patch/uboot-imx-imx6ull.patch b/bsp/bootloader/patch/uboot-imx-imx6ull.patch
index 592944c..d74e894 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-18 22:35:34.620799096 +0800
++++ uboot-imx-imx6ull/arch/arm/dts/imx6ul-14x14-evk.dtsi 2021-11-18 23:10:05.829844713 +0800
@@ -21,7 +21,6 @@
regulator-name = "VSD_3V3";
regulator-min-microvolt = <3300000>;
@@ -117,7 +117,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-18 22:36:39.757531746 +0800
++++ uboot-imx-imx6ull/.cfg-imx6ull 2021-11-18 23:30:36.483282592 +0800
@@ -0,0 +1,1644 @@
+#
+# Automatically generated file; DO NOT EDIT.
@@ -1765,7 +1765,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-18 22:30:18.524715432 +0800
++++ uboot-imx-imx6ull/drivers/net/phy/phy.c 2021-11-18 23:10:05.841844591 +0800
@@ -182,6 +182,9 @@
{
int result;
@@ -1778,8 +1778,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-18 22:30:18.524715432 +0800
-@@ -100,124 +100,34 @@
++++ uboot-imx-imx6ull/include/configs/mx6ullevk.h 2021-11-18 23:29:50.028951132 +0800
+@@ -100,124 +100,39 @@
#else
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -1800,6 +1800,8 @@
- "boot_fdt=try\0" \
- "ip_dyn=yes\0" \
"splashimage=0x8c000000\0" \
++ "ipaddr=192.168.2.22\0" \
++ "serverip=192.168.2.2\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
@@ -1817,6 +1819,9 @@
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
- "loadtee=fatload mmc ${mmcdev}:${mmcpart} ${tee_addr} ${tee_file}\0" \
++ "bdtb=tftp $fdt_addr $fdt_file && fatwrite mmc 1:1 $fdt_addr $fdt_file $filesize\0" \
++ "bker=tftp $loadaddr $image&& fatwrite mmc 1:1 $loadaddr $image $filesize\0" \
++ "bsys=run bdtb && run bker\0" \
"mmcboot=echo Booting from mmc ...; " \
+ "mmc dev ${mmcdev}; " \
+ "run loadimage; run loadfdt; " \
@@ -1920,7 +1925,7 @@
#endif
/* Miscellaneous configurable options */
-@@ -238,7 +148,9 @@
+@@ -238,7 +153,9 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* environment organization */
@@ -1932,7 +1937,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-18 22:35:40.404865360 +0800
++++ uboot-imx-imx6ull/Makefile 2021-11-18 23:29:54.408791442 +0800
@@ -263,6 +263,9 @@
CROSS_COMPILE ?=
endif
--
Gitblit v1.9.1