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

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

diff --git a/include/configs/luan.h b/include/configs/luan.h
index b158b741ba36d58021759308ead28c74d5c77c4c..8ecdf8049df0268abc9f18c60e4ef3732da6cfdf 100644 (file)
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -3,23 +3,7 @@
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  * John Otken, jotken@softadvances.com
  *
- * 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+ 
  */
 
 /************************************************************************
@@ -37,6 +21,8 @@
 #define CONFIG_440             1
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external freq to pll        */
 
+#define        CONFIG_SYS_TEXT_BASE    0xFFFB0000
+
 /*
  * Include common defines/options for all AMCC eval boards
  */
@@ -53,12 +39,11 @@
 #define CONFIG_SYS_LARGE_FLASH         0xffc00000      /* 4MB flash address CS0 */
 #define CONFIG_SYS_SMALL_FLASH         0xff900000      /* 1MB flash address CS2 */
 #define CONFIG_SYS_SRAM_BASE           0xff800000      /* 1MB SRAM  address CS2 */
+#define CONFIG_SYS_SRAM_SIZE           (1 << 20)
 #define CONFIG_SYS_EPLD_BASE           0xff000000      /* EPLD and FRAM     CS1 */
 
 #define CONFIG_SYS_ISRAM_BASE          0xf8000000      /* internal 8k SRAM (L2 cache) */
 
-#define CONFIG_SYS_PERIPHERAL_BASE     0xf0000000      /* internal peripherals */
-
 #define CONFIG_SYS_PCI_MEMBASE         0x80000000      /* mapped pci memory */
 #define CONFIG_SYS_PCI_BASE            0xd0000000      /* internal PCI regs */
 #define CONFIG_SYS_PCI_TARGBASE        0x80000000      /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE */
@@ -79,16 +64,15 @@
  * Initial RAM & stack pointer (placed in SDRAM)
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_ISRAM_BASE
-#define CONFIG_SYS_INIT_RAM_END        (8 << 10)
-#define CONFIG_SYS_GBL_DATA_SIZE       256             /* num bytes initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       (8 << 10)
+#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
 
 /*-----------------------------------------------------------------------
  * Serial Port
  *----------------------------------------------------------------------*/
+#define CONFIG_CONS_INDEX      1       /* Use UART0                    */
 #define CONFIG_SYS_EXT_SERIAL_CLOCK    11059200 /* external 11.059MHz clk */
-#undef  CONFIG_UART1_CONSOLE           /* define if you want console on UART1 */
 
 /*-----------------------------------------------------------------------
  * Environment
@@ -134,7 +118,7 @@
 /*-----------------------------------------------------------------------
  * I2C
  *----------------------------------------------------------------------*/
-#define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0          400000
 
 #define CONFIG_SYS_I2C_MULTI_EEPROMS
 #define CONFIG_SYS_I2C_EEPROM_ADDR     (0xa8>>1)
@@ -178,6 +162,7 @@
 
 /* General PCI */
 #define CONFIG_PCI                     /* include pci support          */
+#define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
 #define CONFIG_PCI_PNP                 /* do (not) pci plug-and-play   */
 #define CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup  */