erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace includes of build.h with version.h

Browse source 
As build.h is an auto-generated file it was necessary to add it as
an explicit prerequisite in the Makefiles. When this was forgotten
abuild would sometimes fail with following error:

   fatal error: build.h: No such file or directory

Fix this error by compiling version.c into all stages.

Change-Id: I342f341077cc7496aed279b00baaa957aa2af0db
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7510
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
Kyösti Mälkki 2014-11-18 12:41:16 +02:00
commit c36af7b00a
31 changed files with 108 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/mainboard/lenovo/t60/mainboard.c
View file

@ -36,7 +36,7 @@
#include <arch/x86/include/arch/acpigen.h>
#include <arch/interrupt.h>
#include <smbios.h>
#include <build.h>
#include <version.h>
#include <drivers/intel/gma/int15.h>
#define PANEL INT15_5F35_CL_DISPLAY_DEFAULT
@ -54,11 +54,16 @@ int get_cst_entries(acpi_cstate_t **entries)
const char *smbios_mainboard_bios_version(void)
{
static char *s = NULL;
/* Satisfy thinkpad_acpi. */
if (strlen(CONFIG_LOCALVERSION))
return "CBET4000 " CONFIG_LOCALVERSION;
else
return "CBET4000 " COREBOOT_VERSION;
if (s != NULL)
return s;
s = strconcat("CBET4000 ", coreboot_version);
return s;
}
static void mainboard_init(device_t dev)

11
src/mainboard/lenovo/x200/mainboard.c
View file

@ -27,7 +27,7 @@
#include <ec/acpi/ec.h>
#include <smbios.h>
#include <string.h>
#include <build.h>
#include <version.h>
#include <ec/lenovo/pmh7/pmh7.h>
#include <ec/acpi/ec.h>
#include <ec/lenovo/h8/h8.h>
@ -37,11 +37,16 @@
const char *smbios_mainboard_bios_version(void)
{
static char *s = NULL;
/* Satisfy thinkpad_acpi. */
if (strlen(CONFIG_LOCALVERSION))
return "CBET4000 " CONFIG_LOCALVERSION;
else
return "CBET4000 " COREBOOT_VERSION;
if (s != NULL)
return s;
s = strconcat("CBET4000 ", coreboot_version);
return s;
}
static void mainboard_init(device_t dev)

11
src/mainboard/lenovo/x201/mainboard.c
View file

@ -45,7 +45,7 @@
#include <cpu/x86/lapic.h>
#include <device/pci.h>
#include <smbios.h>
#include <build.h>
#include <version.h>
#include "drivers/lenovo/lenovo.h"
static acpi_cstate_t cst_entries[] = {
@ -62,11 +62,16 @@ int get_cst_entries(acpi_cstate_t ** entries)
const char *smbios_mainboard_bios_version(void)
{
static char *s = NULL;
/* Satisfy thinkpad_acpi. */
if (strlen(CONFIG_LOCALVERSION))
return "CBET4000 " CONFIG_LOCALVERSION;
else
return "CBET4000 " COREBOOT_VERSION;
if (s != NULL)
return s;
s = strconcat("CBET4000 ", coreboot_version);
return s;
}

11
src/mainboard/lenovo/x220/mainboard.c
View file

@ -32,7 +32,7 @@
#include <device/pci.h>
#include <pc80/keyboard.h>
#include <ec/lenovo/h8/h8.h>
#include <build.h>
#include <version.h>
void mainboard_suspend_resume(void)
{
@ -42,11 +42,16 @@ void mainboard_suspend_resume(void)
const char *smbios_mainboard_bios_version(void)
{
static char *s = NULL;
/* Satisfy thinkpad_acpi. */
if (strlen(CONFIG_LOCALVERSION))
return "CBET4000 " CONFIG_LOCALVERSION;
else
return "CBET4000 " COREBOOT_VERSION;
if (s != NULL)
return s;
s = strconcat("CBET4000 ", coreboot_version);
return s;
}
static void mainboard_init(device_t dev)

11
src/mainboard/lenovo/x230/mainboard.c
View file

@ -33,7 +33,7 @@
#include <device/pci.h>
#include <pc80/keyboard.h>
#include <ec/lenovo/h8/h8.h>
#include <build.h>
#include <version.h>
void mainboard_suspend_resume(void)
{
@ -43,11 +43,16 @@ void mainboard_suspend_resume(void)
const char *smbios_mainboard_bios_version(void)
{
static char *s = NULL;
/* Satisfy thinkpad_acpi. */
if (strlen(CONFIG_LOCALVERSION))
return "CBET4000 " CONFIG_LOCALVERSION;
else
return "CBET4000 " COREBOOT_VERSION;
if (s != NULL)
return s;
s = strconcat("CBET4000 ", coreboot_version);
return s;
}
static void mainboard_init(device_t dev)

11
src/mainboard/lenovo/x60/mainboard.c
View file

@ -38,7 +38,7 @@
#include "dock.h"
#include <arch/x86/include/arch/acpigen.h>
#include <smbios.h>
#include <build.h>
#include <version.h>
#include <drivers/intel/gma/int15.h>
#include "drivers/lenovo/lenovo.h"
@ -103,11 +103,16 @@ static void mainboard_init(device_t dev)
const char *smbios_mainboard_bios_version(void)
{
static char *s = NULL;
/* Satisfy thinkpad_acpi. */
if (strlen(CONFIG_LOCALVERSION))
return "CBET4000 " CONFIG_LOCALVERSION;
else
return "CBET4000 " COREBOOT_VERSION;
if (s != NULL)
return s;
s = strconcat("CBET4000 ", coreboot_version);
return s;
}
static void fill_ssdt(void)