minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 03:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wolfgang Denk 2009-04-04 20:05:18 +02:00
commit 0a9403c8c7
18 changed files with 28 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
board/atum8548/atum8548.c
View File

@ -28,7 +28,7 @@
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mmu.h> #include <asm/mmu.h>
@ -172,9 +172,6 @@ static struct pci_controller pcie1_hose;
int first_free_busno=0; int first_free_busno=0;
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
void void
pci_init_board(void) pci_init_board(void)
{ {
@ -322,7 +319,6 @@ pci_init_board(void)
#ifdef CONFIG_PCI2 #ifdef CONFIG_PCI2
{ {
volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCI2_ADDR; volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCI2_ADDR;
extern void fsl_pci_init(struct pci_controller *hose);
struct pci_controller *hose = &pci2_hose; struct pci_controller *hose = &pci2_hose;
struct pci_region *r = hose->regions; struct pci_region *r = hose->regions;
@ -366,9 +362,6 @@ int last_stage_init(void)
} }
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_setup(void *blob, bd_t *bd) void ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);

8
board/freescale/mpc8536ds/mpc8536ds.c
View File

@ -27,7 +27,7 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <asm/io.h> #include <asm/io.h>
#include <spd.h> #include <spd.h>
@ -158,9 +158,6 @@ static struct pci_controller pcie2_hose;
static struct pci_controller pcie3_hose; static struct pci_controller pcie3_hose;
#endif #endif
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
int first_free_busno=0; int first_free_busno=0;
void void
@ -650,9 +647,6 @@ int board_eth_init(bd_t *bis)
} }
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_setup(void *blob, bd_t *bd) void ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);

8
board/freescale/mpc8544ds/mpc8544ds.c
View File

@ -26,7 +26,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <asm/io.h> #include <asm/io.h>
#include <miiphy.h> #include <miiphy.h>
@ -93,9 +93,6 @@ static struct pci_controller pcie2_hose;
static struct pci_controller pcie3_hose; static struct pci_controller pcie3_hose;
#endif #endif
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
int first_free_busno=0; int first_free_busno=0;
void void
@ -477,9 +474,6 @@ int board_eth_init(bd_t *bis)
} }
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_setup(void *blob, bd_t *bd) void ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);

8
board/freescale/mpc8548cds/mpc8548cds.c
View File

