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

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

diff --git a/include/configs/vct.h b/include/configs/vct.h
index d202522bd5c7248f3056c6be9946c38b336e5852..5ab4de3274109087d5a418afde559b8bca007607 100644 (file)
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -1,20 +1,7 @@
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
- * 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+
  */
 
 /*
@@ -38,16 +25,13 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MIPS32                          /* MIPS 4Kc CPU core    */
 #define CPU_CLOCK_RATE                 324000000 /* Clock for the MIPS core */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     (CPU_CLOCK_RATE / 2)
-#define CONFIG_SYS_HZ                  1000
 
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* SDRAM is initialized by the bootstrap code */
 
-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)
-#define CONFIG_STACKSIZE               (256 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)
 #define CONFIG_SYS_BOOTPARAMS_LEN      (128 << 10)
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
@@ -61,9 +45,19 @@
 /*
  * UART
  */
-#define CONFIG_VCT_SERIAL
+#ifdef CONFIG_VCT_PLATINUMAVC
+#define UART_1_BASE            0xBDC30000
+#else
+#define UART_1_BASE            0xBF89C000
+#endif
+
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_REG_SIZE    -4
+#define CONFIG_SYS_NS16550_COM1                UART_1_BASE
+#define CONFIG_CONS_INDEX              1
+#define CONFIG_SYS_NS16550_CLK         921600
 #define CONFIG_BAUDRATE                        115200
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * SDRAM
@@ -78,9 +72,9 @@
 /*
  * SMSC91C11x Network Card
  */
-#define CONFIG_DRIVER_SMC911X
-#define CONFIG_DRIVER_SMC911X_BASE     0x00000000
-#define CONFIG_DRIVER_SMC911X_32_BIT
+#define CONFIG_SMC911X
+#define CONFIG_SMC911X_BASE    0x00000000
+#define CONFIG_SMC911X_32_BIT
 #define CONFIG_NET_RETRY_COUNT         20
 #endif
 
@@ -97,17 +91,20 @@
 /*
  * Only Premium/Platinum have ethernet support right now
  */
-#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
+#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
+       !defined(CONFIG_VCT_SMALL_IMAGE)
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SNTP
 #else
 #undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
 #endif
 
 /*
  * Only Premium/Platinum have USB-EHCI support right now
  */
-#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
+#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
+       !defined(CONFIG_VCT_SMALL_IMAGE)
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_FAT
 #endif
@@ -124,7 +121,6 @@
  */
 #define CONFIG_USB_EHCI                        /* Enable EHCI USB support      */
 #define CONFIG_USB_EHCI_VCT            /* on VCT platform              */
-#define CONFIG_EHCI_DCACHE             /* with dcache handling support */
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
 #define CONFIG_EHCI_DESC_BIG_ENDIAN
 #define CONFIG_EHCI_IS_TDI
@@ -234,11 +230,10 @@
 /*
  * I2C/EEPROM
  */
-#undef CONFIG_HARD_I2C                 /* I2C with hardware support    */
-#define        CONFIG_SOFT_I2C                 /* I2C bit-banged               */
-
-#define CONFIG_SYS_I2C_SPEED           83000   /* 83 kHz is supposed to work   */
-#define CONFIG_SYS_I2C_SLAVE           0x7f
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT            /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED      83000   /* 83 kHz is supposed to work */
+#define CONFIG_SYS_I2C_SOFT_SLAVE      0x7f
 
 /*
  * Software (bit-bang) I2C driver configuration
@@ -271,12 +266,6 @@ int vct_gpio_get(int pin);
 #define CONFIG_BOOTCOMMAND     "run test3"
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
-/*
- * Needed for 64bit printf format
- */
-#define CONFIG_SYS_64BIT_VSPRINTF      1
-#define CONFIG_SYS_64BIT_STRTOUL       1
-
 /*
  * UBI configuration
  */
@@ -285,6 +274,7 @@ int vct_gpio_get(int pin);
 #define        CONFIG_CMD_JFFS2
 #define        CONFIG_CMD_UBI
 #define        CONFIG_RBTREE
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
 
@@ -330,8 +320,8 @@ int vct_gpio_get(int pin);
 #undef CONFIG_CMD_TERMINAL
 #undef CONFIG_CMD_USB
 
-#undef CONFIG_DRIVER_SMC911X
-#undef CONFIG_SOFT_I2C
+#undef CONFIG_SMC911X
+#undef CONFIG_SYS_I2C_SOFT
 #undef CONFIG_SOURCE
 #undef CONFIG_SYS_LONGHELP
 #undef CONFIG_TIMESTAMP