Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

[people/ms/u-boot.git] / include / configs / AmigaOneG3SE.h

diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h
index d914dccfbb4d922830dc77314897f19c7dca7b0b..a6e92287ff5bf6b9137f2885927fb08ec585921e 100644 (file)
--- a/include/configs/AmigaOneG3SE.h
+++ b/include/configs/AmigaOneG3SE.h
@@ -54,7 +54,7 @@
 
 #undef CONFIG_CLOCKS_IN_MHZ            /* clocks passed to Linux in Hz */
 
-#define CONFIG_BOOTARGS                "root=/dev/ram rw ramdisk=4096"
+#define CONFIG_BOOTARGS                "root=/dev/ram rw ramdisk_size=4096"
 
 /*
  * BOOTP options
@@ -240,12 +240,12 @@
 /*
  * Environment is stored in NVRAM.
  */
-#define CFG_ENV_IS_IN_NVRAM    1
-#define CFG_ENV_ADDR           0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to
+#define CONFIG_ENV_IS_IN_NVRAM 1
+#define CONFIG_ENV_ADDR                0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to
                                            * protect softex's settings for now.
                                            * Original 768 bytes where not enough.
                                            */
-#define CFG_ENV_SIZE           0x8000     /* Size of the Environment. See comment above */
+#define CONFIG_ENV_SIZE                0x8000     /* Size of the Environment. See comment above */
 
 #define CFG_CONSOLE_IS_IN_ENV  1 /* stdin/stdout/stderr are in environment */
 #define CFG_CONSOLE_OVERWRITE_ROUTINE  1
@@ -371,7 +371,8 @@
 #define CONFIG_BOOTDELAY       5 /* Boot automatically after five seconds */
 #define CONFIG_PREBOOT         ""
 #define CONFIG_BOOTCOMMAND     "fdcboot; diskboot"
-#define CONFIG_MENUPROMPT      "Press any key to interrupt autoboot: %2d "
+#define CONFIG_MENUPROMPT      \
+       "Press any key to interrupt autoboot: %2d ", bootdelay
 #define CONFIG_MENUKEY         ' '
 #define CONFIG_MENUCOMMAND     "menu"
 /* #define CONFIG_AUTOBOOT_KEYED */