Merge git://git.denx.de/u-boot-cfi-flash

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

diff --git a/include/configs/edison.h b/include/configs/edison.h
index 399fbc7d9c42793e4ea77768d3af06b1816b0550..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