Merge branch 'master' into next

[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 394978b..c1c5a09 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -10,69 +10,26 @@
 #ifndef __CONFIG_X86_COMMON_H
 #define __CONFIG_X86_COMMON_H
 
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_SYS_BOOTM_LEN           (16 << 20)
-
-/* SATA AHCI storage */
-#ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LBA48
-#define CONFIG_SYS_64BIT_LBA
-
-#endif
-
-/* Generic TPM interfaced through LPC bus */
-#define CONFIG_TPM_TIS_BASE_ADDRESS        0xfed40000
-
-/*-----------------------------------------------------------------------
- * Real Time Clock Configuration
- */
-#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
-#define CONFIG_SYS_ISA_IO      CONFIG_SYS_ISA_IO_BASE_ADDRESS
-
-/*-----------------------------------------------------------------------
- * Serial Configuration
- */
-#define CONFIG_SYS_NS16550_PORT_MAPPED
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_CBSIZE                      512
-
 /*-----------------------------------------------------------------------
  * CPU Features
  */
 
-#define CONFIG_SYS_STACK_SIZE                  (32 * 1024)
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CFG_SYS_STACK_SIZE                     (32 * 1024)
 
 /*-----------------------------------------------------------------------
  * Environment configuration
  */
 
 /*-----------------------------------------------------------------------
- * PCI configuration
- */
-#define CONFIG_PCI_CONFIG_HOST_BRIDGE
-
-/*-----------------------------------------------------------------------
  * USB configuration
  */
 
-#define CONFIG_BOOTP_BOOTFILESIZE
-
 /* Default environment */
-#define CONFIG_ROOTPATH                "/opt/nfsroot"
-#define CONFIG_HOSTNAME                "x86"
-#define CONFIG_BOOTFILE                "bzImage"
-#define CONFIG_RAMDISK_ADDR    0x4000000
+#define CFG_RAMDISK_ADDR       0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
-#define CONFIG_OTHBOOTARGS     "othbootargs=\0"
+#define CFG_OTHBOOTARGS        "othbootargs=\0"
 #else
-#define CONFIG_OTHBOOTARGS     "othbootargs=acpi=off\0"
+#define CFG_OTHBOOTARGS        "othbootargs=acpi=off\0"
 #endif
 
 #if defined(CONFIG_DISTRO_DEFAULTS)
@@ -85,14 +42,14 @@
 #define SPLASH_SETTINGS
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS                      \
+#define CFG_EXTRA_ENV_SETTINGS                 \
        DISTRO_BOOTENV                                  \
-       CONFIG_STD_DEVICES_SETTINGS                     \
+       CFG_STD_DEVICES_SETTINGS                        \
        SPLASH_SETTINGS                                 \
        "pciconfighost=1\0"                             \
        "netdev=eth0\0"                                 \
        "consoledev=ttyS0\0"                            \
-       CONFIG_OTHBOOTARGS                              \
+       CFG_OTHBOOTARGS                         \
        "scriptaddr=0x7000000\0"                        \
        "kernel_addr_r=0x1000000\0"                     \
        "ramdisk_addr_r=0x4000000\0"                    \