Fix merge problems

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

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index e3899a5ab4066da21b7d8b21f12687c83f923697..3d1eafee6966d8626a3a3a6d3125894f2eb6e746 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -35,30 +35,38 @@
 #define CONFIG_MPC5200         1       /* More exactly a MPC5200 */
 #define CONFIG_MOTIONPRO       1       /* ... on Promess Motion-PRO board */
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
 
 /*
- * Supported commands
- */
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                               CFG_CMD_ASKENV  | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_REGINFO | \
-                               CFG_CMD_IMMAP   | \
-                               CFG_CMD_ELF     | \
-                               CFG_CMD_MII     | \
-                               CFG_CMD_BEDBUG  | \
-                               CFG_CMD_NET     | \
-                               CFG_CMD_PING    | \
-                               CFG_CMD_IDE     | \
-                               CFG_CMD_FAT     | \
-                               CFG_CMD_JFFS2   | \
-                               CFG_CMD_I2C     | \
-                               CFG_CMD_DATE    | \
-                               CFG_CMD_EEPROM  | \
-                               CFG_CMD_DTT)
-
-/* 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_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_BEDBUG
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_DTT
 
 
 /*
@@ -88,7 +96,7 @@
 #undef CONFIG_AUTOBOOT_DELAY_STR
 #undef CONFIG_BOOTARGS
 #define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, "           \
-                                       "press \"<Esc><Esc>\" to stop\n"
+                               "press \"<Esc><Esc>\" to stop\n", bootdelay
 
 #define CONFIG_ETHADDR         00:50:C2:40:10:00
 #define CONFIG_OVERWRITE_ETHADDR_ONCE  1
@@ -156,9 +164,9 @@
 
 
 /*
- * Clock configuration: SYS_XTALIN = 25MHz
+ * Clock configuration: SYS_XTALIN = 33MHz
  */
-#define CFG_MPC5XXX_CLKIN      25000000
+#define CFG_MPC5XXX_CLKIN      33000000
 
 
 /*
@@ -204,7 +212,7 @@
 #endif
 
 #define CFG_MONITOR_LEN                (256 << 10)     /* 256 kB for Monitor */
-#define CFG_MALLOC_LEN         (128 << 10)     /* 128 kB for malloc() */
+#define CFG_MALLOC_LEN         (1024 << 10)    /* 1 MiB for malloc() */
 #define CFG_BOOTMAPSZ          (8 << 20)       /* initial mem map for Linux */
 
 
@@ -214,7 +222,7 @@
 /* Boot Chipselect */
 #define CFG_BOOTCS_START       CFG_FLASH_BASE
 #define CFG_BOOTCS_SIZE                CFG_FLASH_SIZE
-#define CFG_BOOTCS_CFG         0x03035D00
+#define CFG_BOOTCS_CFG         0x00045D00
 
 /* Flash memory addressing */
 #define CFG_CS0_START          CFG_FLASH_BASE
@@ -244,11 +252,11 @@
 /*
  * SDRAM configuration
  */
-/* 2 x MT48LC16M16A2BG-75 IT:D, CASL 2, 32 bit data bus */
-#define SDRAM_CONFIG1          0x52222600
-#define SDRAM_CONFIG2          0x88b70000
-#define SDRAM_CONTROL          0x50570000
-#define SDRAM_MODE             0x008d0000
+/* 2 x MT48LC16M16A2BG-75 IT:D, CASL 3, 32 bit data bus */
+#define SDRAM_CONFIG1          0x62322900
+#define SDRAM_CONFIG2          0x88c70000
+#define SDRAM_CONTROL          0x504f0000
+#define SDRAM_MODE             0x00cd0000
 
 
 /*
@@ -260,7 +268,7 @@
 #define CFG_FLASH_SIZE         0x01000000
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
-#define CFG_MAX_FLASH_SECT     256     /* max num of sects on one chip */
+#define CFG_MAX_FLASH_SECT     128     /* max num of sects on one chip */
 #define CONFIG_FLASH_16BIT             /* Flash is 16-bit */
 
 /*
@@ -270,8 +278,8 @@
 #define MTDIDS_DEFAULT         "nor0=motionpro-0"
 #define MTDPARTS_DEFAULT       "mtdparts=motionpro-0:"                   \
                                        "13m(fs),2m(kernel),256k(uboot)," \
-                                       "64k(env),64k(redund_env),64k(dtb)," \
-                                       "-(user_data)"
+                                       "128k(env),128k(redund_env),"     \
+                                       "128k(dtb),-(user_data)"
 
 /*
  * IDE/ATA configuration
@@ -349,7 +357,7 @@ extern void __led_set(led_id_t id, int state);
 /* This has to be a multiple of the Flash sector size */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 #define CFG_ENV_SIZE           0x1000
-#define CFG_ENV_SECT_SIZE      0x10000
+#define CFG_ENV_SECT_SIZE      0x20000
 
 /* Configuration of redundant environment */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
@@ -387,7 +395,8 @@ extern void __led_set(led_id_t id, int state);
 #define CFG_BARGSIZE           CFG_CBSIZE      /* Boot Argument Buffer Size */
 
 #define CFG_MEMTEST_START      0x00100000      /* memtest works on */
-#define CFG_MEMTEST_END                0x03f00000      /* 1 ... 64 MiB in DRAM */
+#define CFG_MEMTEST_END                0x03e00000      /* 1 ... 62 MiB in DRAM */
+#define CFG_ALT_MEMTEST
 
 #define CFG_LOAD_ADDR          0x200000        /* default kernel load addr */
 
@@ -410,11 +419,9 @@ extern void __led_set(led_id_t id, int state);
 #define CFG_RESET_ADDRESS      0xfff00100
 
 /* pass open firmware flat tree */
-#define CONFIG_OF_FLAT_TREE    1
+#define CONFIG_OF_LIBFDT       1
 #define CONFIG_OF_BOARD_SETUP  1
 
-/* maximum size of the flat tree (8K) */
-#define OF_FLAT_TREE_MAX_SIZE  8192
 #define OF_CPU                 "PowerPC,5200@0"
 #define OF_SOC                 "soc5200@f0000000"
 #define OF_TBCLK               (bd->bi_busfreq / 4)