leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-tegra

Browse Source
This commit is contained in:
Tom Rini
2018-08-22 22:36:08 -04:00
parent 26699998e9 3d186cf3f3
commit 2418734ed4
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/dts/tegra20-u-boot.dtsi
View File

@@ -1,3 +1,13 @@
#include <config.h> #include <config.h>
#include "tegra-u-boot.dtsi" #include "tegra-u-boot.dtsi"
/ {
host1x@50000000 {
u-boot,dm-pre-reloc;
dc@54200000 {
u-boot,dm-pre-reloc;
};
};
};

9
arch/arm/mach-tegra/ap.c
View File

@@ -155,8 +155,13 @@ static void init_pmc_scratch(void)
int i; int i;
/* SCRATCH0 is initialized by the boot ROM and shouldn't be cleared */ /* SCRATCH0 is initialized by the boot ROM and shouldn't be cleared */
for (i = 0; i < 23; i++) #if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
writel(0, &pmc->pmc_scratch1+i); if (!tegra_cpu_is_non_secure())
#endif
{
for (i = 0; i < 23; i++)
writel(0, &pmc->pmc_scratch1 + i);
}
/* ODMDATA is for kernel use to determine RAM size, LP config, etc. */ /* ODMDATA is for kernel use to determine RAM size, LP config, etc. */
odmdata = get_odmdata(); odmdata = get_odmdata();

18
arch/arm/mach-tegra/gpu.c
View File

@@ -9,6 +9,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/tegra.h> #include <asm/arch/tegra.h>
#include <asm/arch/mc.h> #include <asm/arch/mc.h>
#include <asm/arch-tegra/ap.h>
#include <fdt_support.h> #include <fdt_support.h>
@@ -18,12 +19,17 @@ void tegra_gpu_config(void)
{ {
struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE; struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE;
/* Turn VPR off */ #if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
writel(0, &mc->mc_video_protect_size_mb); if (!tegra_cpu_is_non_secure())
writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED, #endif
&mc->mc_video_protect_reg_ctrl); {
/* read back to ensure the write went through */ /* Turn VPR off */
readl(&mc->mc_video_protect_reg_ctrl); writel(0, &mc->mc_video_protect_size_mb);
writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED,
&mc->mc_video_protect_reg_ctrl);
/* read back to ensure the write went through */
readl(&mc->mc_video_protect_reg_ctrl);
}
debug("configured VPR\n"); debug("configured VPR\n");