85xx: convert MPC8540/MPC8560 ADS over to use new LAW init code
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala
parent
4bcae9c92a
commit
7232a2724c
|
|
@ -25,9 +25,8 @@ include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LIB = $(obj)lib$(BOARD).a
|
LIB = $(obj)lib$(BOARD).a
|
||||||
|
|
||||||
COBJS := $(BOARD).o
|
COBJS := $(BOARD).o law.o
|
||||||
SOBJS := init.o
|
SOBJS := init.o
|
||||||
#SOBJS :=
|
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(COBJS))
|
OBJS := $(addprefix $(obj),$(COBJS))
|
||||||
|
|
|
||||||
|
|
@ -210,56 +210,3 @@ tlb1_entry:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
entry_end
|
entry_end
|
||||||
|
|
||||||
/*
|
|
||||||
* LAW(Local Access Window) configuration:
|
|
||||||
*
|
|
||||||
* 0x0000_0000 0x7fff_ffff DDR 2G
|
|
||||||
* 0x8000_0000 0x9fff_ffff PCI1 MEM 512M
|
|
||||||
* 0xc000_0000 0xdfff_ffff RapidIO 512M
|
|
||||||
* 0xe000_0000 0xe000_ffff CCSR 1M
|
|
||||||
* 0xe200_0000 0xe2ff_ffff PCI1 IO 16M
|
|
||||||
* 0xf000_0000 0xf7ff_ffff SDRAM 128M
|
|
||||||
* 0xf800_0000 0xf80f_ffff BCSR 1M
|
|
||||||
* 0xff00_0000 0xffff_ffff FLASH (boot bank) 16M
|
|
||||||
*
|
|
||||||
* Notes:
|
|
||||||
* CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
|
|
||||||
* If flash is 8M at default position (last 8M), no LAW needed.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(CONFIG_SPD_EEPROM)
|
|
||||||
#define LAWBAR0 ((CFG_DDR_SDRAM_BASE>>12) & 0xfffff)
|
|
||||||
#define LAWAR0 (LAWAR_EN | LAWAR_TRGT_IF_DDR | (LAWAR_SIZE & LAWAR_SIZE_128M))
|
|
||||||
#else
|
|
||||||
#define LAWBAR0 0
|
|
||||||
#define LAWAR0 ((LAWAR_TRGT_IF_DDR | (LAWAR_SIZE & LAWAR_SIZE_128M)) & ~LAWAR_EN)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define LAWBAR1 ((CFG_PCI1_MEM_BASE>>12) & 0xfffff)
|
|
||||||
#define LAWAR1 (LAWAR_EN | LAWAR_TRGT_IF_PCIX | (LAWAR_SIZE & LAWAR_SIZE_512M))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is not so much the SDRAM map as it is the whole localbus map.
|
|
||||||
*/
|
|
||||||
#define LAWBAR2 ((CFG_LBC_SDRAM_BASE>>12) & 0xfffff)
|
|
||||||
#define LAWAR2 (LAWAR_EN | LAWAR_TRGT_IF_LBC | (LAWAR_SIZE & LAWAR_SIZE_256M))
|
|
||||||
|
|
||||||
#define LAWBAR3 ((CFG_PCI1_IO_PHYS>>12) & 0xfffff)
|
|
||||||
#define LAWAR3 (LAWAR_EN | LAWAR_TRGT_IF_PCIX | (LAWAR_SIZE & LAWAR_SIZE_1M))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Rapid IO at 0xc000_0000 for 512 M
|
|
||||||
*/
|
|
||||||
#define LAWBAR4 ((CFG_RIO_MEM_BASE>>12) & 0xfffff)
|
|
||||||
#define LAWAR4 (LAWAR_EN | LAWAR_TRGT_IF_RIO | (LAWAR_SIZE & LAWAR_SIZE_512M))
|
|
||||||
|
|
||||||
|
|
||||||
.section .bootpg, "ax"
|
|
||||||
.globl law_entry
|
|
||||||
law_entry:
|
|
||||||
entry_start
|
|
||||||
.long 0x05
|
|
||||||
.long LAWBAR0,LAWAR0,LAWBAR1,LAWAR1,LAWBAR2,LAWAR2,LAWBAR3,LAWAR3
|
|
||||||
.long LAWBAR4,LAWAR4
|
|
||||||
entry_end
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,58 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2008 Freescale Semiconductor, Inc.
|
||||||
|
*
|
||||||
|
* (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
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <common.h>
|
||||||
|
#include <asm/fsl_law.h>
|
||||||
|
#include <asm/mmu.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* LAW(Local Access Window) configuration:
|
||||||
|
*
|
||||||
|
* 0x0000_0000 0x7fff_ffff DDR 2G
|
||||||
|
* 0x8000_0000 0x9fff_ffff PCI1 MEM 512M
|
||||||
|
* 0xc000_0000 0xdfff_ffff RapidIO 512M
|
||||||
|
* 0xe000_0000 0xe000_ffff CCSR 1M
|
||||||
|
* 0xe200_0000 0xe2ff_ffff PCI1 IO 16M
|
||||||
|
* 0xf000_0000 0xf7ff_ffff SDRAM 128M
|
||||||
|
* 0xf800_0000 0xf80f_ffff BCSR 1M
|
||||||
|
* 0xff00_0000 0xffff_ffff FLASH (boot bank) 16M
|
||||||
|
*
|
||||||
|
* Notes:
|
||||||
|
* CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
|
||||||
|
* If flash is 8M at default position (last 8M), no LAW needed.
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct law_entry law_table[] = {
|
||||||
|
#ifndef CONFIG_SPD_EEPROM
|
||||||
|
SET_LAW_ENTRY(1, CFG_DDR_SDRAM_BASE, LAW_SIZE_128M, LAW_TRGT_IF_DDR),
|
||||||
|
#endif
|
||||||
|
SET_LAW_ENTRY(2, CFG_PCI1_MEM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_PCI),
|
||||||
|
/* This is not so much the SDRAM map as it is the whole localbus map. */
|
||||||
|
SET_LAW_ENTRY(3, CFG_LBC_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
|
||||||
|
SET_LAW_ENTRY(4, CFG_PCI1_IO_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_PCI),
|
||||||
|
SET_LAW_ENTRY(5, CFG_RIO_MEM_BASE, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO),
|
||||||
|
};
|
||||||
|
|
||||||
|
int num_law_entries = ARRAY_SIZE(law_table);
|
||||||
|
|
@ -25,9 +25,8 @@ include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LIB = $(obj)lib$(BOARD).a
|
LIB = $(obj)lib$(BOARD).a
|
||||||
|
|
||||||
COBJS := $(BOARD).o
|
COBJS := $(BOARD).o law.o
|
||||||
SOBJS := init.o
|
SOBJS := init.o
|
||||||
#SOBJS :=
|
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(COBJS))
|
OBJS := $(addprefix $(obj),$(COBJS))
|
||||||
|
|
|
||||||
|
|
@ -211,56 +211,3 @@ tlb1_entry:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
entry_end
|
entry_end
|
||||||
|
|
||||||
/*
|
|
||||||
* LAW(Local Access Window) configuration:
|
|
||||||
*
|
|
||||||
* 0x0000_0000 0x7fff_ffff DDR 2G
|
|
||||||
* 0x8000_0000 0x9fff_ffff PCI1 MEM 512M
|
|
||||||
* 0xc000_0000 0xdfff_ffff RapidIO 512M
|
|
||||||
* 0xe000_0000 0xe000_ffff CCSR 1M
|
|
||||||
* 0xe200_0000 0xe2ff_ffff PCI1 IO 16M
|
|
||||||
* 0xf000_0000 0xf7ff_ffff SDRAM 128M
|
|
||||||
* 0xf800_0000 0xf80f_ffff BCSR 1M
|
|
||||||
* 0xff00_0000 0xffff_ffff FLASH (boot bank) 16M
|
|
||||||
*
|
|
||||||
* Notes:
|
|
||||||
* CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
|
|
||||||
* If flash is 8M at default position (last 8M), no LAW needed.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(CONFIG_SPD_EEPROM)
|
|
||||||
#define LAWBAR0 ((CFG_DDR_SDRAM_BASE>>12) & 0xfffff)
|
|
||||||
#define LAWAR0 (LAWAR_EN | LAWAR_TRGT_IF_DDR | (LAWAR_SIZE & LAWAR_SIZE_128M))
|
|
||||||
#else
|
|
||||||
#define LAWBAR0 0
|
|
||||||
#define LAWAR0 ((LAWAR_TRGT_IF_DDR | (LAWAR_SIZE & LAWAR_SIZE_128M)) & ~LAWAR_EN)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define LAWBAR1 ((CFG_PCI1_MEM_BASE>>12) & 0xfffff)
|
|
||||||
#define LAWAR1 (LAWAR_EN | LAWAR_TRGT_IF_PCIX | (LAWAR_SIZE & LAWAR_SIZE_512M))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is not so much the SDRAM map as it is the whole localbus map.
|
|
||||||
*/
|
|
||||||
#define LAWBAR2 ((CFG_LBC_SDRAM_BASE>>12) & 0xfffff)
|
|
||||||
#define LAWAR2 (LAWAR_EN | LAWAR_TRGT_IF_LBC | (LAWAR_SIZE & LAWAR_SIZE_256M))
|
|
||||||
|
|
||||||
#define LAWBAR3 ((CFG_PCI1_IO_PHYS>>12) & 0xfffff)
|
|
||||||
#define LAWAR3 (LAWAR_EN | LAWAR_TRGT_IF_PCIX | (LAWAR_SIZE & LAWAR_SIZE_1M))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Rapid IO at 0xc000_0000 for 512 M
|
|
||||||
*/
|
|
||||||
#define LAWBAR4 ((CFG_RIO_MEM_BASE>>12) & 0xfffff)
|
|
||||||
#define LAWAR4 (LAWAR_EN | LAWAR_TRGT_IF_RIO | (LAWAR_SIZE & LAWAR_SIZE_512M))
|
|
||||||
|
|
||||||
|
|
||||||
.section .bootpg, "ax"
|
|
||||||
.globl law_entry
|
|
||||||
law_entry:
|
|
||||||
entry_start
|
|
||||||
.long 0x05
|
|
||||||
.long LAWBAR0,LAWAR0,LAWBAR1,LAWAR1,LAWBAR2,LAWAR2,LAWBAR3,LAWAR3
|
|
||||||
.long LAWBAR4,LAWAR4
|
|
||||||
entry_end
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,58 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2008 Freescale Semiconductor, Inc.
|
||||||
|
*
|
||||||
|
* (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
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <common.h>
|
||||||
|
#include <asm/fsl_law.h>
|
||||||
|
#include <asm/mmu.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* LAW(Local Access Window) configuration:
|
||||||
|
*
|
||||||
|
* 0x0000_0000 0x7fff_ffff DDR 2G
|
||||||
|
* 0x8000_0000 0x9fff_ffff PCI1 MEM 512M
|
||||||
|
* 0xc000_0000 0xdfff_ffff RapidIO 512M
|
||||||
|
* 0xe000_0000 0xe000_ffff CCSR 1M
|
||||||
|
* 0xe200_0000 0xe2ff_ffff PCI1 IO 16M
|
||||||
|
* 0xf000_0000 0xf7ff_ffff SDRAM 128M
|
||||||
|
* 0xf800_0000 0xf80f_ffff BCSR 1M
|
||||||
|
* 0xff00_0000 0xffff_ffff FLASH (boot bank) 16M
|
||||||
|
*
|
||||||
|
* Notes:
|
||||||
|
* CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
|
||||||
|
* If flash is 8M at default position (last 8M), no LAW needed.
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct law_entry law_table[] = {
|
||||||
|
#ifndef CONFIG_SPD_EEPROM
|
||||||
|
SET_LAW_ENTRY(1, CFG_DDR_SDRAM_BASE, LAW_SIZE_128M, LAW_TRGT_IF_DDR),
|
||||||
|
#endif
|
||||||
|
SET_LAW_ENTRY(2, CFG_PCI1_MEM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_PCI),
|
||||||
|
/* This is not so much the SDRAM map as it is the whole localbus map. */
|
||||||
|
SET_LAW_ENTRY(3, CFG_LBC_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
|
||||||
|
SET_LAW_ENTRY(4, CFG_PCI1_IO_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_PCI),
|
||||||
|
SET_LAW_ENTRY(5, CFG_RIO_MEM_BASE, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO),
|
||||||
|
};
|
||||||
|
|
||||||
|
int num_law_entries = ARRAY_SIZE(law_table);
|
||||||
|
|
@ -55,6 +55,7 @@
|
||||||
#define CONFIG_DDR_ECC /* only for ECC DDR module */
|
#define CONFIG_DDR_ECC /* only for ECC DDR module */
|
||||||
#define CONFIG_MEM_INIT_VALUE 0xDeadBeef
|
#define CONFIG_MEM_INIT_VALUE 0xDeadBeef
|
||||||
|
|
||||||
|
#define CONFIG_FSL_LAW 1 /* Use common FSL init code */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* sysclk for MPC85xx
|
* sysclk for MPC85xx
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
#define CONFIG_DDR_ECC /* only for ECC DDR module */
|
#define CONFIG_DDR_ECC /* only for ECC DDR module */
|
||||||
#define CONFIG_MEM_INIT_VALUE 0xDeadBeef
|
#define CONFIG_MEM_INIT_VALUE 0xDeadBeef
|
||||||
|
|
||||||
|
#define CONFIG_FSL_LAW 1 /* Use common FSL init code */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* sysclk for MPC85xx
|
* sysclk for MPC85xx
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue