diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-09 16:51:00 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-09 23:05:33 +0300 |
| commit | e8e9c6f48400989c5fc54467576f8d535bd713e6 (patch) | |
| tree | 4373b185408793bbb2ba1a9cacdd82d8a7265cad /arch | |
| parent | b842340a108f463e66aaaca75c0831a224612190 (diff) | |
| parent | a80f582688fb3c961f521a978d428092f5bab483 (diff) | |
| download | u-boot-e8e9c6f48400989c5fc54467576f8d535bd713e6.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-samsung
[trini: Migrate CONFIG_EXYNOS7420 as part of merging, so espresso7420
still builds]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos/mmu-arm64.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/mmu-arm64.c b/arch/arm/mach-exynos/mmu-arm64.c index e3bd995143..d2c550b27d 100644 --- a/arch/arm/mach-exynos/mmu-arm64.c +++ b/arch/arm/mach-exynos/mmu-arm64.c @@ -7,7 +7,8 @@ #include <common.h> #include <asm/armv8/mmu.h> -#ifdef CONFIG_EXYNOS7420 +#if CONFIG_IS_ENABLED(EXYNOS7420) + static struct mm_region exynos7420_mem_map[] = { { .virt = 0x10000000UL, @@ -28,9 +29,9 @@ static struct mm_region exynos7420_mem_map[] = { }; struct mm_region *mem_map = exynos7420_mem_map; -#endif -#ifdef CONFIG_EXYNOS7870 +#elif CONFIG_IS_ENABLED(EXYNOS7870) + static struct mm_region exynos7870_mem_map[] = { { .virt = 0x10000000UL, @@ -61,9 +62,9 @@ static struct mm_region exynos7870_mem_map[] = { }; struct mm_region *mem_map = exynos7870_mem_map; -#endif -#ifdef CONFIG_EXYNOS7880 +#elif CONFIG_IS_ENABLED(EXYNOS7880) + static struct mm_region exynos7880_mem_map[] = { { .virt = 0x10000000UL, |