Merge branch 'master' of /home/wd/git/u-boot/custodians

[platform/kernel/u-boot.git] / include / configs / AmigaOneG3SE.h

diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h
index 99b42e9..a6e9228 100644 (file)
--- a/include/configs/AmigaOneG3SE.h
+++ b/include/configs/AmigaOneG3SE.h
@@ -43,7 +43,7 @@
 
 #define CONFIG_AMIGAONEG3SE    1
 
-#define CONFIG_BOARD_PRE_INIT  1
+#define CONFIG_BOARD_EARLY_INIT_F 1
 #define CONFIG_MISC_INIT_R     1
 
 #define CONFIG_VERY_BIG_RAM    1
@@ -54,40 +54,48 @@
 
 #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
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | \
-                                CONFIG_BOOTP_BOOTFILESIZE)
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
 #define CONFIG_AMIGA_PARTITION
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                                CFG_CMD_ASKENV | \
-                                CFG_CMD_BSP    | \
-                                CFG_CMD_DATE   | \
-                                CFG_CMD_DHCP   | \
-                                CFG_CMD_ELF    | \
-                                CFG_CMD_NET    | \
-                                CFG_CMD_IDE    | \
-                                CFG_CMD_FDC    | \
-                                CFG_CMD_CACHE  | \
-                                CFG_CMD_CONSOLE| \
-                                CFG_CMD_USB    | \
-                                CFG_CMD_BSP    | \
-                                CFG_CMD_PCI    )
-
-/*                                 CFG_CMD_MII    | \ */
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_FDC
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_CONSOLE|
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_PCI
+
 
 #define CONFIG_PCI             1
 /* #define CONFIG_PCI_SCAN_SHOW 1 */
 #define CONFIG_PCI_PNP         1       /* PCI plug-and-play */
 
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any)
- */
-#include <cmd_confdefs.h>
-
+#define atoi(x)                simple_strtoul(x,NULL,10)
 
 /*
  * Miscellaneous configurable options
@@ -232,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
@@ -247,7 +255,7 @@
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     32
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value        */
 #endif
 
@@ -348,8 +356,6 @@
 
 #define CONFIG_3COM
 /* #define CONFIG_BOOTP_RANDOM_DELAY */
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | \
-                                CONFIG_BOOTP_BOOTFILESIZE)
 
 /*
  * USB configuration
@@ -365,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 */