Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/edison.h b/include/configs/edison.h
index dfac340c2f5e042d3d71d5d93b8fb60a6015cc19..79dd690e71efeb824655a6852ccaadeeb2c86feb 100644 (file)
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -9,17 +9,18 @@
 
 #include <asm/ibmpc.h>
 
+/* ACPI */
+#define CONFIG_LAST_STAGE_INIT
+
 /* Boot */
 #define CONFIG_BOOTCOMMAND "run bootcmd"
 
 /* DISK Partition support */
-#define CONFIG_RANDOM_UUID
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 
 #define CONFIG_SYS_CBSIZE      2048
-#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS     128
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
 
@@ -42,7 +43,6 @@
 #define CONFIG_SYS_MEMTEST_END                 0x01000000
 
 /* Environment */
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV                 0
 #define CONFIG_SYS_MMC_ENV_PART                        0
 #define CONFIG_ENV_SIZE                                (64 * 1024)