upgrade to upstream version 2013.07

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

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 5093b744d08538246cf067036afbefd5a5b48bb4..64f42e023b2e80c1469fb474c1105366bb37fea7 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -6,24 +6,19 @@
  * based on: am335x_evm
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
+ * SPDX-License-Identifier:      GPL-2.0
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
  */
 
-#ifndef __CONFIGS_TX48_H
-#define __CONFIGS_TX48_H
+#ifndef __CONFIG_H
+#define __CONFIG_H
 
 #include <asm/sizes.h>
 
 /*
  * Ka-Ro TX48 board - SoC configuration
  */
+#define CONFIG_OMAP
 #define CONFIG_AM33XX
 #define CONFIG_AM33XX_GPIO
 #define CONFIG_SYS_HZ                  1000            /* Ticks per second */
@@ -132,7 +127,7 @@
  */
 #ifdef CONFIG_OF_LIBFDT
 #define TX48_BOOTM_CMD                                                 \
-       "bootm_cmd=fdt boardsetup;bootm ${loadaddr} - ${fdtaddr}\0"
+       "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"
 #define TX48_MTDPARTS_CMD ""
 #else
 #define TX48_BOOTM_CMD                                                 \
@@ -149,7 +144,7 @@
        " root=/dev/mtdblock4 rootfstype=jffs2\0"                       \
        "nfsroot=/tftpboot/rootfs\0"                                    \
        "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},nolock\0"\
+       " root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\
        "bootcmd_mmc=set autostart no;run bootargs_mmc;"                \
        " fatload mmc 0 ${loadaddr} uImage;run bootm_cmd\0"             \
        "bootcmd_nand=set autostart no;run bootargs_nand;"              \
@@ -166,7 +161,7 @@
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
-       "video_mode=640x480MR-24@60\0"
+       "video_mode=da8xx-fb:640x480MR-24@60\0"
 
 #define MTD_NAME                       "omap2-nand.0"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
@@ -181,6 +176,7 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_BOOTCE
 #define CONFIG_CMD_TIME
+#define CONFIG_CMD_MEMTEST
 
 /*
  * Serial Driver
@@ -288,13 +284,13 @@
        xstr(CONFIG_ENV_RANGE)                                          \
        "(env),"                                                        \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env2),4m(linux),16m(rootfs),256k(dtb),107904k(userfs),512k@0x7f80000(bbt)"
+       "(env2),4m(linux),16m(rootfs),256k(dtb),107904k(userfs),512k@0x7f80000(bbt)ro"
 #else
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "128k(u-boot-spl),"                                             \
        "1m(u-boot),"                                                   \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),4m(linux),16m(rootfs),256k(dtb),108288k(userfs),512k@0x7f80000(bbt)"
+       "(env),4m(linux),16m(rootfs),256k(dtb),108288k(userfs),512k@0x7f80000(bbt)ro"
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
@@ -351,4 +347,4 @@
 #define CONFIG_SYS_SPL_MALLOC_START    (PHYS_SDRAM_1 + SZ_2M + SZ_32K)
 #define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_1M
 
-#endif /* __CONFIGS_TX48_H */
+#endif /* __CONFIG_H */