STK5 TX28 Release 2011-12-14

diff --git a/README.KARO b/README.KARO
index 48b581be1fb35a71f891794ab010696c97a228b0..20fc3a61930fb8a102ace7aef326764416df13d1 100644 (file)
--- a/README.KARO
+++ b/README.KARO
@@ -5,8 +5,8 @@ Unpacking the source
 --------------------
 mkdir u-boot
 cd u-boot
-tar -xzf u-boot-src.tgz
-
+tar -xzf /cdrom/U-Boot/u-boot-src.tar.bz2
+sudo tar -C / -xzf /cdrom/Tools/Linux/elftosb.tgz
 
 Compiling U-Boot
 ----------------

diff --git a/board/karo/tx28/config.mk b/board/karo/tx28/config.mk
index 7b57ec37ad7ff360cc56bb079c4df605221ba166..6d50b56cfd2618c4482514af5436435c2ffe353c 100644 (file)
--- a/board/karo/tx28/config.mk
+++ b/board/karo/tx28/config.mk
@@ -1,6 +1,3 @@
-#
-# image should be loaded at 0x41008000
-#
 LDSCRIPT := $(SRCTREE)/board/$(VENDOR)/$(BOARD)/u-boot.lds
 
-TEXT_BASE = 0x41008000
+TEXT_BASE = 0x47f80000

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index fdc74400aa63e3bddc47c80eb461861f27b31004..7a756542e4acd4dc07410a7fd291f3d4cd5c79d6 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -48,11 +48,11 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_SYS_PROMPT      "MX28 U-Boot > "
-#define CONFIG_SYS_CBSIZE      1024            /* Console I/O buffer size */
+#define CONFIG_SYS_CBSIZE      2048            /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
                                                /* Print buffer size */
-#define CONFIG_SYS_MAXARGS     16              /* Max number of command args */
+#define CONFIG_SYS_MAXARGS     64              /* Max number of command args */
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
                                                /* Boot argument buffer size */
 #define CONFIG_VERSION_VARIABLE                        /* U-BOOT version */
@@ -68,8 +68,9 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTFILE                "uImage"
-#define CONFIG_BOOTARGS                "console=ttyAM0,115200n8 "
-#define CONFIG_BOOTCOMMAND     "run bootcmd_net"
+#define CONFIG_BOOTARGS                "console=ttyAMA0,115200 tx28_base=stkv3" \
+       " tx28_otg_mode=device ro debug panic=1"
+#define CONFIG_BOOTCOMMAND     "run bootcmd_nand"
 #define CONFIG_LOADADDR                0x40100000
 #define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
 
@@ -77,20 +78,31 @@
  * Extra Environments
  */
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
-       "nfsroot=/home/notroot/nfs/rootfs\0"                            \
-       "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "       \
-       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp "                \
-       "fec_mac=${ethaddr}\0"                                          \
-       "bootcmd_net=run bootargs_nfs; dhcp; bootm\0"                   \
-       "bootargs_mmc=setenv bootargs ${bootargs} root=/dev/mmcblk0p3 " \
-       "rw rootwait ip=dhcp fec_mac=${ethaddr}\0"                      \
-       "bootcmd_mmc=run bootargs_mmc; "                                \
-       "mmc read 0 ${loadaddr} 100 3000; bootm\0"                      \
+       "bootargs_nand=setenv bootargs ${bootargs} ${mtdparts}"         \
+       " root=/dev/mtdblock3"                                          \
+       " rootfstype=jffs2\0"                                           \
+       "nfsroot=/tftpboot/rootfs\0"                                    \
+       "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs"        \
+       " ip=dhcp nfsroot=${serverip}:${nfsroot},nolock\0"              \
+       "bootargs_mmc=setenv bootargs ${bootargs} root=/dev/mmcblk0p3"  \
+       " rootwait ip=dhcp\0"                                           \
+       "bootcmd_nand=set autostart yes;run bootargs_nand;"             \
+       " nboot linux\0"                                                \
+       "bootcmd_net=set autostart yes;run bootargs_nfs; dhcp\0"        \
+       "bootcmd_mmc=set autostart yes;run bootargs_mmc;"               \
+       " mmc read 0 ${loadaddr} 100 3000\0"                            \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
+       "autostart=no\0"
 
-#define MTDIDS_DEFAULT                 "nand0=gpmi-nfc"
-#define MTDPARTS_DEFAULT               "mtdparts=gpmi-nfc:1m@0x40000(u-boot),4m(linux),16m(rootfs),-(userfs)\0" \
+#define __stringify(s)                 _stringify(s)
+#define _stringify(s)                  #s
+
+#define MTD_NAME                       "gpmi-nand"
+#define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
+#define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":128k@" \
+       __stringify(CONFIG_ENV_OFFSET)                                \
+       "(env),1m@0x40000(u-boot),4m(linux),16m(rootfs),-(userfs)"
 
 /*
  * U-Boot Commands