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

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

diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index 6590f6f5f0dc641efff675fa0ef04efb200bfbe0..7dd81e69cb91c1aa77e96b4e9818ca6961cd1514 100755 (executable)
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -51,14 +51,19 @@
 #define CONFIG_INITRD_TAG      1
 
 #define        CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SKIP_RELOCATE_UBOOT     /* undef this for direct boot from */
+                                                                       /* NOR flash without preloader */
 
-#define        CFG_LONGHELP
+#define        CONFIG_SYS_LONGHELP
 
+#ifndef roundup
+#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
+#endif
 /*
  * 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  (roundup(CONFIG_ENV_SIZE,4096) + 128*1024)
+#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE 115200
 
@@ -67,6 +72,7 @@
  */
 
 /* define one of these to choose the DBGU, USART0  or USART1 as console */
+#define CONFIG_AT91RM9200_USART
 #define CONFIG_DBGU
 #undef CONFIG_USART0
 #undef CONFIG_USART1
@@ -78,29 +84,41 @@
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_ENV_OVERWRITE   1
 
-#define CONFIG_COMMANDS                \
-                      ((CONFIG_CMD_DFL | \
-                       CFG_CMD_I2C | \
-                       CFG_CMD_PING | \
-                       CFG_CMD_DHCP ) & \
-                     ~(CFG_CMD_BDI | \
-                       CFG_CMD_FPGA | \
-                       CFG_CMD_MISC))
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * 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>
+
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_DHCP
+
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_MISC
+
 
 #define CONFIG_NR_DRAM_BANKS 1
 #define PHYS_SDRAM 0x20000000
 #define PHYS_SDRAM_SIZE 0x2000000  /* 32 megs */
 
-#define CFG_MEMTEST_START              PHYS_SDRAM
-#define CFG_MEMTEST_END                        CFG_MEMTEST_START + PHYS_SDRAM_SIZE - (512*1024)
+#define CONFIG_SYS_MEMTEST_START               PHYS_SDRAM
+#define CONFIG_SYS_MEMTEST_END                 CONFIG_SYS_MEMTEST_START + PHYS_SDRAM_SIZE - (512*1024)
 
 #define CONFIG_DRIVER_ETHER
 #define CONFIG_NET_RETRY_COUNT         20
 
-#define CFG_FLASH_BASE                 0x10000000
+#define CONFIG_SYS_FLASH_BASE                  0x10000000
 
 #ifdef CONFIG_KB9202
 #define PHYS_FLASH_SIZE                        0x1000000
@@ -108,38 +126,38 @@
 #define PHYS_FLASH_SIZE                        0x200000
 #endif
 
-#define CFG_MAX_FLASH_BANKS            1
-#define CFG_MAX_FLASH_SECT             256
+#define CONFIG_SYS_MAX_FLASH_BANKS             1
+#define CONFIG_SYS_MAX_FLASH_SECT              256
 
 #define        CONFIG_HARD_I2C
 
-#define        CFG_ENV_IS_IN_EEPROM
+#define        CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef CONFIG_KB9202
-#define CFG_ENV_OFFSET                 0x3E00
-#define CFG_ENV_SIZE                   0x0200
+#define CONFIG_ENV_OFFSET                      0x3E00
+#define CONFIG_ENV_SIZE                        0x0200
 #else
-#define CFG_ENV_OFFSET                 0x1000
-#define CFG_ENV_SIZE                   0x1000
+#define CONFIG_ENV_OFFSET                      0x1000
+#define CONFIG_ENV_SIZE                        0x1000
 #endif
-#define        CFG_I2C_EEPROM_ADDR             0x50
-#define        CFG_EEPROM_PAGE_WRITE_BITS      6
-#define        CFG_I2C_EEPROM_ADDR_LEN         2
-#define        CFG_I2C_SPEED                   50000
-#define        CFG_I2C_SLAVE                   0 /* not used */
-#define        CFG_EEPROM_PAGE_WRITE_DELAY_MS  10
+#define        CONFIG_SYS_I2C_EEPROM_ADDR              0x50
+#define        CONFIG_SYS_EEPROM_PAGE_WRITE_BITS       6
+#define        CONFIG_SYS_I2C_EEPROM_ADDR_LEN          2
+#define        CONFIG_SYS_I2C_SPEED                    50000
+#define        CONFIG_SYS_I2C_SLAVE                    0 /* not used */
+#define        CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS   10
 
-#define CFG_LOAD_ADDR          0x21000000  /* default load address */
+#define CONFIG_SYS_LOAD_ADDR           0x21000000  /* default load address */
 
-#define CFG_BAUDRATE_TABLE     {115200 , 19200, 38400, 57600, 9600 }
+#define CONFIG_SYS_BAUDRATE_TABLE      {115200 , 19200, 38400, 57600, 9600 }
 
-#define CFG_PROMPT             "U-Boot> "      /* Monitor Command Prompt */
-#define CFG_CBSIZE             256             /* Console I/O Buffer Size */
-#define CFG_MAXARGS            16              /* max number of command args */
-#define CFG_PBSIZE             (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
+#define CONFIG_SYS_PROMPT              "U-Boot> "      /* Monitor Command Prompt */
+#define CONFIG_SYS_CBSIZE              256             /* Console I/O Buffer Size */
+#define CONFIG_SYS_MAXARGS             16              /* max number of command args */
+#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 
-#define        CFG_FLASH_CFI_DRIVER
-#define        CFG_FLASH_CFI
+#define        CONFIG_FLASH_CFI_DRIVER
+#define        CONFIG_SYS_FLASH_CFI
 
 #ifndef __ASSEMBLY__
 /*-----------------------------------------------------------------------
@@ -160,8 +178,8 @@ struct bd_info_ext {
 };
 #endif
 
-#define CFG_HZ 1000
-#define CFG_HZ_CLOCK AT91C_MASTER_CLOCK/2      /* AT91C_TC0_CMR is implicitly set to */
+#define CONFIG_SYS_HZ 1000
+#define CONFIG_SYS_HZ_CLOCK AT91C_MASTER_CLOCK/2       /* AT91C_TC0_CMR is implicitly set to */
                                        /* AT91C_TC_TIMER_DIV1_CLOCK */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */