From f1d6fda6d3ed0f397afebf715d9540e8666f1596 Mon Sep 17 00:00:00 2001
From: Bin Meng <bmeng.cn@gmail.com>
Date: Sat, 27 Feb 2016 22:57:55 -0800
Subject: [PATCH] x86: Move asm/arch-coreboot/tables.h to a common place
Move asm/arch-coreboot/tables.h to asm/coreboot_tables.h so that
coreboot table definitions can be used by other x86 builds.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
arch/x86/cpu/coreboot/sdram.c | 1 -
arch/x86/cpu/coreboot/tables.c | 1 -
arch/x86/include/asm/arch-coreboot/sysinfo.h | 2 +-
.../include/asm/{arch-coreboot/tables.h => coreboot_tables.h} | 0
drivers/video/coreboot_fb.c | 1 -
5 files changed, 1 insertion(+), 4 deletions(-)
rename arch/x86/include/asm/{arch-coreboot/tables.h => coreboot_tables.h} (100%)
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index 32f595d537..7115e7a151 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <asm/e820.h>
#include <asm/arch/sysinfo.h>
-#include <asm/arch/tables.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c
index 2b12b19ba2..543e51d96a 100644
--- a/arch/x86/cpu/coreboot/tables.c
+++ b/arch/x86/cpu/coreboot/tables.c
@@ -10,7 +10,6 @@
#include <common.h>
#include <net.h>
#include <asm/arch/sysinfo.h>
-#include <asm/arch/tables.h>
/*
* This needs to be in the .data section so that it's copied over during
diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h
index 2d5724503c..629088d49e 100644
--- a/arch/x86/include/asm/arch-coreboot/sysinfo.h
+++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h
@@ -9,7 +9,7 @@
#ifndef _COREBOOT_SYSINFO_H
#define _COREBOOT_SYSINFO_H
-#include <asm/arch/tables.h>
+#include <asm/coreboot_tables.h>
/* Maximum number of memory range definitions */
#define SYSINFO_MAX_MEM_RANGES 32
diff --git a/arch/x86/include/asm/arch-coreboot/tables.h b/arch/x86/include/asm/coreboot_tables.h
similarity index 100%
rename from arch/x86/include/asm/arch-coreboot/tables.h
rename to arch/x86/include/asm/coreboot_tables.h
diff --git a/drivers/video/coreboot_fb.c b/drivers/video/coreboot_fb.c
index 4790ef1fdc..feb5463f47 100644
--- a/drivers/video/coreboot_fb.c
+++ b/drivers/video/coreboot_fb.c
@@ -7,7 +7,6 @@
*/
#include <common.h>
-#include <asm/arch/tables.h>
#include <asm/arch/sysinfo.h>
#include <vbe.h>
#include <video_fb.h>
--
2.39.5