From 23e6b57afcd407131760be1d6239a523050162d7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 4 May 2021 23:17:01 -0700 Subject: [PATCH] u-boot-starfive: Drop FDT address adjustments This lends the system non-bootable as kernel waits for rootfs media forever like below [ 2.011165] mmc_host mmc0: Bus speed (slot 0) = 100000000Hz (slot req 400000Hz, actual 400000HZ div = 125) [ 2.051162] mmc_host mmc1: Bus speed (slot 0) = 100000000Hz (slot req 400000Hz, actual 400000HZ div = 125) [ 2.311113] dw_mmc 10010000.sdio1: Unexpected interrupt latency [ 4.871335] Waiting for root device /dev/mmcblk0p2... Signed-off-by: Khem Raj --- ...s-starfive-vic7100-adjust-fdt_addr_r.patch | 38 ------------------- .../u-boot/u-boot-starfive_v2021.04.bb | 1 - 2 files changed, 39 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-starfive/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch diff --git a/recipes-bsp/u-boot/u-boot-starfive/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch b/recipes-bsp/u-boot/u-boot-starfive/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch deleted file mode 100644 index 01c37a4..0000000 --- a/recipes-bsp/u-boot/u-boot-starfive/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2c4c813940c577590f3352cef0c49a8def17905d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 28 Apr 2021 22:58:45 +0200 -Subject: [PATCH] include/configs/starfive-vic7100: adjust fdt_addr_r - -The default fdt_addr_r of 0x88000000 doesn't work, the kernel never -boots. Using 0x90000000 works fine. - -Since it would overlap with the kernel_comp_addr_r area, this one is -moved 16 MB further, at 0x91000000. - -Signed-off-by: Thomas Petazzoni ---- - include/configs/starfive-vic7100.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/configs/starfive-vic7100.h b/include/configs/starfive-vic7100.h -index 8c5915a73c..7150a23873 100644 ---- a/include/configs/starfive-vic7100.h -+++ b/include/configs/starfive-vic7100.h -@@ -111,13 +111,13 @@ - "fdt_high=0xffffffffffffffff\0" \ - "initrd_high=0xffffffffffffffff\0" \ - "kernel_addr_r=0x84000000\0" \ -- "fdt_addr_r=0x88000000\0" \ -+ "fdt_addr_r=0x90000000\0" \ - "scriptaddr=0x88100000\0" \ - "script_offset_f=0x1fff000\0" \ - "script_size_f=0x1000\0" \ - "pxefile_addr_r=0x88200000\0" \ - "ramdisk_addr_r=0x88300000\0" \ -- "kernel_comp_addr_r=0x90000000\0" \ -+ "kernel_comp_addr_r=0x91000000\0" \ - "kernel_comp_size=0x10000000\0" \ - "type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \ - "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \ --- -2.30.2 diff --git a/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb b/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb index 7234f1d..98f3186 100644 --- a/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb @@ -4,7 +4,6 @@ require recipes-bsp/u-boot/u-boot.inc FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI = "git://github.com/starfive-tech/u-boot.git;protocol=git;branch=Fedora \ - file://0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch \ file://tftp-mmc-boot.txt \ "