| Message ID | 1456642686-18887-2-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | f1d6fda6d3ed0f397afebf715d9540e8666f1596 |
| Delegated to: | Bin Meng |
| Headers | show |
On 27 February 2016 at 23:57, Bin Meng <bmeng.cn@gmail.com> wrote: > 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> > --- > > arch/x86/cpu/coreboot/sdram.c | 1 - > arch/x86/cpu/coreboot/tables.c | 1 - > arch/x86/include/asm/arch-coreboot/sysinfo.h | 2 +- > arch/x86/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%) Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Feb 29, 2016 at 12:19 PM, Simon Glass <sjg@chromium.org> wrote: > On 27 February 2016 at 23:57, Bin Meng <bmeng.cn@gmail.com> wrote: >> 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> >> --- >> >> arch/x86/cpu/coreboot/sdram.c | 1 - >> arch/x86/cpu/coreboot/tables.c | 1 - >> arch/x86/include/asm/arch-coreboot/sysinfo.h | 2 +- >> arch/x86/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%) > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86/next, thanks!
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 32f595d..7115e7a 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 2b12b19..543e51d 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 2d57245..629088d 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 4790ef1..feb5463 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>
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> --- arch/x86/cpu/coreboot/sdram.c | 1 - arch/x86/cpu/coreboot/tables.c | 1 - arch/x86/include/asm/arch-coreboot/sysinfo.h | 2 +- arch/x86/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%)