Update uboot-imx-lf-5.15.71-2.2.0.patch for dtoverlay

guowenxue

2023-07-25 94fa46559f9e6d121c37483537eed0e805e93d44

 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:36:12.607782484 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/arch/arm/dts/igkboard-6ull.dts   2023-07-25 21:54:32.019973571 +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:12:57.452322005 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/arch/arm/dts/Makefile   2023-07-25 21:54:32.019973571 +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:12:57.452322005 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/arch/arm/mach-imx/mx6/Kconfig   2023-07-25 21:54:32.023973675 +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:51:08.994194694 +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
@@ -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:12:57.452322005 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/imximage.cfg   2023-07-25 21:54:32.023973675 +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:12:57.452322005 +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
@@ -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:12:57.452322005 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/Kconfig   2023-07-25 21:54:32.023973675 +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:12:57.452322005 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/MAINTAINERS   2023-07-25 21:54:32.023973675 +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:12:57.452322005 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/Makefile   2023-07-25 21:54:32.023973675 +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:12:57.452322005 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/board/lingyun/igkboard-6ull/plugin.S   2023-07-25 21:54:32.023973675 +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:12:57.452322005 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/configs/igkboard-6ull_defconfig   2023-07-25 21:54:32.023973675 +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:12:57.452322005 +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
@@ -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:12:57.452322005 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/drivers/net/phy/phy.c   2023-07-25 21:54:32.023973675 +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:31:04.746971120 +0800
+++ uboot-imx-lf-5.15.71-2.2.0/include/configs/igkboard-6ull.h   2023-07-25 21:54:32.023973675 +0800
@@ -0,0 +1,135 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
@@ -1626,8 +1626,8 @@
+#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 21:12:57.452322005 +0800
@@ -0,0 +1,64 @@
+++ uboot-imx-lf-5.15.71-2.2.0/include/configs/igkboard-dtoverlay.h   2023-07-25 22:03:43.864670190 +0800
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2023 LingYun IoT System Studio
@@ -1645,43 +1645,39 @@
+    "fdt resize ${fdt_size}; " \
+    "fdt apply ${dtbo_addr}; "
+
+#define CHECK_APPLY_OVERLAY_VAL( name )     \
+    "if env exists dtoverlay_" name " ; then " \
+        "setenv dtbo_file " name "-${dtoverlay_" name "}.dtbo; " \
+        FDT_APPLY_OVERLAY() \
+    "fi; "
+
+#define CHECK_APPLY_OVERLAY_EXT( name )     \
+#define CHECK_APPLY_OVERLAY( name )     \
+    "if env exists dtoverlay_" name " && test ${dtoverlay_" name "} = 1 -o ${dtoverlay_" name "} = yes ; then " \
+        "setenv dtbo_file ext-" name ".dtbo; " \
+        "setenv dtbo_file " name ".dtbo; " \
+        FDT_APPLY_OVERLAY() \
+    "fi; "
+
+#define CHECK_APPLY_OVERLAY_IDX( name )     \
+#define CHECK_APPLY_OVERLAYS_IDX( name )     \
+    "if env exists dtoverlay_" name "; then " \
+        "for i in ${dtoverlay_" name "}; do " \
+            "setenv dtbo_file ext-" name "$i.dtbo; " \
+            "setenv dtbo_file " name "$i.dtbo; " \
+            FDT_APPLY_OVERLAY() \
+        " done;" \
+    "fi; "
+
+#define CHECK_APPLY_OVERLAY_DTBO( name )     \
+#define CHECK_APPLY_OVERLAYS_DTBO( name )     \
+    "if env exists dtoverlay_" name "; then " \
+        "for f in ${dtoverlay_" name "}; do " \
+            "setenv dtbo_file $f; " \
+            "setenv dtbo_file $f.dtbo; " \
+            FDT_APPLY_OVERLAY() \
+        " done;" \
+    "fi; "
+
+#define FDT_ENTRY_DEF_SETTINGS          \
+                CHECK_APPLY_OVERLAY_VAL("camera") \
+                CHECK_APPLY_OVERLAY_VAL("display") \
+                CHECK_APPLY_OVERLAY_IDX("pwm") \
+                CHECK_APPLY_OVERLAY_IDX("i2c") \
+                CHECK_APPLY_OVERLAY_IDX("spi") \
+                CHECK_APPLY_OVERLAY_IDX("uart") \
+                CHECK_APPLY_OVERLAY_IDX("can") \
+                CHECK_APPLY_OVERLAY_DTBO("extra") \
+                CHECK_APPLY_OVERLAY("lcd") \
+                CHECK_APPLY_OVERLAY("cam") \
+                CHECK_APPLY_OVERLAY("w1") \
+                CHECK_APPLY_OVERLAY("adc") \
+                CHECK_APPLY_OVERLAYS_IDX("i2c") \
+                CHECK_APPLY_OVERLAYS_IDX("spi") \
+                CHECK_APPLY_OVERLAYS_IDX("uart") \
+                CHECK_APPLY_OVERLAYS_IDX("can") \
+                CHECK_APPLY_OVERLAYS_IDX("pwm") \
+                CHECK_APPLY_OVERLAYS_DTBO("extra") \
+
+
+#define MMC_BOOT_WITH_FDT_OVERLAY   \