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 /include | |
| 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 'include')
| -rw-r--r-- | include/configs/coreboot.h | 16 | ||||
| -rw-r--r-- | include/configs/seaboard.h | 3 |
2 files changed, 15 insertions, 4 deletions
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/include/configs/seaboard.h b/include/configs/seaboard.h index 5e68faca3f..223beaea77 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -38,6 +38,9 @@ #include "tegra2-common.h" +/* So our flasher can verify that all is well */ +#define CONFIG_CRC32_VERIFY + #ifndef CONFIG_OF_CONTROL /* Things in here are defined by the device tree now. Let it grow! */ |