global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR

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

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index ca27a4f..826aa1d 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -16,10 +16,6 @@
  */
 #define CONFIG_PHYSMEM
 
-#define CONFIG_LMB
-
-#undef CONFIG_ZLIB
-#undef CONFIG_GZIP
 #define CONFIG_SYS_BOOTM_LEN           (16 << 20)
 
 /* SATA AHCI storage */
@@ -43,10 +39,6 @@
  */
 #define CONFIG_SYS_NS16550_PORT_MAPPED
 
-/*-----------------------------------------------------------------------
- * Command line configuration.
- */
-
 #ifndef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND     \
        "ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000"
@@ -61,8 +53,6 @@
  */
 #define CONFIG_SYS_CBSIZE                      512
 
-#define CONFIG_SYS_MEMTEST_START               0x00100000
-#define CONFIG_SYS_MEMTEST_END                 0x01000000
 #define CONFIG_SYS_LOAD_ADDR                   0x20000000
 
 /*-----------------------------------------------------------------------
@@ -73,13 +63,9 @@
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MALLOC_LEN                  0x200000
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
 /*-----------------------------------------------------------------------
  * Environment configuration
  */
-#define CONFIG_ENV_SIZE                        0x01000
 
 /*-----------------------------------------------------------------------
  * PCI configuration
@@ -90,14 +76,12 @@
  * USB configuration
  */
 
-#define CONFIG_TFTP_TSIZE
 #define CONFIG_BOOTP_BOOTFILESIZE
 
 /* Default environment */
 #define CONFIG_ROOTPATH                "/opt/nfsroot"
 #define CONFIG_HOSTNAME                "x86"
 #define CONFIG_BOOTFILE                "bzImage"
-#define CONFIG_LOADADDR                0x1000000
 #define CONFIG_RAMDISK_ADDR    0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CONFIG_OTHBOOTARGS     "othbootargs=\0"
@@ -105,11 +89,14 @@
 #define CONFIG_OTHBOOTARGS     "othbootargs=acpi=off\0"
 #endif
 
-#ifndef CONFIG_DISTRO_DEFAULTS
-#define BOOTENV
+#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"                                 \
@@ -118,10 +105,10 @@
        "scriptaddr=0x7000000\0"                        \
        "kernel_addr_r=0x1000000\0"                     \
        "ramdisk_addr_r=0x4000000\0"                    \
-       "ramdiskfile=initramfs.gz\0"                    \
-       BOOTENV
+       "ramdiskfile=initramfs.gz\0"
+
 
-#define CONFIG_RAMBOOTCOMMAND                          \
+#define RAMBOOTCOMMAND                         \
        "setenv bootargs root=/dev/ram rw "             \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
        "console=$consoledev,$baudrate $othbootargs;"   \
@@ -129,7 +116,7 @@
        "tftpboot $ramdisk_addr_r $ramdiskfile;"        \
        "zboot $kernel_addr_r 0 $ramdisk_addr_r $filesize"
 
-#define CONFIG_NFSBOOTCOMMAND                          \
+#define NFSBOOTCOMMAND                         \
        "setenv bootargs root=/dev/nfs rw "             \
        "nfsroot=$serverip:$rootpath "                  \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \