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

[J-u-boot.git] / include / configs / taishan.h

diff --git a/include/configs/taishan.h b/include/configs/taishan.h
index 394dd8d8b065e397a666eed4770e4e47439445f7..3d5c351b1a6d72357810b031cb25922c8d582039 100644 (file)
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -2,20 +2,7 @@
  * (C) Copyright 2007
  * Stefan Roese, DENX Software Engineering, [email protected].
  *
- * 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+
  */
 
 /************************************************************************
@@ -31,9 +18,10 @@
 #define CONFIG_TAISHAN         1       /* Board is taishan             */
 #define CONFIG_440GX           1       /* Specifc GX support           */
 #define CONFIG_440             1       /* ... PPC440 family            */
-#define CONFIG_4xx             1       /* ... PPC4xx family            */
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external freq to pll        */
 
+#define        CONFIG_SYS_TEXT_BASE    0xFFFC0000
+
 /*
  * Include common defines/options for all AMCC eval boards
  */
@@ -50,7 +38,6 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_FLASH_BASE          0xfc000000      /* start of FLASH       */
 #define CONFIG_SYS_PCI_MEMBASE         0x80000000      /* mapped pci memory    */
-#define CONFIG_SYS_PERIPHERAL_BASE     0xe0000000      /* internal peripherals */
 #define CONFIG_SYS_ISRAM_BASE          0xc0000000      /* internal SRAM        */
 #define CONFIG_SYS_PCI_BASE            0xd0000000      /* internal PCI regs    */
 
@@ -67,16 +54,15 @@
 #define CONFIG_SYS_TEMP_STACK_OCM      1
 #define CONFIG_SYS_OCM_DATA_ADDR       CONFIG_SYS_ISRAM_BASE
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_ISRAM_BASE  /* Initial RAM address   */
-#define CONFIG_SYS_INIT_RAM_END        0x2000          /* End of used area in RAM*/
-#define CONFIG_SYS_GBL_DATA_SIZE       128             /* num bytes initial data*/
+#define CONFIG_SYS_INIT_RAM_SIZE       0x2000          /* Size of used area in RAM*/
 
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)
 
 /*-----------------------------------------------------------------------
  * Serial Port
  *----------------------------------------------------------------------*/
-#define CONFIG_UART1_CONSOLE   1       /* use of UART1 as console      */
+#define CONFIG_CONS_INDEX      2       /* Use UART1                    */
 #define CONFIG_SYS_EXT_SERIAL_CLOCK    (1843200 * 6)   /* Ext clk @ 11.059 MHz */
 
 /*-----------------------------------------------------------------------
@@ -133,7 +119,7 @@
 /*-----------------------------------------------------------------------
  * I2C
  *----------------------------------------------------------------------*/
-#define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0          400000
 
 #undef CONFIG_SYS_I2C_MULTI_EEPROMS
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50
@@ -192,6 +178,7 @@
  */
 /* General PCI */
 #define CONFIG_PCI                     /* include pci support          */
+#define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play         */
 #define CONFIG_EEPRO100       1                /* include PCI EEPRO100         */
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup  */