From fd98cb482a921146e7b8b73b70c14143277f0e36 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Tue, 25 Jul 2023 22:55:30 +0800
Subject: [PATCH] Update uboot-imx-lf-5.15.71-2.2.0.patch to fix bbl and loadfdt not work bug
---
bootloader/patches/igkboard-6ull/uboot-imx-lf-5.15.71-2.2.0.patch | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/bootloader/patches/igkboard-6ull/uboot-imx-lf-5.15.71-2.2.0.patch b/bootloader/patches/igkboard-6ull/uboot-imx-lf-5.15.71-2.2.0.patch
index aa12576..319de7b 100644
--- a/bootloader/patches/igkboard-6ull/uboot-imx-lf-5.15.71-2.2.0.patch
+++ b/bootloader/patches/igkboard-6ull/uboot-imx-lf-5.15.71-2.2.0.patch
@@ -1,6 +1,6 @@
diff -Nuar -x tools uboot-imx/arch/arm/dts/igkboard-6ull.dts uboot-imx-lf-5.15.71-2.2.0/arch/arm/dts/igkboard-6ull.dts
--- uboot-imx/arch/arm/dts/igkboard-6ull.dts 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/arch/arm/dts/igkboard-6ull.dts 2023-07-25 21:54:32.019973571 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/arch/arm/dts/igkboard-6ull.dts 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,377 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+//
@@ -381,7 +381,7 @@
+};
diff -Nuar -x tools uboot-imx/arch/arm/dts/Makefile uboot-imx-lf-5.15.71-2.2.0/arch/arm/dts/Makefile
--- uboot-imx/arch/arm/dts/Makefile 2023-03-01 18:01:20.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/arch/arm/dts/Makefile 2023-07-25 21:54:32.019973571 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/arch/arm/dts/Makefile 2023-07-25 22:34:02.088832373 +0800
@@ -871,6 +871,7 @@
imx6ull-kontron-n641x-s.dtb
@@ -392,7 +392,7 @@
imx6ull-14x14-ddr3-val-emmc.dtb \
diff -Nuar -x tools uboot-imx/arch/arm/mach-imx/mx6/Kconfig uboot-imx-lf-5.15.71-2.2.0/arch/arm/mach-imx/mx6/Kconfig
--- uboot-imx/arch/arm/mach-imx/mx6/Kconfig 2023-03-01 18:01:20.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/arch/arm/mach-imx/mx6/Kconfig 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/arch/arm/mach-imx/mx6/Kconfig 2023-07-25 22:34:02.088832373 +0800
@@ -157,6 +157,16 @@
prompt "MX6 board select"
optional
@@ -419,7 +419,7 @@
endif
diff -Nuar -x tools uboot-imx/board/lingyun/igkboard-6ull/igkboard-6ull.c uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/igkboard-6ull.c
--- uboot-imx/board/lingyun/igkboard-6ull/igkboard-6ull.c 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/igkboard-6ull.c 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/igkboard-6ull.c 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,362 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
@@ -785,7 +785,7 @@
+}
diff -Nuar -x tools uboot-imx/board/lingyun/igkboard-6ull/imximage.cfg uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/imximage.cfg
--- uboot-imx/board/lingyun/igkboard-6ull/imximage.cfg 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/imximage.cfg 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/imximage.cfg 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,120 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
@@ -909,7 +909,7 @@
+#endif
diff -Nuar -x tools uboot-imx/board/lingyun/igkboard-6ull/imximage_lpddr2.cfg uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/imximage_lpddr2.cfg
--- uboot-imx/board/lingyun/igkboard-6ull/imximage_lpddr2.cfg 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/imximage_lpddr2.cfg 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/imximage_lpddr2.cfg 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
@@ -1038,7 +1038,7 @@
+#endif
diff -Nuar -x tools uboot-imx/board/lingyun/igkboard-6ull/Kconfig uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/Kconfig
--- uboot-imx/board/lingyun/igkboard-6ull/Kconfig 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/Kconfig 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/Kconfig 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,14 @@
+if TARGET_LINGYUN_IGKBOARD_6ULL
+
@@ -1056,7 +1056,7 @@
+endif
diff -Nuar -x tools uboot-imx/board/lingyun/igkboard-6ull/MAINTAINERS uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/MAINTAINERS
--- uboot-imx/board/lingyun/igkboard-6ull/MAINTAINERS 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/MAINTAINERS 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/MAINTAINERS 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,7 @@
+LingYun i.MX6ULL IoT Gateway Board(IGKBoard-6ULL)
+M: Guo Wenxue <guowenxue@gmail.com>
@@ -1067,7 +1067,7 @@
+
diff -Nuar -x tools uboot-imx/board/lingyun/igkboard-6ull/Makefile uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/Makefile
--- uboot-imx/board/lingyun/igkboard-6ull/Makefile 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/Makefile 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/Makefile 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+# (C) Copyright 2016 Freescale Semiconductor, Inc.
@@ -1076,7 +1076,7 @@
+obj-y += ../../freescale/common/mmc.o
diff -Nuar -x tools uboot-imx/board/lingyun/igkboard-6ull/plugin.S uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/plugin.S
--- uboot-imx/board/lingyun/igkboard-6ull/plugin.S 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/plugin.S 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/plugin.S 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,263 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
@@ -1343,7 +1343,7 @@
+#include <asm/arch/mx6_plugin.S>
diff -Nuar -x tools uboot-imx/configs/igkboard-6ull_defconfig uboot-imx-lf-5.15.71-2.2.0/configs/igkboard-6ull_defconfig
--- uboot-imx/configs/igkboard-6ull_defconfig 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/configs/igkboard-6ull_defconfig 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/configs/igkboard-6ull_defconfig 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,113 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
@@ -1460,7 +1460,7 @@
+CONFIG_DM_SERIAL=y
diff -Nuar -x tools uboot-imx/drivers/fastboot/fb_fsl/fb_fsl_partitions.c uboot-imx-lf-5.15.71-2.2.0/drivers/fastboot/fb_fsl/fb_fsl_partitions.c
--- uboot-imx/drivers/fastboot/fb_fsl/fb_fsl_partitions.c 2023-03-01 18:01:21.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/drivers/fastboot/fb_fsl/fb_fsl_partitions.c 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/drivers/fastboot/fb_fsl/fb_fsl_partitions.c 2023-07-25 22:34:02.088832373 +0800
@@ -188,6 +188,11 @@
user_partition = FASTBOOT_MMC_USER_PARTITION_ID;
boot_loader_psize = mmc->capacity_boot;
@@ -1475,7 +1475,7 @@
fastboot_devinfo.type);
diff -Nuar -x tools uboot-imx/drivers/net/phy/phy.c uboot-imx-lf-5.15.71-2.2.0/drivers/net/phy/phy.c
--- uboot-imx/drivers/net/phy/phy.c 2023-03-01 18:01:21.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/drivers/net/phy/phy.c 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/drivers/net/phy/phy.c 2023-07-25 22:34:02.088832373 +0800
@@ -182,6 +182,8 @@
{
int result;
@@ -1487,7 +1487,7 @@
diff -Nuar -x tools uboot-imx/include/configs/igkboard-6ull.h uboot-imx-lf-5.15.71-2.2.0/include/configs/igkboard-6ull.h
--- uboot-imx/include/configs/igkboard-6ull.h 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/include/configs/igkboard-6ull.h 2023-07-25 21:54:32.023973675 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/include/configs/igkboard-6ull.h 2023-07-25 22:54:54.335601637 +0800
@@ -0,0 +1,135 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
@@ -1560,7 +1560,7 @@
+ "envconf=config.txt\0" \
+ "image=zImage\0" \
+ "board=igkboard-6ull\0" \
-+ "fdt_file=${board}.dtb\0" \
++ "fdt_file=igkboard-6ull.dtb\0" \
+ "fdt_size=0x10000\0" \
+ "fdt_addr=0x83000000\0" \
+ "dtbo_addr=0x83010000\0" \
@@ -1576,7 +1576,7 @@
+ "bootos=bootz ${loadaddr} - ${fdt_addr}\0" \
+ "mmcboot=mmc dev ${mmcdev};run mmcargs;run loadimage;run loadfdt;run bootos\0" \
+ "netboot=tftp $loadaddr $image; tftp $fdt_addr ${fdt_file}; run mmcargs; run bootos\0" \
-+ "bbl=tftp ${loadaddr} u-boot-${board}.imx && mmc dev ${mmcdev} 1 && mmc write ${loadaddr} 2 0x500\0" \
++ "bbl=tftp ${loadaddr} u-boot-${board}.imx && mmc dev ${mmcdev} 1 && mmc write ${loadaddr} 2 0x800\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"
@@ -1626,7 +1626,7 @@
+#endif
diff -Nuar -x tools uboot-imx/include/configs/igkboard-dtoverlay.h uboot-imx-lf-5.15.71-2.2.0/include/configs/igkboard-dtoverlay.h
--- uboot-imx/include/configs/igkboard-dtoverlay.h 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-lf-5.15.71-2.2.0/include/configs/igkboard-dtoverlay.h 2023-07-25 22:03:43.864670190 +0800
++++ uboot-imx-lf-5.15.71-2.2.0/include/configs/igkboard-dtoverlay.h 2023-07-25 22:34:02.088832373 +0800
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
--
Gitblit v1.9.1