diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-30 10:09:01 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-30 10:09:01 -0500 |
| commit | f1554b28d31250df5418254e79e0bf75ff3b2e54 (patch) | |
| tree | da4d313fa10648a052f132df1432a860b9cffd18 /include | |
| parent | eef11acebaa48e241e9187c717dc92d3e175c119 (diff) | |
| parent | e21b04fec465c84a51ca6fc6450263e0c0953fcb (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/x86-common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 994214ea48..e8f680f129 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -62,8 +62,10 @@ * Command line configuration. */ +#ifndef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND \ "ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000" +#endif #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 115200 |