mips: vocore2: fix various issues

- fix SPL image generation
- fix incorrect console output
- increase malloc_f and malloc_r space to fix LZMA decompression errors
- increase SPI flash clock

Signed-off-by: Mauro Condarelli <mc5686@mclink.it>
[squashed to one patch, fix commit subject and description]
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>

diff --git a/arch/mips/dts/vocore_vocore2.dts b/arch/mips/dts/vocore_vocore2.dts
index 3502e4b8b7970e6f586b02c3569da9efb1283732..9adf39652f8bae79d0a32bfeef79c230b05b6e59 100644 (file)
--- a/arch/mips/dts/vocore_vocore2.dts
+++ b/arch/mips/dts/vocore_vocore2.dts
@@ -59,7 +59,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <25000000>;
+               spi-max-frequency = <40000000>;
                reg = <0>;
        };
 };

diff --git a/configs/vocore2_defconfig b/configs/vocore2_defconfig
index 99a1143e6e4cd6f731b46061a0d1f0daf4ef7415..5776aada1523c3bd26a5ad8cb0ac576f819a8603 100644 (file)
--- a/configs/vocore2_defconfig
+++ b/configs/vocore2_defconfig
@@ -6,7 +6,7 @@ CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x04e000
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_BOOTCOUNT_ADDR=0xb000006c
-CONFIG_SPL_SYS_MALLOC_F_LEN=0x20000
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x40000
 CONFIG_SPL=y
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_ARCH_MTMIPS=y

diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h
index 40467b737ceb0d053e69ec6f81a557903e986a50..dfdb8fcc0469ef8a8d348c3132557df280a2ed33 100644 (file)
--- a/include/configs/vocore2.h
+++ b/include/configs/vocore2.h
@@ -25,6 +25,7 @@
 #define CONFIG_SPL_BSS_START_ADDR      0x80010000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x10000
 #define CONFIG_SPL_MAX_SIZE            0x10000
+#define CONFIG_SPL_PAD_TO              0
 
 /* Dummy value */
 #define CONFIG_SYS_UBOOT_BASE          0
@@ -34,12 +35,13 @@
 #define CONFIG_SYS_NS16550_CLK         40000000
 #define CONFIG_SYS_NS16550_REG_SIZE    -4
 #define CONFIG_SYS_NS16550_COM3                0xb0000e00
+#define CONFIG_CONS_INDEX              3
 
 /* RAM */
 
 /* Memory usage */
 #define CONFIG_SYS_MAXARGS             64
-#define CONFIG_SYS_MALLOC_LEN          (1024 * 1024)
+#define CONFIG_SYS_MALLOC_LEN          (16 * 1024 * 1024)
 #define CONFIG_SYS_BOOTPARAMS_LEN      (128 * 1024)
 #define CONFIG_SYS_CBSIZE              512