Merge branch 'master' of git://git.denx.de/u-boot

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

diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index 2e83cb2d02fd3402b0bbdcd08a79f762a95b60eb..0937653fc239a9a04d6cba5c900f6e5b305cf0c9 100644 (file)
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -4,23 +4,7 @@
  *
  * Configuration settings for the HALE TT-01 board.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
@@ -31,8 +15,6 @@
 /* High Level Configuration Options */
 #define CONFIG_ARM1136
 #define CONFIG_MX31
-#define CONFIG_MX31_HCLK_FREQ  26000000
-#define CONFIG_MX31_CLK32      32768
 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
@@ -86,9 +68,6 @@
 /* default load address, 1MB up the road */
 #define CONFIG_SYS_LOAD_ADDR           (PHYS_SDRAM_1+0x100000)
 
-/* The stack sizes are set up in start.S using the settings below */
-#define CONFIG_STACKSIZE       (128 * 1024)    /* regular stack */
-
 /* Size of malloc() pool, make sure possible frame buffer fits */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 10*1024*1024)
 
@@ -154,9 +133,9 @@
 #define CONFIG_MXC_GPIO
 
 /* MC13783 connected to CSPI3 and SS0 */
-#define CONFIG_PMIC
-#define CONFIG_PMIC_SPI
-#define CONFIG_PMIC_FSL
+#define CONFIG_POWER
+#define CONFIG_POWER_SPI
+#define CONFIG_POWER_FSL
 
 #define CONFIG_FSL_PMIC_BUS            2
 #define CONFIG_FSL_PMIC_CS             0
@@ -171,7 +150,6 @@
 /* console is UART2 on TT-01 */
 #define CONFIG_CONS_INDEX              1
 #define CONFIG_BAUDRATE                        115200
-#define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, 115200}
 
 /* ethernet setup for the onboard smc9118 */
 #define CONFIG_MII
@@ -191,11 +169,16 @@
 #define CONFIG_VIDEO_MX3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
+/* splash image won't work with NAND boot, use preboot script */
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_CONSOLE_EXTRA_INFO /* display additional board info */
 #define CONFIG_VGA_AS_SINGLE_DEVICE /* display is an output only device */
+
 /* allow stdin, stdout and stderr variables to redirect output */
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SILENT_CONSOLE          /* UARTs used externally (release) */
+#define CONFIG_SYS_DEVICE_NULLDEV      /* allow console to be turned off */
+#define CONFIG_PREBOOT
 
 /* allow decompressing max. 4MB */
 #define CONFIG_VIDEO_BMP_GZIP
@@ -237,14 +220,13 @@
 "videomode=epson\0" \
 "epson=video=ctfb:x:800,y:480,depth:16,mode:0,pclk:30076," \
        "le:215,ri:1,up:32,lo:13,hs:7,vs:10,sync:100663296,vmode:0\0" \
-"bootcmd=dhcp bootscript.$(user); source\0"
+"bootcmd=dhcp bootscript.${user}; source\0"
 
 #define CONFIG_BOOTP_SERVERIP /* tftp serverip not overruled by dhcp server */
 #define CONFIG_BOOTP_SEND_HOSTNAME /* if env-var 'hostname' is set, send it */
 
 /* Miscellaneous configurable options */
-#define CONFIG_HUSH_PARSER
-#define CONFIG_PROMPT_HUSH_PS2 "> "
+#define CONFIG_SYS_HUSH_PARSER
 
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory */
 #define CONFIG_SYS_PROMPT      "TT01> "
@@ -257,8 +239,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_HZ                  1000
-
 #define CONFIG_CMDLINE_EDITING
 
 /* MMC boot support */