karo: merge with Ka-Ro specific tree for secure boot support

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

diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index e72f8f66b1d7ef66d137083583ad3d7b5ad45cca..1d8b687905f20daf3890312908e85ee753a5dd1b 100644 (file)
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -2,20 +2,7 @@
  * (C) Copyright 2009 DENX Software Engineering
  * Author: John Rigby <jrigby@gmail.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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -28,15 +15,17 @@
  */
 #define CONFIG_MX25
 #define CONFIG_MX25_CLK32              32000   /* OSC32K frequency */
-#define CONFIG_SYS_HZ                  1000
+#define CONFIG_SYS_TIMER_RATE          CONFIG_MX25_CLK32
+#define CONFIG_SYS_TIMER_COUNTER       \
+       (&((struct gpt_regs *)IMX_GPT1_BASE)->counter)
 
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* 256 kB for U-Boot */
 
-#define CONFIG_SPL
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 #define CONFIG_SPL_LDSCRIPT            "arch/$(ARCH)/cpu/u-boot-spl.lds"
 #define CONFIG_SPL_MAX_SIZE            2048
 #define CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
 
 #define CONFIG_SPL_TEXT_BASE           0x810c0000
 #define CONFIG_SYS_TEXT_BASE           0x81200000
@@ -106,14 +95,12 @@
  * Flash & Environment
  */
 /* No NOR flash present */
-#define CONFIG_SYS_NO_FLASH
 #define        CONFIG_ENV_IS_IN_NAND
 #define        CONFIG_ENV_OFFSET       CONFIG_SYS_MONITOR_LEN
 #define CONFIG_ENV_SIZE                (128 * 1024)    /* 128 kB NAND block size */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 
 /* NAND */
-#define CONFIG_NAND_MXC
 #define CONFIG_MXC_NAND_REGS_BASE      (0xBB000000)
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           (0xBB000000)
@@ -122,7 +109,6 @@
 #define CONFIG_SYS_NAND_LARGEPAGE
 
 /* U-Boot general configuration */
-#define CONFIG_SYS_PROMPT      "=> "   /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE      1024    /* Console I/O Buffer Size  */
 /* Print buffer sz */
 #define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
@@ -135,16 +121,10 @@
 
 /* U-Boot commands */
 #include <config_cmd_default.h>
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_CACHE
 
 /*
  * Ethernet
  */
-#define CONFIG_FEC_MXC
-#define CONFIG_FEC_MXC_PHYADDR         0x1f
-#define CONFIG_MII
-#define CONFIG_CMD_NET
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_ENV_OVERWRITE