Merge git://git.denx.de/u-boot-sh

[people/ms/u-boot.git] / include / configs / x86-common.h

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 994214ea48a784ee92855bd0c450916fd7a7d4b7..e8f680f129fb075938c72b3231c3a44bc85380e5 100644 (file)
--- 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