Update uboot patch to add camera and extra dtoverlays support

guowenxue

2022-06-12 0365e3e471c3df1c0a76d05dde7214d24d3f453d

 bsp/bootloader/patch/uboot-imx-igkboard.patch

@@ -1,6 +1,6 @@
diff -Nuar uboot-imx/arch/arm/dts/imx6ul-14x14-evk.dtsi uboot-imx-igkboard/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-igkboard/arch/arm/dts/imx6ul-14x14-evk.dtsi   2021-12-18 19:24:57.848022011 +0800
+++ uboot-imx-igkboard/arch/arm/dts/imx6ul-14x14-evk.dtsi   2022-01-17 11:43:49.571146566 +0800
@@ -21,7 +21,6 @@
       regulator-name = "VSD_3V3";
       regulator-min-microvolt = <3300000>;
@@ -117,7 +117,7 @@
 
diff -Nuar uboot-imx/configs/igkboard_defconfig uboot-imx-igkboard/configs/igkboard_defconfig
--- uboot-imx/configs/igkboard_defconfig   1970-01-01 08:00:00.000000000 +0800
+++ uboot-imx-igkboard/configs/igkboard_defconfig   2021-12-26 19:59:10.026382816 +0800
+++ uboot-imx-igkboard/configs/igkboard_defconfig   2022-03-27 21:51:34.908762785 +0800
@@ -0,0 +1,96 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
@@ -217,8 +217,8 @@
+CONFIG_SPLASH_SCREEN_ALIGN=y
diff -Nuar uboot-imx/drivers/fastboot/fb_fsl/fb_fsl_partitions.c uboot-imx-igkboard/drivers/fastboot/fb_fsl/fb_fsl_partitions.c
--- uboot-imx/drivers/fastboot/fb_fsl/fb_fsl_partitions.c   2021-09-06 16:48:23.000000000 +0800
+++ uboot-imx-igkboard/drivers/fastboot/fb_fsl/fb_fsl_partitions.c   2021-12-26 19:34:18.512291074 +0800
@@ -185,6 +185,10 @@
+++ uboot-imx-igkboard/drivers/fastboot/fb_fsl/fb_fsl_partitions.c   2022-01-17 11:43:49.571146566 +0800
@@ -185,6 +185,12 @@
          boot_partition = FASTBOOT_MMC_BOOT_PARTITION_ID;
          user_partition = FASTBOOT_MMC_USER_PARTITION_ID;
       }
@@ -226,12 +226,14 @@
+      /* add by guowenxue to export mmc_no env */
+      env_set_ulong("mmc_no", mmc_no);
+      env_set_ulong("mmcdev", mmc_no);
+      env_set_ulong("emmc_dev", mmc_no);
+      env_set_ulong("emmc_ack", mmc_no);
    } else {
       printf("Can't setup partition table on this device %d\n",
          fastboot_devinfo.type);
diff -Nuar uboot-imx/drivers/net/phy/phy.c uboot-imx-igkboard/drivers/net/phy/phy.c
--- uboot-imx/drivers/net/phy/phy.c   2021-09-06 16:48:23.000000000 +0800
+++ uboot-imx-igkboard/drivers/net/phy/phy.c   2021-12-18 19:24:57.848022011 +0800
+++ uboot-imx-igkboard/drivers/net/phy/phy.c   2022-01-17 11:43:49.575146507 +0800
@@ -182,6 +182,9 @@
 {
    int result;
@@ -244,22 +246,20 @@
 
diff -Nuar uboot-imx/include/configs/mx6ullevk.h uboot-imx-igkboard/include/configs/mx6ullevk.h
--- uboot-imx/include/configs/mx6ullevk.h   2021-09-06 16:48:23.000000000 +0800
+++ uboot-imx-igkboard/include/configs/mx6ullevk.h   2021-12-26 19:43:02.601118471 +0800
@@ -100,124 +100,38 @@
+++ uboot-imx-igkboard/include/configs/mx6ullevk.h   2022-03-27 20:50:01.809573426 +0800
@@ -100,124 +100,36 @@
 
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS \
-   CONFIG_MFG_ENV_SETTINGS \
-   TEE_ENV \
+    "emmc_dev=${mmc_no}\0"\
+    "emmc_ack=${mmc_no}\0"\
    "script=boot.scr\0" \
    "image=zImage\0" \
    "console=ttymxc0\0" \
-   "fdt_high=0xffffffff\0" \
-   "initrd_high=0xffffffff\0" \
-   "fdt_file=undefined\0" \
+   "fdt_file=igkboard-emmc.dtb\0" \
+   "fdt_file=igkboard.dtb\0" \
    "fdt_addr=0x83000000\0" \
-   "tee_addr=0x84000000\0" \
-   "tee_file=undefined\0" \
@@ -280,7 +280,7 @@
+    "ipaddr=192.168.2.22\0" \
+    "serverip=192.168.2.2\0" \
+    "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+    "mmcargs=setenv bootargs console=${console},${baudrate} root=/dev/mmcblk${mmc_no}p2 rootwait rw\0" \
+    "mmcargs=setenv bootargs console=${console},${baudrate} root=/dev/mmcblk${mmc_no}p2 rootwait rw net.ifnames=0\0" \
+    "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+    "bootscript=echo Running bootscript from mmc ...; source\0" \
    "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
@@ -393,7 +393,7 @@
 #endif
 
 /* Miscellaneous configurable options */
@@ -238,7 +152,9 @@
@@ -238,7 +150,9 @@
    (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
@@ -405,7 +405,7 @@
 #define CONFIG_IOMUX_LPSR
diff -Nuar uboot-imx/Makefile uboot-imx-igkboard/Makefile
--- uboot-imx/Makefile   2021-09-06 16:48:23.000000000 +0800
+++ uboot-imx-igkboard/Makefile   2021-12-26 19:58:58.142407641 +0800
+++ uboot-imx-igkboard/Makefile   2022-03-27 20:50:05.745527305 +0800
@@ -263,6 +263,9 @@
 CROSS_COMPILE ?=
 endif