imported Ka-Ro specific additions to U-Boot 2009.08 for TX28

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

diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index d7d0460ef663b0b8b70a1cb7e00b5ad69ecfb070..bf4a57d249bd06ce4d2a65860de04445977d3bd4 100755 (executable)
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -37,12 +37,13 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
-#define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
+#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
+#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size in bytes reserved for initial data */
 
 /*
  * select serial console configuration
  */
+#define CONFIG_LH7A40X_SERIAL
 #define CONFIG_CONSOLE_UART2   /* UART2 LH7A40x for console */
 
 /* allow to overwrite serial and ethaddr */
@@ -55,19 +56,32 @@
 
 #define        CONFIG_TIMESTAMP        1       /* Print timestamp info for images */
 
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
 #ifndef USE_920T_MMU
-#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_PING) & ~(CFG_CMD_CACHE))
+    #define CONFIG_CMD_PING
+    #undef CONFIG_CMD_CACHE
 #else
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DATE)
+    #define CONFIG_CMD_DATE
 #endif
 
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-
 #define CONFIG_BOOTDELAY       3
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   115200          /* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
 #define CONFIG_KGDB_SER_INDEX  1               /* which serial port to use */
@@ -76,31 +90,29 @@
 /*
  * Miscellaneous configurable options
  */
-#define        CFG_LONGHELP                            /* undef to save memory         */
-#define        CFG_PROMPT              "LPD7A400> "    /* Monitor Command Prompt       */
-#define        CFG_CBSIZE              256             /* Console I/O Buffer Size      */
-#define        CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
-#define        CFG_MAXARGS             16              /* max number of command args   */
-#define CFG_BARGSIZE           CFG_CBSIZE      /* Boot Argument Buffer Size    */
-
-#define CFG_MEMTEST_START      0xc0300000      /* memtest works on     */
-#define CFG_MEMTEST_END                0xc0500000      /* 2 MB in DRAM */
+#define        CONFIG_SYS_LONGHELP                             /* undef to save memory         */
+#define        CONFIG_SYS_PROMPT               "LPD7A400> "    /* Monitor Command Prompt       */
+#define        CONFIG_SYS_CBSIZE               256             /* Console I/O Buffer Size      */
+#define        CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
+#define        CONFIG_SYS_MAXARGS              16              /* max number of command args   */
+#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE       /* Boot Argument Buffer Size    */
 
-#undef  CFG_CLKS_IN_HZ         /* everything, incl board info, in Hz */
+#define CONFIG_SYS_MEMTEST_START       0xc0300000      /* memtest works on     */
+#define CONFIG_SYS_MEMTEST_END         0xc0500000      /* 2 MB in DRAM */
 
-#define        CFG_LOAD_ADDR           0xc0f00000      /* default load address */
+#define        CONFIG_SYS_LOAD_ADDR            0xc0f00000      /* default load address */
 
 /* valid baudrates */
-#define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
+#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 /* size and location of u-boot in flash */
-#define CFG_MONITOR_BASE       CFG_FLASH_BASE
-#define CFG_MONITOR_LEN                (256<<10)
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
+#define CONFIG_SYS_MONITOR_LEN         (256<<10)
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0xFC0000)
-#define CFG_ENV_SIZE           0x40000
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + 0xFC0000)
+#define CONFIG_ENV_SIZE                0x40000
 
 #endif  /* __LPD7A400_H_ */