@ -27,7 +27,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <spd_sdram.h> #include <spd_sdram.h>
#include <miiphy.h> #include <miiphy.h>
@ -262,9 +262,6 @@ static struct pci_controller pci2_hose;
static struct pci_controller pcie1_hose; static struct pci_controller pcie1_hose;
#endif /* CONFIG_PCIE1 */ #endif /* CONFIG_PCIE1 */
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
int first_free_busno=0; int first_free_busno=0;
void void
@ -455,9 +452,6 @@ int last_stage_init(void)
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_pci_setup(void *blob, bd_t *bd) void ft_pci_setup(void *blob, bd_t *bd)
{ {
#ifdef CONFIG_PCI1 #ifdef CONFIG_PCI1

8
board/freescale/mpc8568mds/mpc8568mds.c
View File

@ -27,7 +27,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <spd_sdram.h> #include <spd_sdram.h>
#include <i2c.h> #include <i2c.h>
@ -311,9 +311,6 @@ static struct pci_controller pci1_hose = {
static struct pci_controller pcie1_hose; static struct pci_controller pcie1_hose;
#endif /* CONFIG_PCIE1 */ #endif /* CONFIG_PCIE1 */
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
int first_free_busno = 0; int first_free_busno = 0;
/* /*
@ -483,9 +480,6 @@ pci_init_board(void)
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_setup(void *blob, bd_t *bd) void ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);

8
board/freescale/mpc8569mds/mpc8569mds.c
View File

@ -27,7 +27,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <asm/io.h> #include <asm/io.h>
#include <spd_sdram.h> #include <spd_sdram.h>
@ -232,9 +232,6 @@ local_bus_init(void)
static struct pci_controller pcie1_hose; static struct pci_controller pcie1_hose;
#endif /* CONFIG_PCIE1 */ #endif /* CONFIG_PCIE1 */
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
int first_free_busno = 0; int first_free_busno = 0;
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
@ -315,9 +312,6 @@ pci_init_board(void)
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_setup(void *blob, bd_t *bd) void ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);

8
board/freescale/mpc8572ds/mpc8572ds.c
View File

@ -27,7 +27,7 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <asm/io.h> #include <asm/io.h>
#include <miiphy.h> #include <miiphy.h>
@ -139,9 +139,6 @@ static struct pci_controller pcie2_hose;
static struct pci_controller pcie3_hose; static struct pci_controller pcie3_hose;
#endif #endif
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
int first_free_busno=0; int first_free_busno=0;
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
void pci_init_board(void) void pci_init_board(void)
@ -557,9 +554,6 @@ int board_eth_init(bd_t *bis)
#endif #endif
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_setup(void *blob, bd_t *bd) void ft_board_setup(void *blob, bd_t *bd)
{ {
phys_addr_t base; phys_addr_t base;

8
board/freescale/mpc8610hpcd/mpc8610hpcd.c
View File

@ -25,7 +25,7 @@
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/immap_86xx.h> #include <asm/immap_86xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <i2c.h> #include <i2c.h>
#include <asm/io.h> #include <asm/io.h>
@ -229,9 +229,6 @@ static struct pci_controller pcie2_hose;
int first_free_busno = 0; int first_free_busno = 0;
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
void pci_init_board(void) void pci_init_board(void)
{ {
volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR; volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
@ -402,9 +399,6 @@ void pci_init_board(void)
} }
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void void
ft_board_setup(void *blob, bd_t *bd) ft_board_setup(void *blob, bd_t *bd)
{ {

8
board/freescale/mpc8641hpcn/mpc8641hpcn.c
View File

@ -24,7 +24,7 @@
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/immap_86xx.h> #include <asm/immap_86xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <asm/io.h> #include <asm/io.h>
#include <libfdt.h> #include <libfdt.h>
@ -133,9 +133,6 @@ static struct pci_controller pci2_hose;
int first_free_busno = 0; int first_free_busno = 0;
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
void pci_init_board(void) void pci_init_board(void)
{ {
#ifdef CONFIG_PCI1 #ifdef CONFIG_PCI1
@ -251,9 +248,6 @@ void pci_init_board(void)
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void void
ft_board_setup(void *blob, bd_t *bd) ft_board_setup(void *blob, bd_t *bd)
{ {

8
board/sbc8548/sbc8548.c
View File

@ -29,7 +29,7 @@
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <spd_sdram.h> #include <spd_sdram.h>
#include <miiphy.h> #include <miiphy.h>
@ -347,9 +347,6 @@ static struct pci_controller pcie1_hose;
int first_free_busno=0; int first_free_busno=0;
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
void void
pci_init_board(void) pci_init_board(void)
{ {
@ -512,9 +509,6 @@ int last_stage_init(void)
} }
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_setup(void *blob, bd_t *bd) void ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);

8
board/sbc8641d/sbc8641d.c
View File

@ -33,7 +33,7 @@
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/immap_86xx.h> #include <asm/immap_86xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/fsl_ddr_sdram.h> #include <asm/fsl_ddr_sdram.h>
#include <libfdt.h> #include <libfdt.h>
#include <fdt_support.h> #include <fdt_support.h>
@ -209,9 +209,6 @@ static struct pci_controller pci2_hose;
int first_free_busno = 0; int first_free_busno = 0;
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
void pci_init_board(void) void pci_init_board(void)
{ {
volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR; volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
@ -321,9 +318,6 @@ void pci_init_board(void)
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_setup (void *blob, bd_t *bd) void ft_board_setup (void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);

8
board/tqc/tqm85xx/tqm85xx.c
View File

@ -36,7 +36,7 @@
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/io.h> #include <asm/io.h>
#include <ioports.h> #include <ioports.h>
#include <flash.h> #include <flash.h>
@ -537,9 +537,6 @@ void local_bus_init (void)
*/ */
static int first_free_busno; static int first_free_busno;
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose);
#ifdef CONFIG_PCI1 #ifdef CONFIG_PCI1
static struct pci_controller pci1_hose; static struct pci_controller pci1_hose;
#endif /* CONFIG_PCI1 */ #endif /* CONFIG_PCI1 */
@ -700,9 +697,6 @@ void pci_init_board (void)
} }
#ifdef CONFIG_OF_BOARD_SETUP #ifdef CONFIG_OF_BOARD_SETUP
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_setup (void *blob, bd_t *bd) void ft_board_setup (void *blob, bd_t *bd)
{ {
ft_cpu_setup (blob, bd); ft_cpu_setup (blob, bd);

9
board/xes/common/fsl_85xx_pci.c
View File

@ -24,14 +24,10 @@
#include <common.h> #include <common.h>
#include <pci.h> #include <pci.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <libfdt.h> #include <libfdt.h>
#include <fdt_support.h> #include <fdt_support.h>
extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_config_unlock(struct pci_controller *hose);
extern void fsl_pci_init(struct pci_controller *hose);
int first_free_busno = 0; int first_free_busno = 0;
#ifdef CONFIG_PCI1 #ifdef CONFIG_PCI1
@ -357,9 +353,6 @@ void pci_init_board(void)
} }
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
void ft_board_pci_setup(void *blob, bd_t *bd) void ft_board_pci_setup(void *blob, bd_t *bd)
{ {
/* TODO - make node name (eg pci0) dynamic */ /* TODO - make node name (eg pci0) dynamic */

2
board/xes/xpedite5200/xpedite5200.c
View File

@ -26,7 +26,7 @@
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/mmu.h> #include <asm/mmu.h>

2
board/xes/xpedite5370/xpedite5370.c
View File

@ -25,7 +25,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <libfdt.h> #include <libfdt.h>

3
drivers/misc/fsl_law.c
View File

@ -139,6 +139,9 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id)
if (set_last_law(start, law_sz_enc, id) < 0) if (set_last_law(start, law_sz_enc, id) < 0)
return -1; return -1;
/* recalculate size based on what was actually covered by the law */
law_sz = 1ull << __ilog2_u64(law_sz);
/* do we still have anything to map */ /* do we still have anything to map */
sz = sz - law_sz; sz = sz - law_sz;
if (sz) { if (sz) {

2
drivers/pci/fsl_pci_init.c
View File

@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR;
*/ */
#include <pci.h> #include <pci.h>
#include <asm/immap_fsl_pci.h> #include <asm/fsl_pci.h>
/* Freescale-specific PCI config registers */ /* Freescale-specific PCI config registers */
#define FSL_PCI_PBFR 0x44 #define FSL_PCI_PBFR 0x44

12
include/asm-ppc/immap_fsl_pci.h → include/asm-ppc/fsl_pci.h
View File

@ -17,8 +17,14 @@
* *
*/ */
#ifndef __IMMAP_85xx_fsl_pci__ #ifndef __FSL_PCI_H_
#define __IMMAP_85xx_fsl_pci__ #define __FSL_PCI_H_
int fsl_pci_setup_inbound_windows(struct pci_region *r);
void fsl_pci_init(struct pci_controller *hose);
void fsl_pci_config_unlock(struct pci_controller *hose);
void ft_fsl_pci_setup(void *blob, const char *pci_alias,
struct pci_controller *hose);
/* /*
* Common PCI/PCIE Register structure for mpc85xx and mpc86xx * Common PCI/PCIE Register structure for mpc85xx and mpc86xx
@ -149,4 +155,4 @@ typedef struct ccsr_pci {
char res24[252]; char res24[252];
} ccsr_fsl_pci_t; } ccsr_fsl_pci_t;
#endif /*__IMMAP_fsl_pci__*/ #endif