mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-03-31 14:41:55 -07:00
Merge pull request #8785 from heitbaum/u-boot
u-boot: update to 2024.04
This commit is contained in:
@@ -18,19 +18,19 @@ diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3
|
||||
index de17b88682..58300bdf3f 100644
|
||||
--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
|
||||
+++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
|
||||
@@ -19,6 +19,8 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
@@ -16,6 +16,8 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
#define GRF_BASE 0xFF100000
|
||||
#define UART2_BASE 0xFF130000
|
||||
#define FW_DDR_CON_REG 0xFF7C0040
|
||||
+#define QOS_VOP_OFFSET 0xFF760080
|
||||
+#define QOS_VOP_PRIORITY 0x8
|
||||
#define EFUSE_NS_BASE 0xFF260000
|
||||
|
||||
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
|
||||
[BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000",
|
||||
#define EFUSE_MOD 0x0000
|
||||
@@ -54,6 +56,9 @@ int arch_cpu_init(void)
|
||||
|
||||
/* Disable the ddr secure region setting to make it non-secure */
|
||||
rk_setreg(FW_DDR_CON_REG, 0x200);
|
||||
writel(EFUSE_TIMING(1, 4), EFUSE_NS_BASE + EFUSE_T_LOAD_R);
|
||||
writel(EFUSE_TIMING(1, 4), EFUSE_NS_BASE + EFUSE_T_ADDR_R);
|
||||
writel(EFUSE_TIMING(2, 3), EFUSE_NS_BASE + EFUSE_T_STROBE_R);
|
||||
+#else
|
||||
+ printf("Setting VOP QoS\n");
|
||||
+ rk_setreg(QOS_VOP_OFFSET + QOS_VOP_PRIORITY, 0xF);
|
||||
|
||||
Reference in New Issue
Block a user