GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cpu,device/: Remove some __SIMPLE_DEVICE__ and __ROMCC__ use

Browse source 
Change-Id: I62d7450c8e83eec7bf4ad5d0709269a132fd0499
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35649
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Kyösti Mälkki 2019-09-27 15:02:32 +03:00
parent f2cc3dd8ea
commit 44da9e201c
4 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/arch/x86/include/arch/cpu.h
View file

@ -214,7 +214,8 @@ static inline bool cpu_is_intel(void)
return CONFIG(CPU_INTEL_COMMON) || CONFIG(SOC_INTEL_COMMON); return CONFIG(CPU_INTEL_COMMON) || CONFIG(SOC_INTEL_COMMON);
} }
#ifndef __SIMPLE_DEVICE__ #ifndef __ROMCC__
/* romcc does not support anonymous structs. */
struct device; struct device;
@ -258,9 +259,8 @@ static inline struct cpu_info *cpu_info(void)
); );
return ci; return ci;
} }
#endif
#ifndef __ROMCC__ // romcc is segfaulting in some cases /* romcc is segfaulting in some cases. */
struct cpuinfo_x86 { struct cpuinfo_x86 {
uint8_t x86; /* CPU family */ uint8_t x86; /* CPU family */
uint8_t x86_vendor; /* CPU vendor */ uint8_t x86_vendor; /* CPU vendor */

3
src/cpu/x86/mtrr/earlymtrr.c
View file

@ -38,9 +38,6 @@ int get_free_var_mtrr(void)
return -1; return -1;
} }
#ifdef __ROMCC__
static
#endif
void set_var_mtrr( void set_var_mtrr(
unsigned int reg, unsigned int base, unsigned int size, unsigned int reg, unsigned int base, unsigned int size,
unsigned int type) unsigned int type)

9
src/include/cpu/cpu.h
View file

@ -3,7 +3,6 @@
#include <arch/cpu.h> #include <arch/cpu.h>
#if !defined(__ROMCC__)
void cpu_initialize(unsigned int cpu_index); void cpu_initialize(unsigned int cpu_index);
/* Returns default APIC id based on logical_cpu number or < 0 on failure. */ /* Returns default APIC id based on logical_cpu number or < 0 on failure. */
int cpu_get_apic_id(int logical_cpu); int cpu_get_apic_id(int logical_cpu);
@ -14,13 +13,15 @@ void initialize_cpus(struct bus *cpu_bus);
asmlinkage void secondary_cpu_init(unsigned int cpu_index); asmlinkage void secondary_cpu_init(unsigned int cpu_index);
int cpu_phys_address_size(void); int cpu_phys_address_size(void);
#if ENV_RAMSTAGE
#define __cpu_driver __attribute__((used, __section__(".rodata.cpu_driver"))) #define __cpu_driver __attribute__((used, __section__(".rodata.cpu_driver")))
#ifndef __SIMPLE_DEVICE__ #else
#define __cpu_driver __attribute__((unused))
#endif
/** start of compile time generated pci driver array */ /** start of compile time generated pci driver array */
extern struct cpu_driver _cpu_drivers[]; extern struct cpu_driver _cpu_drivers[];
/** end of compile time generated pci driver array */ /** end of compile time generated pci driver array */
extern struct cpu_driver _ecpu_drivers[]; extern struct cpu_driver _ecpu_drivers[];
#endif
#endif /* !__ROMCC__ */
#endif /* CPU_CPU_H */ #endif /* CPU_CPU_H */

9
src/include/device/pci.h
View file

@ -55,11 +55,12 @@ struct msix_entry {
u32 vec_control; u32 vec_control;
}; };
#ifdef __SIMPLE_DEVICE__ #if ENV_RAMSTAGE
#define __pci_driver __attribute__((unused))
#else
#define __pci_driver __attribute__((used, __section__(".rodata.pci_driver"))) #define __pci_driver __attribute__((used, __section__(".rodata.pci_driver")))
#else
#define __pci_driver __attribute__((unused))
#endif #endif
/** start of compile time generated pci driver array */ /** start of compile time generated pci driver array */
extern struct pci_driver _pci_drivers[]; extern struct pci_driver _pci_drivers[];
/** end of compile time generated pci driver array */ /** end of compile time generated pci driver array */
@ -119,12 +120,10 @@ void pci_early_mmio_window(pci_devfn_t p2p_bridge, u32 mmio_base,
u32 mmio_size); u32 mmio_size);
int pci_early_device_probe(u8 bus, u8 dev, u32 mmio_base); int pci_early_device_probe(u8 bus, u8 dev, u32 mmio_base);
#ifndef __ROMCC__
static inline int pci_base_address_is_memory_space(unsigned int attr) static inline int pci_base_address_is_memory_space(unsigned int attr)
{ {
return (attr & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_MEMORY; return (attr & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_MEMORY;
} }
#endif
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */