gic: fixed compilation error in GICv2 wait for interrupt macro

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

diff --git a/include/configs/top9000.h b/include/configs/top9000.h
index 7cc65773b4928ceb4a2e8a71dfc252ac5eda4258..a96a9cb41679804b820fe0c34d243c597f007c01 100644 (file)
--- a/include/configs/top9000.h
+++ b/include/configs/top9000.h
@@ -4,23 +4,7 @@
  *
  * Configuation settings for the TOP9000 CPU module with AT91SAM9XE.
  *
- * 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+
  */
 /*
  * top9000 with at91sam9xe256 or at91sam9xe512
@@ -67,7 +51,6 @@
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
 #define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* main clock xtal */
-#define CONFIG_SYS_HZ                  1000
 
 /* Misc CPU related */
 #define CONFIG_ARCH_CPU_INIT
@@ -136,7 +119,6 @@
 #define CONFIG_ATMEL_SPI0              /* SPI used for FRAM is SPI0 */
 #define FRAM_SPI_BUS           0
 #define FRAM_CS_NUM            0
-#define CONFIG_SPI_FLASH               /* RAMTRON FRAM on SPI bus */
 #define CONFIG_SPI_FRAM_RAMTRON
 #define CONFIG_SF_DEFAULT_SPEED        1000000 /* be conservative here... */
 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
@@ -191,6 +173,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
@@ -201,11 +184,12 @@
 #define CONFIG_CMD_USB
 
 /* I2C support must always be enabled */
-#define CONFIG_SOFT_I2C
 #define CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_SPEED           400000
-#define CONFIG_SYS_I2C_SLAVE           0x7F
-#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT            /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED      400000
+#define CONFIG_SYS_I2C_SOFT_SLAVE      0x7F
+
 #define I2C0_PORT                      AT91_PIO_PORTA
 #define SDA0_PIN                       23
 #define SCL0_PIN                       24