tricorder: read kernel directly from NAND

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

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index f54fa24922ac72fb9dffef95fd520d712fedd3be..aab1bf1902b40f8382ca78d6fd47da324e5d6408 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -39,6 +39,9 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
+#define CONFIG_SILENT_CONSOLE
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+
 /* Clock Defines */
 #define V_OSCK                         26000000 /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK >> 1)
@@ -165,7 +168,7 @@
 
 /* Environment information (this is the common part) */
 
-#define CONFIG_BOOTDELAY               3
+#define CONFIG_BOOTDELAY               0
 
 /* hang() the board on panic() */
 #define CONFIG_PANIC_HANG
@@ -257,9 +260,10 @@
        "loaduimage_ubi=ubi part ubi; " \
                "ubifsmount ubi:root; " \
                "ubifsload ${loadaddr} /boot/uImage\0" \
+       "loaduimage_nand=nand read ${loadaddr} kernel 0x500000\0" \
        "nandboot=echo Booting from nand ...; " \
                "run nandargs; " \
-               "run loaduimage_ubi; " \
+               "run loaduimage_nand; " \
                "bootm ${loadaddr}\0" \
        "autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \
                        "if run loadbootscript; then " \
@@ -289,9 +293,9 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
 
-#define CONFIG_SYS_MEMTEST_START       (OMAP34XX_SDRC_CS0 + 0x07000000)
+#define CONFIG_SYS_MEMTEST_START       (OMAP34XX_SDRC_CS0 + 0x00000000)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \
-                                       0x01000000) /* 16MB */
+                                       0x07000000) /* 112 MB */
 
 #define CONFIG_SYS_LOAD_ADDR           (OMAP34XX_SDRC_CS0 + 0x02000000)
 
@@ -380,4 +384,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000        /* 1 MB */
 
+#define CONFIG_SYS_ALT_MEMTEST
+#define CONFIG_SYS_MEMTEST_SCRATCH     0x81000000
 #endif /* __CONFIG_H */