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

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

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 7fcf76a6bf2aa1ab0074f0a89dd6a15d1645b268..016b797a534ecca7822f17705aa8b9aa8dba5e02 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -14,7 +14,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_SHOW_BOOT_PROGRESS
 #define CONFIG_PHYSMEM
 
 #define CONFIG_LMB
@@ -62,8 +61,6 @@
  */
 #define CONFIG_SYS_CBSIZE                      512
 
-#define CONFIG_SYS_MEMTEST_START               0x00100000
-#define CONFIG_SYS_MEMTEST_END                 0x01000000
 #define CONFIG_SYS_LOAD_ADDR                   0x20000000
 
 /*-----------------------------------------------------------------------
@@ -80,7 +77,6 @@
 /*-----------------------------------------------------------------------
  * Environment configuration
  */
-#define CONFIG_ENV_SIZE                        0x01000
 
 /*-----------------------------------------------------------------------
  * PCI configuration
@@ -106,30 +102,40 @@
 #define CONFIG_OTHBOOTARGS     "othbootargs=acpi=off\0"
 #endif
 
+#if defined(CONFIG_DISTRO_DEFAULTS)
+#define DISTRO_BOOTENV         BOOTENV
+#else
+#define DISTRO_BOOTENV
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS                      \
+       DISTRO_BOOTENV                                  \
        CONFIG_STD_DEVICES_SETTINGS                     \
        "pciconfighost=1\0"                             \
        "netdev=eth0\0"                                 \
        "consoledev=ttyS0\0"                            \
        CONFIG_OTHBOOTARGS                              \
-       "ramdiskaddr=0x4000000\0"                       \
+       "scriptaddr=0x7000000\0"                        \
+       "kernel_addr_r=0x1000000\0"                     \
+       "ramdisk_addr_r=0x4000000\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"
+       "tftpboot $kernel_addr_r $bootfile;"            \
+       "tftpboot $ramdisk_addr_r $ramdiskfile;"        \
+       "zboot $kernel_addr_r 0 $ramdisk_addr_r $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"
+       "tftpboot $kernel_addr_r $bootfile;"            \
+       "zboot $kernel_addr_r"
 
 
 #endif /* __CONFIG_H */