x86: qemu: Fix non-working ramboot and nfsboot environment variables

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

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 78c382de0ca1211bf00e39ca9e811d9ad27b4e8d..ca27a4f9e242038b19db1db0e87221766defa169 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
@@ -28,10 +27,6 @@
 #define CONFIG_LBA48
 #define CONFIG_SYS_64BIT_LBA
 
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID    2
-#define CONFIG_SYS_SCSI_MAX_LUN                1
-#define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-                                        CONFIG_SYS_SCSI_MAX_LUN)
 #endif
 
 /* Generic TPM interfaced through LPC bus */
@@ -40,7 +35,6 @@
 /*-----------------------------------------------------------------------
  * Real Time Clock Configuration
  */
-#define CONFIG_RTC_MC146818
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
 #define CONFIG_SYS_ISA_IO      CONFIG_SYS_ISA_IO_BASE_ADDRESS
 
@@ -111,30 +105,37 @@
 #define CONFIG_OTHBOOTARGS     "othbootargs=acpi=off\0"
 #endif
 
+#ifndef CONFIG_DISTRO_DEFAULTS
+#define BOOTENV
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS                      \
        CONFIG_STD_DEVICES_SETTINGS                     \
        "pciconfighost=1\0"                             \
        "netdev=eth0\0"                                 \
        "consoledev=ttyS0\0"                            \
        CONFIG_OTHBOOTARGS                              \
-       "ramdiskaddr=0x4000000\0"                       \
-       "ramdiskfile=initramfs.gz\0"
+       "scriptaddr=0x7000000\0"                        \
+       "kernel_addr_r=0x1000000\0"                     \
+       "ramdisk_addr_r=0x4000000\0"                    \
+       "ramdiskfile=initramfs.gz\0"                    \
+       BOOTENV
 
 #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 */