diff options
| -rw-r--r-- | board/chromebook-x86/coreboot/config.mk | 3 | ||||
| -rw-r--r-- | include/configs/coreboot.h | 16 | ||||
| -rw-r--r-- | lib/chromeos/crossystem_data.c | 4 |
3 files changed, 19 insertions, 4 deletions
diff --git a/board/chromebook-x86/coreboot/config.mk b/board/chromebook-x86/coreboot/config.mk index 857ee8c4b9..627d4cfaf2 100644 --- a/board/chromebook-x86/coreboot/config.mk +++ b/board/chromebook-x86/coreboot/config.mk @@ -36,3 +36,6 @@ HOSTCFLAGS_autoconf.mk.dep = -Wno-variadic-macros LD := $(LD).bfd +ifdef BUILD_FACTORY_IMAGE +PLATFORM_CPPFLAGS += -DFACTORY_IMAGE +endif diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index fd2c0ccf9f..939c79a7ff 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -33,10 +33,19 @@ */ #define CONFIG_SYS_COREBOOT #define CONFIG_SHOW_BOOT_PROGRESS -#define BUILD_CMD_LINE_STUFF 0 #define BUILD_IDE_STUFF 0 -#define BUILD_NETWORK_STUFF 0 -#define BUILD_PART_FS_STUFF 0 + +#ifdef FACTORY_IMAGE +#define BUILD_CMD_LINE_STUFF 1 +#define BUILD_NETWORK_STUFF 1 +#define BUILD_PART_FS_STUFF 1 +#define CONFIG_BOOTDELAY -1 +#else +#define BUILD_CMD_LINE_STUFF 0 +#define BUILD_NETWORK_STUFF 0 +#define BUILD_PART_FS_STUFF 0 +#define CONFIG_BOOTDELAY 0 +#endif /* FDT support */ #define CONFIG_OF_LIBFDT /* Device tree support */ @@ -333,7 +342,6 @@ /* Boot options */ -#define CONFIG_BOOTDELAY 0 /* -1 to disable auto boot */ #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_BOOTARGS "" diff --git a/lib/chromeos/crossystem_data.c b/lib/chromeos/crossystem_data.c index df387c1484..f719a29fee 100644 --- a/lib/chromeos/crossystem_data.c +++ b/lib/chromeos/crossystem_data.c @@ -305,7 +305,11 @@ int crossystem_data_update_acpi(crossystem_data_t *cdata) len = min(ID_LEN, sizeof(acpi_table->vbt6)); memcpy(acpi_table->vbt6, cdata->readonly_firmware_id, len); +#ifdef FACTORY_IMAGE + acpi_table->vbt7 = 3; /* '3' means 'netboot' to crossystem */ +#else acpi_table->vbt7 = cdata->firmware_type; +#endif acpi_table->vbt8 = RECOVERY_REASON_NONE; acpi_table->vbt9 = cdata->fmap_offset; |