8xx, mgsuvd: updates for 2009.03

- activate Rx buf len > 1 on SMC
- pram activated
- MTDPARTS_DEFAULT defined
- update the size of the flash in the DTS
  before booting Linux
- MONITOR_LEN updated to 384k
- added CONFIG_HOSTNAME
- added CONFIG_ENV_BUFFER_PRINT
- Environment size reduced to 16k

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/board/keymile/mgsuvd/mgsuvd.c b/board/keymile/mgsuvd/mgsuvd.c
index 02baf62..e7bfa31 100644 (file)
--- a/board/keymile/mgsuvd/mgsuvd.c
+++ b/board/keymile/mgsuvd/mgsuvd.c
@@ -168,6 +168,7 @@ void ft_blob_update (void *blob, bd_t *bd)
        ulong brg_data[1] = {0};
        ulong memory_data[2] = {0};
        ulong flash_data[4] = {0};
+       ulong flash_reg[3] = {0};
 
        memory_data[0] = cpu_to_be32 (bd->bi_memstart);
        memory_data[1] = cpu_to_be32 (bd->bi_memsize);
@@ -179,6 +180,10 @@ void ft_blob_update (void *blob, bd_t *bd)
        fdt_set_node_and_value (blob, "/localbus", "ranges", flash_data,
                                sizeof (flash_data));
 
+       flash_reg[2] = cpu_to_be32 (bd->bi_flashsize);
+       fdt_set_node_and_value (blob, "/localbus/flash@0,0", "reg", flash_reg,
+                               sizeof (flash_reg));
+
        /* BRG */
        brg_data[0] = cpu_to_be32 (bd->bi_busfreq);
        fdt_set_node_and_value (blob, "/soc/cpm", "brg-frequency", brg_data,

diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h
index f53b6d3..4623e4c 100644 (file)
--- a/include/configs/mgsuvd.h
+++ b/include/configs/mgsuvd.h
@@ -35,6 +35,7 @@
 
 #define CONFIG_MPC866          1       /* This is a MPC866 CPU         */
 #define CONFIG_MGSUVD          1       /* ...on a mgsuvd board */
+#define CONFIG_HOSTNAME                mgsuvd
 
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
@@ -44,10 +45,15 @@
 #define CONFIG_SYS_SMC_UCODE_PATCH     1       /* Relocate SMC1 */
 #define CONFIG_SYS_SMC_DPMEM_OFFSET    0x1fc0
 #define CONFIG_8xx_CONS_SMC1   1       /* Console is on SMC1           */
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 
 #define CONFIG_SYS_CPM_BOOTCOUNT_ADDR  0x1eb0  /* In case of SMC relocation, the
                                         * default value is not working */
 
+#define BOOTFLASH_START        F0000000
+#define CONFIG_PRAM    512     /* protected RAM [KBytes] */
+
 #define CONFIG_PREBOOT "echo;" \
        "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
@@ -110,7 +116,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xf0000000
-#define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor   */
+#define CONFIG_SYS_MONITOR_LEN         (384 << 10)     /* Reserve 384 kB for Monitor   */
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_MALLOC_LEN          (256 << 10)     /* Reserve 256 kB for malloc()  */
 
@@ -135,13 +141,14 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)      */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_OFFSET              0x40000 /*   Offset   of Environment Sector     */
-#define CONFIG_ENV_SIZE                0x08000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_OFFSET      CONFIG_SYS_MONITOR_LEN
+#define CONFIG_ENV_SIZE                0x04000 /* Total Size of Environment Sector     */
 #define CONFIG_ENV_SECT_SIZE   0x20000 /* Total Size of Environment Sector     */
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
+#define CONFIG_ENV_BUFFER_PRINT                1
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
@@ -324,4 +331,9 @@
 #define CONFIG_SYS_DTT_HYSTERESIS      3
 #define CONFIG_SYS_DTT_BUS_NUM         (CONFIG_SYS_MAX_I2C_BUS)
 
+#define MTDIDS_DEFAULT         "nor0=app"
+#define MTDPARTS_DEFAULT ( \
+       "mtdparts=app:384k(u-boot),128k(env),128k(envred),128k(free),"  \
+       "1536k(esw0),8704k(rootfs0),1536k(esw1),2432k(rootfs1),640k(var),768k(cfg)")
+
 #endif /* __CONFIG_H */