From 6d77355c1c3f35fdb5c43cc762b224b19767cce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 11 Jun 2024 19:02:40 +0200 Subject: [PATCH] Temporary revert ODROID-N2 U-Boot to 2023.01 to fix eMMC issues (#3409) As we don't have proper solution for #3319 and #3351 yet, revert to previous U-Boot which was proven working. This is intended as a workaround but as there's nothing in the latest U-Boot that will be really missed on N2, we can stay on the older version for the time being. This also means reverting the "40 MHz hack" back to the 24 MHz one. Since this patch only applies to N2 (meson gx), it can stay along the common hardkernel uboot patches. --- ...01-HACK-mmc-meson-gx-limit-to-24MHz.patch} | 19 ++++++++----------- .../configs/odroid_n2_defconfig | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) rename buildroot-external/board/hardkernel/patches/uboot/{0001-HACK-mmc-meson-gx-limit-to-40MHz.patch => 0001-HACK-mmc-meson-gx-limit-to-24MHz.patch} (58%) diff --git a/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-40MHz.patch b/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch similarity index 58% rename from buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-40MHz.patch rename to buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch index 4e9e0daf0..c56843027 100644 --- a/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-40MHz.patch +++ b/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch @@ -1,18 +1,15 @@ -From 820e6f6e3745e988246a1acca4aaacdd759b778f Mon Sep 17 00:00:00 2001 -From: Stefan Agner -Date: Thu, 18 Apr 2024 18:01:54 +0200 -Subject: [PATCH] HACK: mmc: meson-gx: limit to 40MHz +From 11f015e13ef0442b6d2bb734954291abde415f73 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Mon, 2 Sep 2019 15:42:04 +0200 +Subject: [PATCH] HACK: mmc: meson-gx: limit to 24MHz -This is the limit used by downstream U-Boot for ODROID-N2(+) (odroidg12 -branch). - -Signed-off-by: Stefan Agner +Signed-off-by: Neil Armstrong --- drivers/mmc/meson_gx_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c -index fcf4f03d1e..c578ac0f74 100644 +index fcf4f03d1e..6ded4b619b 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -279,7 +279,7 @@ static int meson_mmc_probe(struct udevice *dev) @@ -20,10 +17,10 @@ index fcf4f03d1e..c578ac0f74 100644 MMC_MODE_HS_52MHz | MMC_MODE_HS; cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV); - cfg->f_max = 100000000; /* 100 MHz */ -+ cfg->f_max = 40000000; /* 40 MHz */ ++ cfg->f_max = SD_EMMC_CLKSRC_24M; cfg->b_max = 511; /* max 512 - 1 blocks */ cfg->name = dev->name; -- -2.44.0 +2.43.0 diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index b21a8fba0..d23f50be8 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -132,7 +132,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y