[coreboot-gerrit] Patch set updated for coreboot: symbols: add '_' to pci_drivers and cpu_drivers symbols
Aaron Durbin (adurbin@chromium.org)
gerrit at coreboot.org
Fri Sep 4 18:03:36 CET 2015
Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11506
-gerrit
commit ed45bd66cd60c8287cbeae7392b9d0704e89ecb7
Author: Aaron Durbin <adurbin at chromium.org>
Date: Thu Sep 3 17:23:08 2015 -0500
symbols: add '_' to pci_drivers and cpu_drivers symbols
In order to prepare for more unification of the linker
scripts prefix pci_drivers, epci_drivers, cpu_drivers, and
ecpu_drivers with an underscore.
BUG=chrome-os-partner:44827
BRANCH=None
TEST=Built different boards includes ones w/ and w/o relocatable
ramstage.
Change-Id: I8918b38db3b754332e8d8506b424f3c6b3e06af8
Signed-off-by: Aaron Durbin <adubin at chromium.org>
---
src/arch/arm64/cpu_ramstage.c | 2 +-
src/arch/x86/cpu.c | 2 +-
src/device/pci_device.c | 2 +-
src/include/cpu/cpu.h | 4 ++--
src/include/device/pci.h | 4 ++--
src/lib/rmodule.ld | 8 ++++----
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/arch/arm64/cpu_ramstage.c b/src/arch/arm64/cpu_ramstage.c
index 7b4b26a..a49bf48 100644
--- a/src/arch/arm64/cpu_ramstage.c
+++ b/src/arch/arm64/cpu_ramstage.c
@@ -42,7 +42,7 @@ static struct cpu_driver *locate_cpu_driver(uint32_t midr)
{
struct cpu_driver *cur;
- for (cur = cpu_drivers; cur != ecpu_drivers; cur++) {
+ for (cur = _cpu_drivers; cur != _ecpu_drivers; cur++) {
const struct cpu_device_id *id_table = cur->id_table;
for (; id_table->midr != CPU_ID_END; id_table++) {
diff --git a/src/arch/x86/cpu.c b/src/arch/x86/cpu.c
index 3eb7b94..ceed077 100644
--- a/src/arch/x86/cpu.c
+++ b/src/arch/x86/cpu.c
@@ -192,7 +192,7 @@ static void identify_cpu(struct device *cpu)
struct cpu_driver *find_cpu_driver(struct device *cpu)
{
struct cpu_driver *driver;
- for (driver = cpu_drivers; driver < ecpu_drivers; driver++) {
+ for (driver = _cpu_drivers; driver < _ecpu_drivers; driver++) {
struct cpu_device_id *id;
for (id = driver->id_table;
id->vendor != X86_VENDOR_INVALID; id++) {
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 6332209..f2e4d5d 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -850,7 +850,7 @@ static void set_pci_ops(struct device *dev)
* Look through the list of setup drivers and find one for
* this PCI device.
*/
- for (driver = &pci_drivers[0]; driver != &epci_drivers[0]; driver++) {
+ for (driver = &_pci_drivers[0]; driver != &_epci_drivers[0]; driver++) {
if ((driver->vendor == dev->vendor) &&
device_id_match(driver, dev->device)) {
dev->ops = (struct device_operations *)driver->ops;
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index 47521d4..28431c0 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -18,9 +18,9 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
#define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver")))
#ifndef __SIMPLE_DEVICE__
/** 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 */
-extern struct cpu_driver ecpu_drivers[];
+extern struct cpu_driver _ecpu_drivers[];
#endif
#endif /* !__PRE_RAM__ && !__SMM__ */
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index 2a76ba9..fe31b54 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -55,9 +55,9 @@ struct pci_driver {
#define __pci_driver __attribute__ ((used,__section__(".rodata.pci_driver")))
/** 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 */
-extern struct pci_driver epci_drivers[];
+extern struct pci_driver _epci_drivers[];
extern struct device_operations default_pci_ops_dev;
diff --git a/src/lib/rmodule.ld b/src/lib/rmodule.ld
index e6b4da7..f5d5f06 100644
--- a/src/lib/rmodule.ld
+++ b/src/lib/rmodule.ld
@@ -42,13 +42,13 @@ SECTIONS
* ramstage with the rmodule linker. Any changes made in
* ramstage.ld should be made here as well. */
. = ALIGN(8);
- pci_drivers = . ;
+ _pci_drivers = . ;
KEEP(*(.rodata.pci_driver));
- epci_drivers = . ;
+ _epci_drivers = . ;
. = ALIGN(8);
- cpu_drivers = . ;
+ _cpu_drivers = . ;
KEEP(*(.rodata.cpu_driver));
- ecpu_drivers = . ;
+ _ecpu_drivers = . ;
. = ALIGN(8);
_bs_init_begin = .;
KEEP(*(.bs_init));
More information about the coreboot-gerrit
mailing list