dts: karo: remove embedded FDT

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

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 0285f8373f9a3e5c4b6263b72bd70d0d1348f2cb..a52a15eb9949b8786a3061d31eed2605589c55f3 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -6,25 +6,22 @@
  * 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
+
+#define CONFIG_OMAP
+#define CONFIG_AM33XX
 
 #include <asm/sizes.h>
+#include <asm/arch/omap.h>
 
 /*
  * Ka-Ro TX48 board - SoC configuration
  */
-#define CONFIG_AM33XX
 #define CONFIG_AM33XX_GPIO
 #define CONFIG_SYS_HZ                  1000            /* Ticks per second */
 
@@ -93,7 +90,6 @@
 */
 #ifdef CONFIG_OF_LIBFDT /* set via cmdline parameter thru boards.cfg */
 #define CONFIG_FDT_FIXUP_PARTITIONS
-#define CONFIG_OF_EMBED
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_DEFAULT_DEVICE_TREE     tx48
 #define CONFIG_ARCH_DEVICE_TREE                am33xx
@@ -109,8 +105,8 @@
 /*
  * Boot Linux
  */
-#define xstr(s)        str(s)
-#define str(s) #s
+#define xstr(s)                                str(s)
+#define str(s)                         #s
 #define __pfx(x, s)                    (x##s)
 #define _pfx(x, s)                     __pfx(x, s)
 
@@ -132,7 +128,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 +145,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;"              \
@@ -159,14 +155,14 @@
        TX48_BOOTM_CMD                                                  \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
        TX48_MTDPARTS_CMD                                               \
-       " video=${video_mode} ${append_bootargs}\0"                     \
+       " ${append_bootargs}\0"                 \
        "cpu_clk=" xstr(CONFIG_SYS_MPU_CLK) "\0"                        \
        "fdtaddr=81000000\0"                                            \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
-       "video_mode=640x480MR-24@60\0"
+       "video_mode=VGA\0"
 
 #define MTD_NAME                       "omap2-nand.0"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
@@ -181,6 +177,7 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_BOOTCE
 #define CONFIG_CMD_TIME
+#define CONFIG_CMD_MEMTEST
 
 /*
  * Serial Driver
@@ -228,7 +225,7 @@
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_MTD_DEVICE
 #define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_NAND_AM33XX
+#define CONFIG_NAND_OMAP_GPMC
 #define GPMC_NAND_ECC_LP_x8_LAYOUT
 #define GPMC_NAND_HW_ECC_LAYOUT_KERNEL GPMC_NAND_HW_ECC_LAYOUT
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x20000
@@ -311,12 +308,14 @@
 #define CONFIG_SPL
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
-#define CONFIG_SPL_MAX_SIZE            (46 * SZ_1K)
+#define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_GPIO_SUPPORT
-#ifdef CONFIG_NAND_AM33XX
+#ifdef CONFIG_NAND_OMAP_GPMC
+#define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SPL_NAND_DRIVERS
+#define CONFIG_SPL_NAND_BASE
+#define CONFIG_SPL_NAND_ECC
 #define CONFIG_SPL_NAND_AM33XX_BCH
-#define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT     (CONFIG_SYS_NAND_BLOCK_SIZE /   \
                                        CONFIG_SYS_NAND_PAGE_SIZE)
@@ -351,4 +350,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 */