Kconfig: Move CONFIG_FIT and related options to Kconfig

[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 70ec103..ea815c2 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -24,10 +24,8 @@
 #define CONFIG_NR_DRAM_BANKS           8
 
 #define CONFIG_LMB
-#define CONFIG_OF_LIBFDT
 
 #define CONFIG_LZO
-#define CONFIG_FIT
 #undef CONFIG_ZLIB
 #undef CONFIG_GZIP
 #define CONFIG_SYS_BOOTM_LEN           (16 << 20)
@@ -100,6 +98,7 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_DATE
+#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_IO
 #define CONFIG_CMD_IRQ
@@ -208,6 +207,7 @@
 #define CONFIG_HOSTNAME                x86
 #define CONFIG_BOOTFILE                "bzImage"
 #define CONFIG_LOADADDR                0x1000000
+#define CONFIG_RAMDISK_ADDR            0x4000000
 
 #define CONFIG_EXTRA_ENV_SETTINGS                      \
        CONFIG_STD_DEVICES_SETTINGS                     \
@@ -215,7 +215,7 @@
        "netdev=eth0\0"                                 \
        "consoledev=ttyS0\0"                            \
        "othbootargs=acpi=off\0"                        \
-       "ramdiskaddr=0x2000000\0"                       \
+       "ramdiskaddr=0x4000000\0"                       \
        "ramdiskfile=initramfs.gz\0"
 
 #define CONFIG_RAMBOOTCOMMAND                          \
@@ -234,4 +234,6 @@
        "tftpboot $loadaddr $bootfile;"                 \
        "zboot $loadaddr"
 
+#define CONFIG_BOOTDELAY       2
+
 #endif /* __CONFIG_H */