dts: karo: remove embedded FDT

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

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 7ea23e5b955b75c37928bb7818b8551e35500580..f751b3d1d7c4e200581b1a1251451dce26d403b4 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -1,29 +1,25 @@
 /*
  * Copyright (C) 2012 <LW@KARO-electronics.de>
  *
- * 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_TX53_H
-#define __CONFIGS_TX53_H
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_MX53                    /* must be set before including imx-regs.h */
 
 #include <asm/sizes.h>
+#include <asm/arch/imx-regs.h>
 
 /*
  * Ka-Ro TX53 board - SoC configuration
  */
-#define CONFIG_TX53                            /* TX53 SoM */
-#define CONFIG_MX53                            /* i.MX53 SoC */
+#define CONFIG_TX53                    /* TX53 SoM */
 #define CONFIG_SYS_MX5_IOMUX_V3
-#define CONFIG_MXC_GPIO                                /* GPIO control */
+#define CONFIG_MXC_GPIO                        /* GPIO control */
 #define CONFIG_SYS_MX5_HCLK            24000000
-#define CONFIG_SYS_MX5_CLK32           32768
 #define CONFIG_SYS_DDR_CLKSEL          0
 #define CONFIG_SYS_HZ                  1000    /* Ticks per second */
 #define CONFIG_SHOW_ACTIVITY
@@ -85,7 +81,6 @@
  * Flattened Device Tree (FDT) support
 */
 #define CONFIG_OF_LIBFDT
-#define CONFIG_OF_EMBED
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_DEFAULT_DEVICE_TREE     tx53
 #define CONFIG_ARCH_DEVICE_TREE                mx53
@@ -124,7 +119,7 @@
        " root=/dev/mtdblock3 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;"                \
        "mmc read ${loadaddr} 100 3000;run bootm_cmd\0"                 \
        "bootcmd_nand=set autostart no;run bootargs_nand;"              \
@@ -133,14 +128,14 @@
        "run bootm_cmd\0"                                               \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
-       " video=${video_mode} ${append_bootargs}\0"                     \
+       " ${append_bootargs}\0"                                         \
        "cpu_clk=800\0"                                                 \
        "fdtaddr=71000000\0"                                            \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
-       "video_mode=VGA-1:640x480MR-24@60\0"
+       "video_mode=VGA\0"
 
 #define MTD_NAME                       "mxc_nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
@@ -151,12 +146,12 @@
  */
 #include <config_cmd_default.h>
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_IIM
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_BOOTCE
 #define CONFIG_CMD_TIME
+#define CONFIG_CMD_MEMTEST
 
 /*
  * Serial Driver
@@ -196,8 +191,8 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_NAND_MXC
-#define CONFIG_MXC_NAND_REGS_BASE      0xf7ff0000
-#define CONFIG_MXC_NAND_IP_BASE                0x63fdb000
+#define CONFIG_MXC_NAND_REGS_BASE      NFC_BASE_ADDR_AXI
+#define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MAX_FLASH_SECT      1024
@@ -232,7 +227,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
-#define CONFIG_SYS_FSL_ESDHC_USE_PIO
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       2
 
@@ -259,12 +253,12 @@
        xstr(CONFIG_ENV_RANGE)                                          \
        "(env),"                                                        \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env2),4m(linux),16m(rootfs),256k(dtb),-(userfs)"
+       "(env2),4m(linux),16m(rootfs),108032k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
 #else
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "1m(u-boot),"                                                   \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),4m(linux),16m(rootfs),256k(dtb),-(userfs)"
+       "(env),4m(linux),16m(rootfs),108416k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
@@ -272,7 +266,7 @@
                                        GENERATED_GBL_DATA_SIZE)
 
 #ifdef CONFIG_CMD_IIM
-#define CONFIG_IMX_IIM
+#define CONFIG_FSL_IIM
 #endif
 
-#endif /* __CONFIGS_TX53_H */
+#endif /* __CONFIG_H */