Merge branch 'master' of git://git.denx.de/u-boot-fdt

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

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 994874ca600a00d060b7e6710e0ea3dd2e840331..b7dd63e06009c6d87624b5b73eec0f4516392f32 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -243,7 +243,34 @@
 
 #define CONFIG_CMD_USB
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       CONFIG_STD_DEVICES_SETTINGS
+/* Default environment */
+#define CONFIG_ROOTPATH                "/opt/nfsroot"
+#define CONFIG_HOSTNAME                "x86"
+#define CONFIG_BOOTFILE                "bzImage"
+#define CONFIG_LOADADDR                0x1000000
+
+#define CONFIG_EXTRA_ENV_SETTINGS                      \
+       CONFIG_STD_DEVICES_SETTINGS                     \
+       "netdev=eth0\0"                                 \
+       "consoledev=ttyS0\0"                            \
+       "othbootargs=acpi=off\0"                        \
+       "ramdiskaddr=0x2000000\0"                       \
+       "ramdiskfile=initramfs.gz\0"
+
+#define CONFIG_RAMBOOTCOMMAND                          \
+       "setenv bootargs root=/dev/ram rw "             \
+       "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
+       "console=$consoledev,$baudrate $othbootargs;"   \
+       "tftpboot $loadaddr $bootfile;"                 \
+       "tftpboot $ramdiskaddr $ramdiskfile;"           \
+       "zboot $loadaddr 0 $ramdiskaddr $filesize"
+
+#define CONFIG_NFSBOOTCOMMAND                          \
+       "setenv bootargs root=/dev/nfs rw "             \
+       "nfsroot=$serverip:$rootpath "                  \
+       "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
+       "console=$consoledev,$baudrate $othbootargs;"   \
+       "tftpboot $loadaddr $bootfile;"                 \
+       "zboot $loadaddr"
 
 #endif /* __CONFIG_H */