]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: rk3328: set DDR as non-secure in SPL
authorKever Yang <kever.yang@rock-chips.com>
Mon, 29 Jul 2019 09:18:18 +0000 (12:18 +0300)
committerKever Yang <kever.yang@rock-chips.com>
Mon, 5 Aug 2019 13:05:02 +0000 (21:05 +0800)
Set DDR as non-secure so that MMC DMA can access.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
[cherry picked from https://github.com/rockchip-linux/u-boot/commit/bfe741ab9eb4f97371a4e6c24185419d57a3a75f and https://github.com/rockchip-linux/u-boot/commit/73d952acc8cc1ddad6652ba71895d9fe928c1e4b with minor modifications]
Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
arch/arm/mach-rockchip/rk3328/rk3328.c

index 592f287613bfc0c682b1ebc00de07db72777f0e3..c2448d727302963decc4ef3a50ab572ae05dd296 100644 (file)
@@ -16,6 +16,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define CRU_BASE               0xFF440000
 #define GRF_BASE               0xFF100000
 #define UART2_BASE             0xFF130000
+#define FW_DDR_CON_REG         0xFF7C0040
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
        [BROM_BOOTSOURCE_EMMC] = "rksdmmc@ff520000",
@@ -46,8 +47,12 @@ struct mm_region *mem_map = rk3328_mem_map;
 
 int arch_cpu_init(void)
 {
+#ifdef CONFIG_SPL_BUILD
        /* We do some SoC one time setting here. */
 
+       /* Disable the ddr secure region setting to make it non-secure */
+       rk_setreg(FW_DDR_CON_REG, 0x200);
+#endif
        return 0;
 }