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

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

diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h
index 24f89c98e409b5c9c8201b9cc80952ed02450688..bef821f3371a2227dd505ba59e72c895cfd3d6af 100644 (file)
--- a/include/configs/vl_ma2sc.h
+++ b/include/configs/vl_ma2sc.h
@@ -5,23 +5,7 @@
  *
  * Configuation settings for the VL_MA2SC 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
@@ -29,9 +13,6 @@
 
 /*--------------------------------------------------------------------------*/
 
-#undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff  */
-#define CONFIG_ARM926EJS               /* This is an ARM926EJS Core    */
-#define CONFIG_AT91FAMILY
 #define CONFIG_AT91SAM9263             /* It's an Atmel AT91SAM9263 SoC*/
 #define CONFIG_VL_MA2SC                        /* on an VL_MA2SC Board */
 #define CONFIG_ARCH_CPU_INIT
@@ -133,6 +114,7 @@
 
 /* USB */
 #define CONFIG_USB_ATMEL
+#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_DOS_PARTITION
 #define CONFIG_SYS_USB_OHCI_CPU_INIT
@@ -148,10 +130,12 @@
 #define CONFIG_SYS_I2C_SLAVE                   0               /* not used */
 
 #ifndef CONFIG_HARD_I2C
-#define CONFIG_SOFT_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT                    /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED      CONFIG_SYS_I2C_SPEED
+#define CONFIG_SYS_I2C_SOFT_SLAVE      CONFIG_SYS_I2C_SLAVE
 
 /* Software  I2C driver configuration */
-
 #define I2C_DELAY      udelay(2500000/CONFIG_SYS_I2C_SPEED)
 
 #define AT91_PIN_SDA   (1<<4)          /* AT91C_PIO_PB4 */
@@ -213,7 +197,6 @@
 
 /* clocks */
 
-#define CONFIG_SYS_HZ                  1000
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock */
 
 #define MHZ180
@@ -335,9 +318,8 @@
 #define CONFIG_SYS_NAND_DBW_8          1
 #define CONFIG_SYS_NAND_MASK_ALE       (1 << 21)       /* our ALE is AD21 */
 #define CONFIG_SYS_NAND_MASK_CLE       (1 << 22)       /* our CLE is AD22 */
-#define CONFIG_SYS_NAND_ENABLE_PIN     AT91_PIO_PORTD, 15
-#define CONFIG_SYS_NAND_READY_PIN      AT91_PIO_PORTB, 0
-#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for nand_util.c */
+#define CONFIG_SYS_NAND_ENABLE_PIN     GPIO_PIN_PD(15)
+#define CONFIG_SYS_NAND_READY_PIN      GPIO_PIN_PB(0)
 #endif
 
 /* Ethernet */
@@ -345,6 +327,7 @@
 #define CONFIG_RMII
 #define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         5
+#define CONFIG_AT91_WANTS_COMMON_PHY
 
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
 
@@ -377,9 +360,6 @@
  */
 #define CONFIG_SYS_MALLOC_LEN          \
        ROUND(3 * CONFIG_ENV_SIZE + 128 * 1024, 0x1000)
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* 128 bytes for initial data */
-
-#define CONFIG_STACKSIZE       (32*1024)       /* regular stack */
 
 #ifndef CONFIG_RAMLOAD
 #define CONFIG_BOOTCOMMAND             "run nfsboot"
@@ -454,10 +434,4 @@
                "erase 10060000 1007FFFF;reset\0"                       \
        " "
 
-/*--------------------------------------------------------------------------*/
-
-#ifdef CONFIG_USE_IRQ
-#error CONFIG_USE_IRQ not supported
-#endif
-
 #endif