diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-10-30 09:44:52 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-10-30 09:44:52 +0100 |
| commit | 104aecadc34ec12d14bad0ad71d2b88c59ae9dd8 (patch) | |
| tree | 2c6c944420d7e5518f9246fe01a838261aeae34d /lib | |
| parent | 604c39da346537ac1168fdcde1dcfb12506b5416 (diff) | |
| parent | b39a120de590a04a6bb7f04cb4cffa5f6aed715e (diff) | |
Merge branch 'chromeos-v2011.06' into colibri
Conflicts:
arch/arm/cpu/armv7/tegra3/warmboot_avp.c
arch/arm/include/asm/arch-tegra/clk_rst.h
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chromeos/crossystem_data.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |