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

[karo-tx-uboot.git] / board / sbc8641d / law.c

diff --git a/board/sbc8641d/law.c b/board/sbc8641d/law.c
index d403873d9e0009f955ed5acbb3e4b60e362adbea..c4e736b8aa408680b79500752a187d267cd0157d 100644 (file)
--- a/board/sbc8641d/law.c
+++ b/board/sbc8641d/law.c
@@ -4,23 +4,7 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * 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+
  */
 
 #include <common.h>
@@ -32,11 +16,11 @@
  *
  * 0x0000_0000 DDR                     256M
  * 0x1000_0000 DDR2                    256M
- * 0x8000_0000 PCI1 MEM                512M
- * 0xa000_0000 PCI2 MEM                512M
+ * 0x8000_0000 PCIE1 MEM               512M
+ * 0xa000_0000 PCIE2 MEM               512M
  * 0xc000_0000 RapidIO                 512M
- * 0xe200_0000 PCI1 IO                 16M
- * 0xe300_0000 PCI2 IO                 16M
+ * 0xe200_0000 PCIE1 IO                16M
+ * 0xe300_0000 PCIE2 IO                16M
  * 0xf800_0000 CCSRBAR                 2M
  * 0xfe00_0000 FLASH (boot bank)       32M
  *
@@ -44,15 +28,13 @@
 
 
 struct law_entry law_table[] = {
-       SET_LAW_ENTRY(1, CFG_DDR_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_DDR_1),
-       SET_LAW_ENTRY(2, CFG_PCI1_MEM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_PCI_1),
-       SET_LAW_ENTRY(3, CFG_PCI2_MEM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_PCI_2),
-       SET_LAW_ENTRY(4, 0xf8000000, LAW_SIZE_2M, LAW_TRGT_IF_LBC),
-       SET_LAW_ENTRY(5, CFG_PCI1_IO_BASE, LAW_SIZE_16M, LAW_TRGT_IF_PCI_1),
-       SET_LAW_ENTRY(6, CFG_PCI2_IO_BASE, LAW_SIZE_16M, LAW_TRGT_IF_PCI_2),
-       SET_LAW_ENTRY(7, 0xfe000000, LAW_SIZE_32M, LAW_TRGT_IF_LBC),
-       SET_LAW_ENTRY(8, CFG_DDR_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_DDR_2),
-       SET_LAW_ENTRY(9, CFG_RIO_MEM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_RIO)
+#if !defined(CONFIG_SPD_EEPROM)
+       SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_DDR_1),
+       SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000,
+                LAW_SIZE_256M, LAW_TRGT_IF_DDR_2),
+#endif
+       SET_LAW(0xf8000000, LAW_SIZE_2M, LAW_TRGT_IF_LBC),
+       SET_LAW(0xfe000000, LAW_SIZE_32M, LAW_TRGT_IF_LBC),
 };
 
 int num_law_entries = ARRAY_SIZE(law_table);