diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-26 22:13:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-26 22:13:11 -0400 |
| commit | 10af87817a3d924bfbfce0cc323f9785cccdb131 (patch) | |
| tree | 2ca16e5060d3e6b968cfed645d0713bf5ab7734a /include/configs/x86-common.h | |
| parent | f643d9294f45487f22e8f33d6572530f17eff4e9 (diff) | |
| parent | 6f1eba49a558421e3fcb06ab0addc12b9a3804c6 (diff) | |
| download | u-boot-imx-10af87817a3d924bfbfce0cc323f9785cccdb131.zip u-boot-imx-10af87817a3d924bfbfce0cc323f9785cccdb131.tar.gz u-boot-imx-10af87817a3d924bfbfce0cc323f9785cccdb131.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/configs/x86-common.h')
| -rw-r--r-- | include/configs/x86-common.h | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 994874c..b7dd63e 100644 --- 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 */ |