Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35012 )
Change subject: samsung/exynos,qualcomm/ipq: Avoid conflicting DRAM_START ......................................................................
samsung/exynos,qualcomm/ipq: Avoid conflicting DRAM_START
There is duplicate definition in <memlayout.h> that gets indirectly included with followup work.
Change-Id: I1c41052542b215de8af3be858ca7a229e4206ecf Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/mainboard/google/daisy/mainboard.c M src/mainboard/google/gale/mmu.c M src/mainboard/google/peach_pit/mainboard.c M src/mainboard/google/storm/mmu.c 4 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/35012/1
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c index 46939b7..0a1701c 100644 --- a/src/mainboard/google/daisy/mainboard.c +++ b/src/mainboard/google/daisy/mainboard.c @@ -37,6 +37,9 @@
#define MMC0_GPIO_PIN (58)
+/* Conflicting definition from <memlayout.h> we do not need here. */ +#undef DRAM_START + /* convenient shorthand (in MB) */ #define DRAM_START ((uintptr_t)_dram/MiB) #define DRAM_SIZE CONFIG_DRAM_SIZE_MB diff --git a/src/mainboard/google/gale/mmu.c b/src/mainboard/google/gale/mmu.c index bf46f7a..d178295 100644 --- a/src/mainboard/google/gale/mmu.c +++ b/src/mainboard/google/gale/mmu.c @@ -15,6 +15,9 @@ #include <soc/soc_services.h> #include "mmu.h"
+/* Conflicting definition from <memlayout.h> we do not need here. */ +#undef DRAM_START + #define WIFI_IMEM_0_START ((uintptr_t)_wifi_imem_0 / KiB) #define WIFI_IMEM_0_END ((uintptr_t)_ewifi_imem_0 / KiB) #define WIFI_IMEM_1_START ((uintptr_t)_wifi_imem_1 / KiB) diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c index ecd2260..86d18a0 100644 --- a/src/mainboard/google/peach_pit/mainboard.c +++ b/src/mainboard/google/peach_pit/mainboard.c @@ -38,6 +38,9 @@ #include <symbols.h> #include <vbe.h>
+/* Conflicting definition from <memlayout.h> we do not need here. */ +#undef DRAM_START + /* convenient shorthand (in MB) */ #define DRAM_START ((uintptr_t)_dram/MiB) #define DRAM_SIZE CONFIG_DRAM_SIZE_MB diff --git a/src/mainboard/google/storm/mmu.c b/src/mainboard/google/storm/mmu.c index 9750cc1..91976e7 100644 --- a/src/mainboard/google/storm/mmu.c +++ b/src/mainboard/google/storm/mmu.c @@ -15,6 +15,9 @@ #include <symbols.h> #include "mmu.h"
+/* Conflicting definition from <memlayout.h> we do not need here. */ +#undef DRAM_START + /* convenient shorthand (in MB) */ #define RPM_START ((uintptr_t)_rpm / KiB) #define RPM_END ((uintptr_t)_erpm / KiB)