[INKA4x0] NG hardware: platform code update

- Cleanup compile warnings.
- Add missing '\0' in default environment.
- Increase CFG_MONITOR_LEN to 256 KiB.
- Add required CFG_USE_PPCENV.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>

diff --git a/board/inka4x0/inka4x0.c b/board/inka4x0/inka4x0.c
index 478a331b408e01007078c2a66ded3f4ed6cfc7ce..c80fc3ba513b6f8874fcdaa0cb41c71b507612e1 100644 (file)
--- a/board/inka4x0/inka4x0.c
+++ b/board/inka4x0/inka4x0.c
@@ -88,7 +88,7 @@ long int initdram (int board_type)
 {
        ulong dramsize = 0;
 #ifndef CFG_RAMBOOT
-       ulong test1, test2;
+       long test1, test2;
 
        /* setup SDRAM chip selects */
        *(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x0000001c; /* 512MB at 0x0 */
@@ -108,9 +108,9 @@ long int initdram (int board_type)
 
        /* find RAM size using SDRAM CS0 only */
        sdram_start(0);
-       test1 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x20000000);
+       test1 = get_ram_size((long *)CFG_SDRAM_BASE, 0x20000000);
        sdram_start(1);
-       test2 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x20000000);
+       test2 = get_ram_size((long *)CFG_SDRAM_BASE, 0x20000000);
        if (test1 > test2) {
                sdram_start(0);
                dramsize = test1;
@@ -175,7 +175,7 @@ void flash_preinit(void)
 
 int misc_init_f (void)
 {
-       uchar tmp[10];
+       char tmp[10];
        int i, br;
 
        i = getenv_r("brightness", tmp, sizeof(tmp));

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 0fac28fadd70d128cb799b9d811ad2cec26ef0d0..af8fb21e276478025e6fdea2a215ae33e2a27c83 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -142,7 +142,7 @@
                "cp.l 100000 f0000b28 1\0"                              \
        "ideargs=setenv bootargs root=/dev/hda1 rw\0"                   \
        "ide_boot=ext2load ide 0:1 200000 uImage;"                      \
-               "run ideargs addip addcons enable_disp;bootm"           \
+               "run ideargs addip addcons enable_disp;bootm\0"         \
        "brightness=255\0"                                              \
        ""
 
@@ -174,6 +174,7 @@
 #define CFG_ENV_SIZE           0x2000
 #define CFG_ENV_SECT_SIZE      0x2000
 #define CONFIG_ENV_OVERWRITE   1
+#define CFG_USE_PPCENV                 /* Environment embedded in sect .ppcenv */
 
 /*
  * Memory map
@@ -203,7 +204,7 @@
 #   define CFG_RAMBOOT         1
 #endif
 
-#define CFG_MONITOR_LEN                (192 << 10)     /* Reserve 192 kB for Monitor   */
+#define CFG_MONITOR_LEN                (256 << 10)     /* Reserve 256 kB for Monitor   */
 #define CFG_MALLOC_LEN         (128 << 10)     /* Reserve 128 kB for malloc()  */
 #define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */