Fix merge problems

[karo-tx-uboot.git] / include / configs / AmigaOneG3SE.h

diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h
index 661149e66b68399e762efb4219935e241c64f23d..84efd2fe086535f67b0ddfc55ca11fb795c54017 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
@@ -95,6 +95,8 @@
 /* #define CONFIG_PCI_SCAN_SHOW 1 */
 #define CONFIG_PCI_PNP         1       /* PCI plug-and-play */
 
+#define atoi(x)                simple_strtoul(x,NULL,10)
+
 /*
  * Miscellaneous configurable options
  */
@@ -369,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 */