diff options
| author | Troy Kisky <troykiskyboundary@gmail.com> | 2023-03-13 14:31:43 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng@tinylab.org> | 2023-09-22 06:03:46 +0800 |
| commit | 5c39f2c150612e04c0534348cc71e93e43026cf0 (patch) | |
| tree | 9077341986a6863a0df2cf23d35cbd956f9281a1 | |
| parent | 5d2fae79c7d60eaf7f50322e4ec125d2f58544e9 (diff) | |
| download | u-boot-5c39f2c150612e04c0534348cc71e93e43026cf0.zip u-boot-5c39f2c150612e04c0534348cc71e93e43026cf0.tar.gz u-boot-5c39f2c150612e04c0534348cc71e93e43026cf0.tar.bz2 | |
x86: cpu: i386: cpu: only set pci_ram_top if CONFIG_IS_ENABLED(PCI)
This avoids an error when ifdef CONFIG_PCI is changed to
if CONFIG_IS_ENABLED(PCI)
Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com>
[Rebased on top of u-boot/master]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | arch/x86/cpu/i386/cpu.c | 2 | ||||
| -rw-r--r-- | include/asm-generic/global_data.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index 91cd5d7..8882532 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -415,7 +415,7 @@ int cpu_phys_address_size(void) /* Don't allow PCI region 3 to use memory in the 2-4GB memory hole */ static void setup_pci_ram_top(void) { - gd->pci_ram_top = 0x80000000U; + gd_set_pci_ram_top(0x80000000U); } static void setup_mtrr(void) diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 8fc205d..d364f1b 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -573,6 +573,13 @@ static_assert(sizeof(struct global_data) == GD_SIZE); #define gd_malloc_start() 0 #define gd_set_malloc_start(val) #endif + +#if CONFIG_IS_ENABLED(PCI) +#define gd_set_pci_ram_top(val) gd->pci_ram_top = val +#else +#define gd_set_pci_ram_top(val) +#endif + /** * enum gd_flags - global data flags * |