diff --git a/config/sources/families/meson-s4t7.conf b/config/sources/families/meson-s4t7.conf index 0a5967b29a..8ee22e9db3 100644 --- a/config/sources/families/meson-s4t7.conf +++ b/config/sources/families/meson-s4t7.conf @@ -27,7 +27,7 @@ esac # Lets build uboot from source BOOTSOURCE="${GITHUB_SOURCE}/khadas/u-boot.git" -BOOTBRANCH="tag:khadas-vims-u-boot-2019.01-v1.6.4-release" +BOOTBRANCH="branch:khadas-vims-v2019.01" BOOTPATCHDIR="u-boot-meson-s4t7" BOOTENV_FILE='meson.txt' BOOTSCRIPT="boot-meson-s4t7.cmd:boot.cmd" diff --git a/patch/u-boot/u-boot-meson-s4t7/Revert-emmc-enable-hs-SD-adjust-function-in-uboot-20.patch b/patch/u-boot/u-boot-meson-s4t7/Revert-emmc-enable-hs-SD-adjust-function-in-uboot-20.patch deleted file mode 100644 index 5f23991e26..0000000000 --- a/patch/u-boot/u-boot-meson-s4t7/Revert-emmc-enable-hs-SD-adjust-function-in-uboot-20.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 762693b0c2f54a9c1922cceef9b8d45c6bd1e4a5 Mon Sep 17 00:00:00 2001 -From: Gunjan Gupta -Date: Fri, 16 Feb 2024 11:48:57 +0000 -Subject: [PATCH] Revert "emmc: enable hs SD adjust function in uboot 2019 - [1/1]" - -This reverts commit bfa451f799eac8a69d4e58a32af7b00bec012e1d. ---- - drivers/mmc/mmc.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c -index f5cf48099b..18eacc6e0a 100644 ---- a/drivers/mmc/mmc.c -+++ b/drivers/mmc/mmc.c -@@ -1722,9 +1722,9 @@ static const struct mode_width_tuning sd_modes_by_pref[] = { - { - .mode = SD_HS, - .widths = MMC_MODE_4BIT | MMC_MODE_1BIT, --#ifdef MMC_SUPPORTS_TUNING -- .tuning = MMC_SD_HS_TUNING --#endif -+//#ifdef MMC_SUPPORTS_TUNING -+// .tuning = MMC_SD_HS_TUNING -+//#endif - }, - #if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) - { --- -2.34.1 -