|
|
@@ -0,0 +1,401 @@
|
|
|
+From 9ba39aa45f06e5c935a9816e771682c5533b1e24 Mon Sep 17 00:00:00 2001
|
|
|
+From: jensen <[email protected]>
|
|
|
+Date: Thu, 13 Jan 2022 17:02:02 +0800
|
|
|
+Subject: [PATCH] uboot-rockchip: fixes several issues for r2c/r4s
|
|
|
+
|
|
|
+Patches formated from
|
|
|
+ https://github.com/friendlyarm/uboot-rockchip/tree/nanopi4-v2021.07
|
|
|
+
|
|
|
+Signed-off-by: jensen <[email protected]>
|
|
|
+---
|
|
|
+ ...k3328-Fix-spl-mmc-boot-device-ofpath.patch | 28 ++++++
|
|
|
+ ...c-support-to-disable-HS-mode-for-SPL.patch | 31 +++++++
|
|
|
+ ...399-nanopi4-Add-u-boot-spl-broken-hs.patch | 24 +++++
|
|
|
+ ...k3328-add-mmc-aliases-for-nanopi-r2s.patch | 29 +++++++
|
|
|
+ ...mc-Fixes-timeout-issue-for-FIFO-mode.patch | 36 ++++++++
|
|
|
+ ...-Add-arch_addr_aligned-hook-for-rk33.patch | 87 +++++++++++++++++++
|
|
|
+ ...3399-r4s-disable-nodes-for-vopb-vopl.patch | 41 +++++++++
|
|
|
+ ...FIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch | 25 ++++++
|
|
|
+ ...328-Implement-arch_addr_aligned-hook.patch | 59 +++++++++++++
|
|
|
+ 9 files changed, 360 insertions(+)
|
|
|
+ create mode 100644 package/boot/uboot-rockchip/patches/300-rockchip-rk3328-Fix-spl-mmc-boot-device-ofpath.patch
|
|
|
+ create mode 100644 package/boot/uboot-rockchip/patches/301-rockchip-dw_mmc-support-to-disable-HS-mode-for-SPL.patch
|
|
|
+ create mode 100644 package/boot/uboot-rockchip/patches/302-arm64-dts-rk3399-nanopi4-Add-u-boot-spl-broken-hs.patch
|
|
|
+ create mode 100644 package/boot/uboot-rockchip/patches/303-rockchip-rk3328-add-mmc-aliases-for-nanopi-r2s.patch
|
|
|
+ create mode 100644 package/boot/uboot-rockchip/patches/305-common-bouncebuf-Add-arch_addr_aligned-hook-for-rk33.patch
|
|
|
+ create mode 100644 package/boot/uboot-rockchip/patches/306-arm64-rk3399-r4s-disable-nodes-for-vopb-vopl.patch
|
|
|
+ create mode 100644 package/boot/uboot-rockchip/patches/307-configs-Add-CONFIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch
|
|
|
+ create mode 100644 package/boot/uboot-rockchip/patches/308-rockchip-rk3328-Implement-arch_addr_aligned-hook.patch
|
|
|
+
|
|
|
+diff --git a/package/boot/uboot-rockchip/patches/300-rockchip-rk3328-Fix-spl-mmc-boot-device-ofpath.patch b/package/boot/uboot-rockchip/patches/300-rockchip-rk3328-Fix-spl-mmc-boot-device-ofpath.patch
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..94c69878a856
|
|
|
+--- /dev/null
|
|
|
++++ b/package/boot/uboot-rockchip/patches/300-rockchip-rk3328-Fix-spl-mmc-boot-device-ofpath.patch
|
|
|
+@@ -0,0 +1,28 @@
|
|
|
++From e14e93922a39e5950c8b042aefd0c9869ee3a259 Mon Sep 17 00:00:00 2001
|
|
|
++From: hmz007 <[email protected]>
|
|
|
++Date: Sat, 1 Jan 2022 18:41:34 +0800
|
|
|
++Subject: [PATCH 300/308] rockchip: rk3328: Fix spl mmc boot device ofpath
|
|
|
++
|
|
|
++Signed-off-by: hmz007 <[email protected]>
|
|
|
++---
|
|
|
++ arch/arm/mach-rockchip/rk3328/rk3328.c | 4 ++--
|
|
|
++ 1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
++
|
|
|
++diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
|
|
|
++index ec3336cb49..de17b88682 100644
|
|
|
++--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
|
|
|
+++++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
|
|
|
++@@ -21,8 +21,8 @@ DECLARE_GLOBAL_DATA_PTR;
|
|
|
++ #define FW_DDR_CON_REG 0xFF7C0040
|
|
|
++
|
|
|
++ const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
|
|
|
++- [BROM_BOOTSOURCE_EMMC] = "/rksdmmc@ff520000",
|
|
|
++- [BROM_BOOTSOURCE_SD] = "/rksdmmc@ff500000",
|
|
|
+++ [BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000",
|
|
|
+++ [BROM_BOOTSOURCE_SD] = "/mmc@ff500000",
|
|
|
++ };
|
|
|
++
|
|
|
++ static struct mm_region rk3328_mem_map[] = {
|
|
|
++--
|
|
|
++2.34.1
|
|
|
++
|
|
|
+diff --git a/package/boot/uboot-rockchip/patches/301-rockchip-dw_mmc-support-to-disable-HS-mode-for-SPL.patch b/package/boot/uboot-rockchip/patches/301-rockchip-dw_mmc-support-to-disable-HS-mode-for-SPL.patch
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..ccc5df5a5c70
|
|
|
+--- /dev/null
|
|
|
++++ b/package/boot/uboot-rockchip/patches/301-rockchip-dw_mmc-support-to-disable-HS-mode-for-SPL.patch
|
|
|
+@@ -0,0 +1,31 @@
|
|
|
++From baecb10c4b34be29ca0aac97158d4cdbc84d76a0 Mon Sep 17 00:00:00 2001
|
|
|
++From: hmz007 <[email protected]>
|
|
|
++Date: Wed, 1 Dec 2021 16:45:27 +0800
|
|
|
++Subject: [PATCH 301/308] rockchip: dw_mmc: support to disable HS mode for SPL
|
|
|
++
|
|
|
++For rk3399, the highspeed mode doesn't work because of
|
|
|
++the signal voltage remains at 1.8V after reboot.
|
|
|
++
|
|
|
++Signed-off-by: hmz007 <[email protected]>
|
|
|
++---
|
|
|
++ drivers/mmc/rockchip_dw_mmc.c | 4 ++++
|
|
|
++ 1 file changed, 4 insertions(+)
|
|
|
++
|
|
|
++diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
|
|
|
++index d7d5361fd5..49ad73fdff 100644
|
|
|
++--- a/drivers/mmc/rockchip_dw_mmc.c
|
|
|
+++++ b/drivers/mmc/rockchip_dw_mmc.c
|
|
|
++@@ -145,6 +145,10 @@ static int rockchip_dwmmc_probe(struct udevice *dev)
|
|
|
++ }
|
|
|
++ #endif
|
|
|
++ dwmci_setup_cfg(&plat->cfg, host, priv->minmax[1], priv->minmax[0]);
|
|
|
+++#ifdef CONFIG_SPL_BUILD
|
|
|
+++ if (dev_read_bool(dev, "u-boot,spl-broken-hs"))
|
|
|
+++ plat->cfg.host_caps &= ~MMC_MODE_HS;
|
|
|
+++#endif
|
|
|
++ host->mmc = &plat->mmc;
|
|
|
++ host->mmc->priv = &priv->host;
|
|
|
++ host->mmc->dev = dev;
|
|
|
++--
|
|
|
++2.34.1
|
|
|
++
|
|
|
+diff --git a/package/boot/uboot-rockchip/patches/302-arm64-dts-rk3399-nanopi4-Add-u-boot-spl-broken-hs.patch b/package/boot/uboot-rockchip/patches/302-arm64-dts-rk3399-nanopi4-Add-u-boot-spl-broken-hs.patch
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..925cc8414cee
|
|
|
+--- /dev/null
|
|
|
++++ b/package/boot/uboot-rockchip/patches/302-arm64-dts-rk3399-nanopi4-Add-u-boot-spl-broken-hs.patch
|
|
|
+@@ -0,0 +1,24 @@
|
|
|
++From c608d2fd04cb4973f75082807e5df0653fc6e819 Mon Sep 17 00:00:00 2001
|
|
|
++From: hmz007 <[email protected]>
|
|
|
++Date: Wed, 1 Dec 2021 18:20:37 +0800
|
|
|
++Subject: [PATCH 302/308] arm64: dts: rk3399-nanopi4: Add u-boot,spl-broken-hs
|
|
|
++
|
|
|
++Signed-off-by: hmz007 <[email protected]>
|
|
|
++---
|
|
|
++ arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 2 ++
|
|
|
++ 1 file changed, 2 insertions(+)
|
|
|
++
|
|
|
++diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
|
|
|
++index a9d10592d5..53c4f17ac8 100644
|
|
|
++--- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
|
|
|
+++++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
|
|
|
++@@ -13,4 +13,6 @@
|
|
|
++
|
|
|
++ &sdmmc {
|
|
|
++ pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_cd>;
|
|
|
+++
|
|
|
+++ u-boot,spl-broken-hs;
|
|
|
++ };
|
|
|
++--
|
|
|
++2.34.1
|
|
|
++
|
|
|
+diff --git a/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-add-mmc-aliases-for-nanopi-r2s.patch b/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-add-mmc-aliases-for-nanopi-r2s.patch
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..1c4ab53bd39c
|
|
|
+--- /dev/null
|
|
|
++++ b/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-add-mmc-aliases-for-nanopi-r2s.patch
|
|
|
+@@ -0,0 +1,29 @@
|
|
|
++From b8d642fadf95508f3a728a995b6892467deb1097 Mon Sep 17 00:00:00 2001
|
|
|
++From: hmz007 <[email protected]>
|
|
|
++Date: Tue, 4 Jan 2022 14:54:20 +0800
|
|
|
++Subject: [PATCH 303/308] rockchip: rk3328: add mmc aliases for nanopi-r2s
|
|
|
++
|
|
|
++Signed-off-by: hmz007 <[email protected]>
|
|
|
++---
|
|
|
++ arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 5 +++++
|
|
|
++ 1 file changed, 5 insertions(+)
|
|
|
++
|
|
|
++diff --git a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
|
|
|
++index 9e2ced1541..df692ec30a 100644
|
|
|
++--- a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
|
|
|
+++++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
|
|
|
++@@ -7,6 +7,11 @@
|
|
|
++ #include "rk3328-u-boot.dtsi"
|
|
|
++ #include "rk3328-sdram-ddr4-666.dtsi"
|
|
|
++ / {
|
|
|
+++ aliases {
|
|
|
+++ mmc0 = &sdmmc;
|
|
|
+++ mmc1 = &emmc;
|
|
|
+++ };
|
|
|
+++
|
|
|
++ chosen {
|
|
|
++ u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
|
|
++ };
|
|
|
++--
|
|
|
++2.34.1
|
|
|
++
|
|
|
+diff --git a/package/boot/uboot-rockchip/patches/305-common-bouncebuf-Add-arch_addr_aligned-hook-for-rk33.patch b/package/boot/uboot-rockchip/patches/305-common-bouncebuf-Add-arch_addr_aligned-hook-for-rk33.patch
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..ca83565e1603
|
|
|
+--- /dev/null
|
|
|
++++ b/package/boot/uboot-rockchip/patches/305-common-bouncebuf-Add-arch_addr_aligned-hook-for-rk33.patch
|
|
|
+@@ -0,0 +1,87 @@
|
|
|
++From 7b108ebc5f9ac82487ad17dea0ae7163285d906f Mon Sep 17 00:00:00 2001
|
|
|
++From: hmz007 <[email protected]>
|
|
|
++Date: Wed, 12 Jan 2022 10:59:31 +0800
|
|
|
++Subject: [PATCH 305/308] common: bouncebuf: Add arch_addr_aligned() hook for
|
|
|
++ rk3399
|
|
|
++
|
|
|
++As described in rk3399-u-boot.dtsi ("mmc to sram can't do dma"),
|
|
|
++this restrict can be sorted out by adding a hook and returning
|
|
|
++the non-DRAM area as Unaligned (0) in rk3399's implementation.
|
|
|
++
|
|
|
++Then we can enable DMA mode and save about 200ms of SPL boot.
|
|
|
++
|
|
|
++Signed-off-by: hmz007 <[email protected]>
|
|
|
++---
|
|
|
++ arch/arm/dts/rk3399-u-boot.dtsi | 3 ---
|
|
|
++ arch/arm/mach-rockchip/rk3399/rk3399.c | 13 +++++++++++++
|
|
|
++ common/bouncebuf.c | 9 +++++++--
|
|
|
++ 3 files changed, 20 insertions(+), 5 deletions(-)
|
|
|
++
|
|
|
++diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
|
|
|
++index 73922c328a..57e1a7feab 100644
|
|
|
++--- a/arch/arm/dts/rk3399-u-boot.dtsi
|
|
|
+++++ b/arch/arm/dts/rk3399-u-boot.dtsi
|
|
|
++@@ -119,9 +119,6 @@
|
|
|
++
|
|
|
++ &sdmmc {
|
|
|
++ u-boot,dm-pre-reloc;
|
|
|
++-
|
|
|
++- /* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
|
|
|
++- u-boot,spl-fifo-mode;
|
|
|
++ };
|
|
|
++
|
|
|
++ &spi1 {
|
|
|
++diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
|
|
|
++index 869d2159be..fc0292e6be 100644
|
|
|
++--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
|
|
|
+++++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
|
|
|
++@@ -111,6 +111,19 @@ int arch_cpu_init(void)
|
|
|
++ return 0;
|
|
|
++ }
|
|
|
++
|
|
|
+++int arch_addr_aligned(void *ubuf)
|
|
|
+++{
|
|
|
+++#define DRAM_END 0xf8000000
|
|
|
+++
|
|
|
+++ if ((uintptr_t)ubuf < DRAM_END) {
|
|
|
+++ /* Aligned for DRAM area */
|
|
|
+++ return 1;
|
|
|
+++ }
|
|
|
+++
|
|
|
+++ debug("Unsupported buffer for DMA transfer\n");
|
|
|
+++ return 0;
|
|
|
+++}
|
|
|
+++
|
|
|
++ #ifdef CONFIG_DEBUG_UART_BOARD_INIT
|
|
|
++ void board_debug_uart_init(void)
|
|
|
++ {
|
|
|
++diff --git a/common/bouncebuf.c b/common/bouncebuf.c
|
|
|
++index 6d98920de6..5f510a04ec 100644
|
|
|
++--- a/common/bouncebuf.c
|
|
|
+++++ b/common/bouncebuf.c
|
|
|
++@@ -13,6 +13,12 @@
|
|
|
++ #include <bouncebuf.h>
|
|
|
++ #include <asm/cache.h>
|
|
|
++
|
|
|
+++__weak int arch_addr_aligned(void *ubuf)
|
|
|
+++{
|
|
|
+++ /* Aligned */
|
|
|
+++ return 1;
|
|
|
+++}
|
|
|
+++
|
|
|
++ static int addr_aligned(struct bounce_buffer *state)
|
|
|
++ {
|
|
|
++ const ulong align_mask = ARCH_DMA_MINALIGN - 1;
|
|
|
++@@ -29,8 +35,7 @@ static int addr_aligned(struct bounce_buffer *state)
|
|
|
++ return 0;
|
|
|
++ }
|
|
|
++
|
|
|
++- /* Aligned */
|
|
|
++- return 1;
|
|
|
+++ return arch_addr_aligned(state->user_buffer);
|
|
|
++ }
|
|
|
++
|
|
|
++ int bounce_buffer_start_extalign(struct bounce_buffer *state, void *data,
|
|
|
++--
|
|
|
++2.34.1
|
|
|
++
|
|
|
+diff --git a/package/boot/uboot-rockchip/patches/306-arm64-rk3399-r4s-disable-nodes-for-vopb-vopl.patch b/package/boot/uboot-rockchip/patches/306-arm64-rk3399-r4s-disable-nodes-for-vopb-vopl.patch
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..21e3c763dac9
|
|
|
+--- /dev/null
|
|
|
++++ b/package/boot/uboot-rockchip/patches/306-arm64-rk3399-r4s-disable-nodes-for-vopb-vopl.patch
|
|
|
+@@ -0,0 +1,41 @@
|
|
|
++From 8a8b3ef12c68ad662223aefb4a46b1ca43e23482 Mon Sep 17 00:00:00 2001
|
|
|
++From: hmz007 <[email protected]>
|
|
|
++Date: Wed, 12 Jan 2022 11:00:08 +0800
|
|
|
++Subject: [PATCH 306/308] arm64: rk3399: r4s: disable nodes for vopb/vopl
|
|
|
++
|
|
|
++Disable vopb and vopl to fix:
|
|
|
++ rk3399_vop vop@ff8f0000: failed to get ahb reset (ret=-524)
|
|
|
++ rk3399_vop vop@ff8f0000: failed to get ahb reset (ret=-524)
|
|
|
++
|
|
|
++Signed-off-by: hmz007 <[email protected]>
|
|
|
++---
|
|
|
++ arch/arm/dts/rk3399-nanopi-r4s.dts | 16 ++++++++++++++++
|
|
|
++ 1 file changed, 16 insertions(+)
|
|
|
++
|
|
|
++diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts
|
|
|
++index 6f2cf17bf1..e7c6daddd5 100644
|
|
|
++--- a/arch/arm/dts/rk3399-nanopi-r4s.dts
|
|
|
+++++ b/arch/arm/dts/rk3399-nanopi-r4s.dts
|
|
|
++@@ -136,3 +136,19 @@
|
|
|
++ &vcc3v3_sys {
|
|
|
++ vin-supply = <&vcc5v0_sys>;
|
|
|
++ };
|
|
|
+++
|
|
|
+++&vopb {
|
|
|
+++ status = "disabled";
|
|
|
+++};
|
|
|
+++
|
|
|
+++&vopb_mmu {
|
|
|
+++ status = "disabled";
|
|
|
+++};
|
|
|
+++
|
|
|
+++&vopl {
|
|
|
+++ status = "disabled";
|
|
|
+++};
|
|
|
+++
|
|
|
+++&vopl_mmu {
|
|
|
+++ status = "disabled";
|
|
|
+++};
|
|
|
++--
|
|
|
++2.34.1
|
|
|
++
|
|
|
+diff --git a/package/boot/uboot-rockchip/patches/307-configs-Add-CONFIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch b/package/boot/uboot-rockchip/patches/307-configs-Add-CONFIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..d84651eb5347
|
|
|
+--- /dev/null
|
|
|
++++ b/package/boot/uboot-rockchip/patches/307-configs-Add-CONFIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch
|
|
|
+@@ -0,0 +1,25 @@
|
|
|
++From 92c1bcf0983464f7bcc9e38bc2a6edccc239bd93 Mon Sep 17 00:00:00 2001
|
|
|
++From: hmz007 <[email protected]>
|
|
|
++Date: Wed, 12 Jan 2022 11:00:21 +0800
|
|
|
++Subject: [PATCH 307/308] configs: Add CONFIG_SYS_MMC_ENV_DEV=1 for nanopi-r4s
|
|
|
++
|
|
|
++Signed-off-by: hmz007 <[email protected]>
|
|
|
++---
|
|
|
++ configs/nanopi-r4s-rk3399_defconfig | 1 +
|
|
|
++ 1 file changed, 1 insertion(+)
|
|
|
++
|
|
|
++diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig
|
|
|
++index 351d2eb553..0f22737d54 100644
|
|
|
++--- a/configs/nanopi-r4s-rk3399_defconfig
|
|
|
+++++ b/configs/nanopi-r4s-rk3399_defconfig
|
|
|
++@@ -25,6 +25,7 @@ CONFIG_SPL_OF_CONTROL=y
|
|
|
++ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
|
++ CONFIG_ENV_IS_IN_MMC=y
|
|
|
++ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
|
+++CONFIG_SYS_MMC_ENV_DEV=1
|
|
|
++ CONFIG_ROCKCHIP_GPIO=y
|
|
|
++ CONFIG_SYS_I2C_ROCKCHIP=y
|
|
|
++ CONFIG_MMC_DW=y
|
|
|
++--
|
|
|
++2.34.1
|
|
|
++
|
|
|
+diff --git a/package/boot/uboot-rockchip/patches/308-rockchip-rk3328-Implement-arch_addr_aligned-hook.patch b/package/boot/uboot-rockchip/patches/308-rockchip-rk3328-Implement-arch_addr_aligned-hook.patch
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..2a8e9d21c246
|
|
|
+--- /dev/null
|
|
|
++++ b/package/boot/uboot-rockchip/patches/308-rockchip-rk3328-Implement-arch_addr_aligned-hook.patch
|
|
|
+@@ -0,0 +1,59 @@
|
|
|
++From 886a84ea1a0e501fd168ad779ca54aecc70f8f4d Mon Sep 17 00:00:00 2001
|
|
|
++From: hmz007 <[email protected]>
|
|
|
++Date: Wed, 12 Jan 2022 11:21:37 +0800
|
|
|
++Subject: [PATCH 308/308] rockchip: rk3328: Implement arch_addr_aligned() hook
|
|
|
++
|
|
|
++Signed-off-by: hmz007 <[email protected]>
|
|
|
++---
|
|
|
++ arch/arm/dts/rk3328-u-boot.dtsi | 6 ------
|
|
|
++ arch/arm/mach-rockchip/rk3328/rk3328.c | 13 +++++++++++++
|
|
|
++ 2 files changed, 13 insertions(+), 6 deletions(-)
|
|
|
++
|
|
|
++diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
|
|
|
++index 1633558264..d6b7f3e30a 100644
|
|
|
++--- a/arch/arm/dts/rk3328-u-boot.dtsi
|
|
|
+++++ b/arch/arm/dts/rk3328-u-boot.dtsi
|
|
|
++@@ -52,16 +52,10 @@
|
|
|
++
|
|
|
++ &emmc {
|
|
|
++ u-boot,dm-pre-reloc;
|
|
|
++-
|
|
|
++- /* mmc to sram can't do dma, prevent aborts transfering TF-A parts */
|
|
|
++- u-boot,spl-fifo-mode;
|
|
|
++ };
|
|
|
++
|
|
|
++ &sdmmc {
|
|
|
++ u-boot,dm-pre-reloc;
|
|
|
++-
|
|
|
++- /* mmc to sram can't do dma, prevent aborts transfering TF-A parts */
|
|
|
++- u-boot,spl-fifo-mode;
|
|
|
++ };
|
|
|
++
|
|
|
++ &usb20_otg {
|
|
|
++diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
|
|
|
++index de17b88682..60e0b6134f 100644
|
|
|
++--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
|
|
|
+++++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
|
|
|
++@@ -58,6 +58,19 @@ int arch_cpu_init(void)
|
|
|
++ return 0;
|
|
|
++ }
|
|
|
++
|
|
|
+++int arch_addr_aligned(void *ubuf)
|
|
|
+++{
|
|
|
+++#define DRAM_END 0xff000000
|
|
|
+++
|
|
|
+++ if ((uintptr_t)ubuf < DRAM_END) {
|
|
|
+++ /* Aligned for DRAM area */
|
|
|
+++ return 1;
|
|
|
+++ }
|
|
|
+++
|
|
|
+++ debug("Unsupported buffer for DMA transfer\n");
|
|
|
+++ return 0;
|
|
|
+++}
|
|
|
+++
|
|
|
++ void board_debug_uart_init(void)
|
|
|
++ {
|
|
|
++ struct rk3328_grf_regs * const grf = (void *)GRF_BASE;
|
|
|
++--
|
|
|
++2.34.1
|
|
|
++
|
kiddin9