mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-31 23:06:59 +01:00
gnu: u-boot: Fix rk3399 boot from emmc.
* gnu/packages/bootloaders.scm (%u-boot-rk3399-enable-emmc-phy-patch): New variable. (u-boot)[origin]: Register it. * gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
parent
96a6084cd8
commit
bf1e46e959
3 changed files with 35 additions and 1 deletions
|
@ -1826,6 +1826,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/u-boot-rockchip-inno-usb.patch \
|
%D%/packages/patches/u-boot-rockchip-inno-usb.patch \
|
||||||
%D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \
|
%D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \
|
||||||
%D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \
|
%D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \
|
||||||
|
%D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \
|
||||||
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \
|
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \
|
||||||
%D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
|
%D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
|
||||||
%D%/packages/patches/ungoogled-chromium-ffmpeg-compat.patch \
|
%D%/packages/patches/ungoogled-chromium-ffmpeg-compat.patch \
|
||||||
|
|
|
@ -504,6 +504,12 @@ (define %u-boot-allow-disabling-openssl-patch
|
||||||
;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html
|
;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html
|
||||||
(search-patch "u-boot-allow-disabling-openssl.patch"))
|
(search-patch "u-boot-allow-disabling-openssl.patch"))
|
||||||
|
|
||||||
|
(define %u-boot-rk3399-enable-emmc-phy-patch
|
||||||
|
;; Fix emmc boot on rockpro64 and pinebook-pro, this was a regression
|
||||||
|
;; therefore should hopefully be fixed when updating u-boot.
|
||||||
|
;; https://lists.denx.de/pipermail/u-boot/2021-November/466329.html
|
||||||
|
(search-patch "u-boot-rk3399-enable-emmc-phy.patch"))
|
||||||
|
|
||||||
(define u-boot
|
(define u-boot
|
||||||
(package
|
(package
|
||||||
(name "u-boot")
|
(name "u-boot")
|
||||||
|
@ -512,7 +518,8 @@ (define u-boot
|
||||||
(patches
|
(patches
|
||||||
(list %u-boot-rockchip-inno-usb-patch
|
(list %u-boot-rockchip-inno-usb-patch
|
||||||
%u-boot-allow-disabling-openssl-patch
|
%u-boot-allow-disabling-openssl-patch
|
||||||
%u-boot-sifive-prevent-relocating-initrd-fdt))
|
%u-boot-sifive-prevent-relocating-initrd-fdt
|
||||||
|
%u-boot-rk3399-enable-emmc-phy-patch))
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
"https://ftp.denx.de/pub/u-boot/"
|
"https://ftp.denx.de/pub/u-boot/"
|
||||||
|
|
26
gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch
Normal file
26
gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
adapting commit ac804143cf ("mmc: rockchip_sdhci: add phy and clock
|
||||||
|
config for rk3399") to fix the issue "Not found emmc phy device".
|
||||||
|
|
||||||
|
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
|
||||||
|
---
|
||||||
|
|
||||||
|
arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
|
||||||
|
index 73922c328a..716b9a433a 100644
|
||||||
|
--- a/arch/arm/dts/rk3399-u-boot.dtsi
|
||||||
|
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
|
||||||
|
@@ -88,6 +88,10 @@
|
||||||
|
u-boot,dm-pre-reloc;
|
||||||
|
};
|
||||||
|
|
||||||
|
+&emmc_phy {
|
||||||
|
+ u-boot,dm-pre-reloc;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&grf {
|
||||||
|
u-boot,dm-pre-reloc;
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.17.1
|
Loading…
Reference in a new issue