Rename cpu/x86/car.h to arch/early_variables.h
and add an ARMv7 version.
Change-Id: I14fbff88d7c2b003dde57a19bf0ba9640d322156
Signed-off-by: Stefan Reinauer <reinauer@google.com>
[km: rebased fa004acf8 from chromium git]
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3939
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
diff --git a/src/include/cpu/x86/car.h b/src/arch/armv7/include/arch/early_variables.h
similarity index 94%
copy from src/include/cpu/x86/car.h
copy to src/arch/armv7/include/arch/early_variables.h
index 5fc11f9..90ead9d 100644
--- a/src/include/cpu/x86/car.h
+++ b/src/arch/armv7/include/arch/early_variables.h
@@ -17,12 +17,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
-#ifndef CPU_X86_CAR_H
-#define CPU_X86_CAR_H
+#ifndef ARCH_EARLY_VARIABLES_H
+#define ARCH_EARLY_VARIABLES_H
#ifdef __PRE_RAM__
-#define CAR_GLOBAL __attribute__((section(".car.global_data,\"w\",@nobits#")))
-#define CAR_CBMEM __attribute__((section(".car.cbmem_console,\"w\",@nobits#")))
+#define CAR_GLOBAL __attribute__((section(".car.global_data,\"w\",%nobits@")))
+#define CAR_CBMEM __attribute__((section(".car.cbmem_console,\"w\",%nobits@")))
#else
#define CAR_GLOBAL
#define CAR_CBMEM
@@ -56,5 +56,4 @@
static inline void car_migrate_variables(void) { }
#endif
-
#endif
diff --git a/src/include/cpu/x86/car.h b/src/arch/x86/include/arch/early_variables.h
similarity index 96%
rename from src/include/cpu/x86/car.h
rename to src/arch/x86/include/arch/early_variables.h
index 5fc11f9..ba7df97 100644
--- a/src/include/cpu/x86/car.h
+++ b/src/arch/x86/include/arch/early_variables.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
-#ifndef CPU_X86_CAR_H
-#define CPU_X86_CAR_H
+#ifndef ARCH_EARLY_VARIABLES_H
+#define ARCH_EARLY_VARIABLES_H
#ifdef __PRE_RAM__
#define CAR_GLOBAL __attribute__((section(".car.global_data,\"w\",@nobits#")))
diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c
index 87fa98b..481153d 100644
--- a/src/cpu/x86/car.c
+++ b/src/cpu/x86/car.c
@@ -21,7 +21,7 @@
#include <stddef.h>
#include <console/console.h>
#include <cbmem.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
typedef void (* const car_migration_func_t)(void);
diff --git a/src/cpu/x86/lapic/apic_timer.c b/src/cpu/x86/lapic/apic_timer.c
index e5ce62f..868fb92 100644
--- a/src/cpu/x86/lapic/apic_timer.c
+++ b/src/cpu/x86/lapic/apic_timer.c
@@ -24,7 +24,7 @@
#include <thread.h>
#include <arch/io.h>
#include <arch/cpu.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
#include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h>
#include <cpu/intel/speedstep.h>
diff --git a/src/drivers/oxford/oxpcie/oxpcie_early.c b/src/drivers/oxford/oxpcie/oxpcie_early.c
index 2bca5c7..d04e9d4 100644
--- a/src/drivers/oxford/oxpcie/oxpcie_early.c
+++ b/src/drivers/oxford/oxpcie/oxpcie_early.c
@@ -19,7 +19,7 @@
#include <stdint.h>
#include <arch/io.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
#include <delay.h>
#include <uart8250.h>
#include <device/pci_def.h>
diff --git a/src/drivers/pc80/tpm.c b/src/drivers/pc80/tpm.c
index 0ea0017..b8ed3f1 100644
--- a/src/drivers/pc80/tpm.c
+++ b/src/drivers/pc80/tpm.c
@@ -34,7 +34,7 @@
#include <arch/byteorder.h>
#include <console/console.h>
#include <pc80/tpm.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
#define PREFIX "lpc_tpm: "
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index 8d69435..8a39647 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -23,7 +23,7 @@
#include <cbmem.h>
#include <boot/coreboot_tables.h>
#include <console/console.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
#if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
#include <arch/acpi.h>
#endif
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 881865c..dd88300 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -19,7 +19,7 @@
#include <console/console.h>
#include <cbmem.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
#include <string.h>
/*
diff --git a/src/lib/dynamic_cbmem.c b/src/lib/dynamic_cbmem.c
index ba7760d..e21f96e 100644
--- a/src/lib/dynamic_cbmem.c
+++ b/src/lib/dynamic_cbmem.c
@@ -23,7 +23,7 @@
#include <cbmem.h>
#include <string.h>
#include <stdlib.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
#if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
#include <arch/acpi.h>
#endif
diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index a9c354e..8942649 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -22,7 +22,7 @@
#include <console/console.h>
#include <cbmem.h>
#include <timestamp.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
#include <cpu/x86/lapic.h>
#define MAX_TIMESTAMPS 30
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c
index 39cd138..3faec10 100644
--- a/src/lib/usbdebug.c
+++ b/src/lib/usbdebug.c
@@ -24,7 +24,7 @@
#include <device/pci.h>
#include <device/pci_def.h>
#include <arch/byteorder.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
#include <string.h>
#include <cbmem.h>
diff --git a/src/northbridge/amd/amdfam10/raminit_amdmct.c b/src/northbridge/amd/amdfam10/raminit_amdmct.c
index 6994c39..e5c18a8 100644
--- a/src/northbridge/amd/amdfam10/raminit_amdmct.c
+++ b/src/northbridge/amd/amdfam10/raminit_amdmct.c
@@ -120,7 +120,7 @@
#endif /* DDR2 */
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
struct sys_info sysinfo_car CAR_GLOBAL;
int mctRead_SPD(u32 smaddr, u32 reg)
diff --git a/src/northbridge/amd/amdk8/raminit.c b/src/northbridge/amd/amdk8/raminit.c
index 33a3245..4aaa1bb 100644
--- a/src/northbridge/amd/amdk8/raminit.c
+++ b/src/northbridge/amd/amdk8/raminit.c
@@ -14,7 +14,7 @@
#include "option_table.h"
#endif
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
struct sys_info sysinfo_car CAR_GLOBAL;
#if (CONFIG_RAMTOP & (CONFIG_RAMTOP -1)) != 0
diff --git a/src/northbridge/amd/amdk8/raminit_f.c b/src/northbridge/amd/amdk8/raminit_f.c
index c1882d7..64271b5 100644
--- a/src/northbridge/amd/amdk8/raminit_f.c
+++ b/src/northbridge/amd/amdk8/raminit_f.c
@@ -39,7 +39,7 @@
#endif
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
struct sys_info sysinfo_car CAR_GLOBAL;
#if (CONFIG_RAMTOP & (CONFIG_RAMTOP -1)) != 0
diff --git a/src/vendorcode/google/chromeos/vbnv.c b/src/vendorcode/google/chromeos/vbnv.c
index d94203a..58ccbdb 100644
--- a/src/vendorcode/google/chromeos/vbnv.c
+++ b/src/vendorcode/google/chromeos/vbnv.c
@@ -21,7 +21,7 @@
#include <string.h>
#include <console/console.h>
#include <pc80/mc146818rtc.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
#include "chromeos.h"
#define VBNV_BLOCK_SIZE 16 /* Size of NV storage block in bytes */