From: Thierry Reding Date: Mon, 27 Jul 2015 17:45:26 +0000 (-0600) Subject: ARM: tegra: Disable SPL and non-cached memory on 64-bit X-Git-Tag: v2015.10-rc1~6^2~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6527268d6e8628cd121376fd0ceed2be81ebd64f;p=oweals%2Fu-boot.git ARM: tegra: Disable SPL and non-cached memory on 64-bit For 64-bit ARM SoCs we rely on non-U-Boot code to bring up the CPU in AArch64 mode so that we don't need the SPL. Non-cached memory is not implemented (yet) for 64-bit ARM. Signed-off-by: Thierry Reding Signed-off-by: Tom Warren Signed-off-by: Stephen Warren --- diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 7b4c0d7063..49fa8b3210 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -43,7 +43,9 @@ #define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MB */ #endif +#ifndef CONFIG_ARM64 #define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */ +#endif /* * NS16550 Configuration @@ -101,9 +103,11 @@ #define CONFIG_SYS_MEMTEST_START (NV_PA_SDRC_CS0 + 0x600000) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x100000) +#ifndef CONFIG_ARM64 #ifndef CONFIG_SPL_BUILD #define CONFIG_USE_ARCH_MEMCPY #endif +#endif /*----------------------------------------------------------------------- * Physical Memory Map