diff options
-rw-r--r-- | arch/x86/cpu/coreboot/coreboot.c | 2 | ||||
-rw-r--r-- | arch/x86/cpu/coreboot/sdram.c | 2 | ||||
-rw-r--r-- | arch/x86/cpu/coreboot/tables.c | 2 | ||||
-rw-r--r-- | arch/x86/cpu/coreboot/timestamp.c | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/cb_sysinfo.h (renamed from arch/x86/include/asm/arch-coreboot/sysinfo.h) | 0 | ||||
-rw-r--r-- | board/coreboot/coreboot/coreboot.c | 2 | ||||
-rw-r--r-- | cmd/version.c | 2 | ||||
-rw-r--r-- | drivers/misc/cbmem_console.c | 2 | ||||
-rw-r--r-- | drivers/serial/serial_coreboot.c | 2 | ||||
-rw-r--r-- | drivers/video/coreboot.c | 2 |
10 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index 15c3ad8..69cf8f4 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -14,7 +14,7 @@ #include <asm/io.h> #include <asm/msr.h> #include <asm/mtrr.h> -#include <asm/arch/sysinfo.h> +#include <asm/cb_sysinfo.h> #include <asm/arch/timestamp.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index a2e47d1..43604ee 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -8,7 +8,7 @@ #include <common.h> #include <init.h> #include <asm/e820.h> -#include <asm/arch/sysinfo.h> +#include <asm/cb_sysinfo.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c index c52741a..816a0ef 100644 --- a/arch/x86/cpu/coreboot/tables.c +++ b/arch/x86/cpu/coreboot/tables.c @@ -8,7 +8,7 @@ #include <common.h> #include <net.h> -#include <asm/arch/sysinfo.h> +#include <asm/cb_sysinfo.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c index 0162597..b1e2955 100644 --- a/arch/x86/cpu/coreboot/timestamp.c +++ b/arch/x86/cpu/coreboot/timestamp.c @@ -8,7 +8,7 @@ #include <common.h> #include <bootstage.h> #include <asm/arch/timestamp.h> -#include <asm/arch/sysinfo.h> +#include <asm/cb_sysinfo.h> #include <linux/compiler.h> struct timestamp_entry { diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/cb_sysinfo.h index 419ec52..419ec52 100644 --- a/arch/x86/include/asm/arch-coreboot/sysinfo.h +++ b/arch/x86/include/asm/cb_sysinfo.h diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c index 9aafb89..175d3ce 100644 --- a/board/coreboot/coreboot/coreboot.c +++ b/board/coreboot/coreboot/coreboot.c @@ -4,7 +4,7 @@ */ #include <common.h> -#include <asm/arch/sysinfo.h> +#include <asm/cb_sysinfo.h> #include <asm/global_data.h> #include <init.h> #include <smbios.h> diff --git a/cmd/version.c b/cmd/version.c index 3686b87..685b458 100644 --- a/cmd/version.c +++ b/cmd/version.c @@ -9,7 +9,7 @@ #include <version.h> #include <linux/compiler.h> #ifdef CONFIG_SYS_COREBOOT -#include <asm/arch/sysinfo.h> +#include <asm/cb_sysinfo.h> #endif const char __weak version_string[] = U_BOOT_VERSION_STRING; diff --git a/drivers/misc/cbmem_console.c b/drivers/misc/cbmem_console.c index 5ba0a54..8bbe33d 100644 --- a/drivers/misc/cbmem_console.c +++ b/drivers/misc/cbmem_console.c @@ -9,7 +9,7 @@ #error This driver requires coreboot #endif -#include <asm/arch/sysinfo.h> +#include <asm/cb_sysinfo.h> struct cbmem_console { u32 buffer_size; diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c index 88c8209..de09c86 100644 --- a/drivers/serial/serial_coreboot.c +++ b/drivers/serial/serial_coreboot.c @@ -9,7 +9,7 @@ #include <dm.h> #include <ns16550.h> #include <serial.h> -#include <asm/arch/sysinfo.h> +#include <asm/cb_sysinfo.h> static int coreboot_of_to_plat(struct udevice *dev) { diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c index 0a5fb08..55f72fe 100644 --- a/drivers/video/coreboot.c +++ b/drivers/video/coreboot.c @@ -7,7 +7,7 @@ #include <dm.h> #include <vbe.h> #include <video.h> -#include <asm/arch/sysinfo.h> +#include <asm/cb_sysinfo.h> static int save_vesa_mode(struct cb_framebuffer *fb, struct vesa_mode_info *vesa) |