From 27b24eaaf0dafbeec0a317c7c75ba9efe50fe58b Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Mon, 27 Dec 2021 21:29:49 +0800 Subject: [PATCH] update uboot patch to fix fastboot mode failed bug --- bsp/bootloader/patch/uboot-imx-igkboard.patch | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bsp/bootloader/patch/uboot-imx-igkboard.patch b/bsp/bootloader/patch/uboot-imx-igkboard.patch index 3c02384..083b4eb 100644 --- a/bsp/bootloader/patch/uboot-imx-igkboard.patch +++ b/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 2021-12-27 17:34:17.925670562 +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 2021-12-27 21:28:57.371632449 +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 2021-12-27 19:10:28.608974060 +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 2021-12-27 17:34:17.929670552 +0800 @@ -182,6 +182,9 @@ { int result; @@ -244,15 +246,13 @@ 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 2021-12-27 19:11:09.428964256 +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" \ @@ -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 2021-12-27 19:28:00.507661085 +0800 @@ -263,6 +263,9 @@ CROSS_COMPILE ?= endif -- Gitblit v1.9.1