diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-13 10:49:20 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-14 11:16:17 +0000 |
| commit | e3acc8fcf3f1cbf4a527cfcd6aa9aba9bd9d5e2b (patch) | |
| tree | e3e162a29482d6b4e0928f2f440881a4e43368d9 /src/include | |
| parent | 4a637802fa6fd8c532ce32e6595298e60e84f6d6 (diff) | |
src/: Replace some __PRE_RAM__ use
Change-Id: Iaa56e7b98aad33eeb876edd7465c56c80fd1ac18
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35398
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/device/pci_ehci.h | 2 | ||||
| -rw-r--r-- | src/include/memlayout.h | 2 | ||||
| -rw-r--r-- | src/include/thread.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/include/device/pci_ehci.h b/src/include/device/pci_ehci.h index 6e5985448a..e9a7776d46 100644 --- a/src/include/device/pci_ehci.h +++ b/src/include/device/pci_ehci.h @@ -31,7 +31,6 @@ pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx); u8 *pci_ehci_base_regs(pci_devfn_t dev); void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port); -#ifndef __PRE_RAM__ #if !CONFIG(USBDEBUG) #define pci_ehci_read_resources pci_dev_read_resources #else @@ -46,6 +45,5 @@ void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port); struct device; void pci_ehci_read_resources(struct device *dev); #endif -#endif #endif /* _PCI_EHCI_H_ */ diff --git a/src/include/memlayout.h b/src/include/memlayout.h index 505ccc1889..0100e270c6 100644 --- a/src/include/memlayout.h +++ b/src/include/memlayout.h @@ -73,7 +73,7 @@ ALIAS_REGION(cbfs_cache, preram_cbfs_cache) \ ALIAS_REGION(cbfs_cache, postram_cbfs_cache) -#if defined(__PRE_RAM__) +#if ENV_ROMSTAGE_OR_BEFORE #define PRERAM_CBFS_CACHE(addr, size) \ REGION(preram_cbfs_cache, addr, size, 4) \ ALIAS_REGION(preram_cbfs_cache, cbfs_cache) diff --git a/src/include/thread.h b/src/include/thread.h index e6af2efd55..b66803e3c0 100644 --- a/src/include/thread.h +++ b/src/include/thread.h @@ -20,7 +20,7 @@ #include <bootstate.h> #include <arch/cpu.h> -#if CONFIG(COOP_MULTITASKING) && !defined(__SMM__) && !defined(__PRE_RAM__) +#if ENV_RAMSTAGE && CONFIG(COOP_MULTITASKING) struct thread { int id; |