phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge with http://opensource.freescale.com/pub/scm/u-boot-85xx.git#for_wd

This commit is contained in:
Wolfgang Denk 2006-10-11 23:54:37 +02:00
parent fb883a521e 7376eb87aa
commit 7e2a24dca9
14 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/cds/mpc8541cds/mpc8541cds.c
View File

@ -497,8 +497,6 @@ void
pci_init_board(void)
{
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init(struct pci_controller **hose);
pci_mpc85xx_init(&hose);
pci_mpc85xx_init(hose);
#endif
}

2
board/cds/mpc8548cds/mpc8548cds.c
View File

@ -322,8 +322,6 @@ void
pci_init_board(void)
{
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init(struct pci_controller **hose);
pci_mpc85xx_init(&hose);
#endif
}

2
board/cds/mpc8555cds/mpc8555cds.c
View File

@ -497,8 +497,6 @@ void
pci_init_board(void)
{
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init(struct pci_controller *hose);
pci_mpc85xx_init(hose);
#endif
}

3
board/mpc8540ads/mpc8540ads.c
View File

@ -33,7 +33,6 @@
#if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
extern void ft_cpu_setup(void *blob, bd_t *bd);
#endif
@ -327,8 +326,6 @@ void
pci_init_board(void)
{
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init(struct pci_controller *hose);
pci_mpc85xx_init(&hose);
#endif /* CONFIG_PCI */
}

2
board/mpc8560ads/mpc8560ads.c
View File

@ -539,8 +539,6 @@ void
pci_init_board(void)
{
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init(struct pci_controller *hose);
pci_mpc85xx_init(&hose);
#endif /* CONFIG_PCI */
}

2
board/pm854/pm854.c
View File

@ -289,8 +289,6 @@ void
pci_init_board(void)
{
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init(struct pci_controller *hose);
pci_mpc85xx_init(&hose);
#endif /* CONFIG_PCI */
}

2
board/pm856/pm856.c
View File

@ -442,8 +442,6 @@ void
pci_init_board(void)
{
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init(struct pci_controller *hose);
pci_mpc85xx_init(&hose);
#endif /* CONFIG_PCI */
}

2
board/stxgp3/stxgp3.c
View File

@ -375,8 +375,6 @@ void
pci_init_board(void)
{
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init(struct pci_controller *hose);
pci_mpc85xx_init(&hose);
#endif /* CONFIG_PCI */
}

2
board/tqm85xx/tqm85xx.c
View File

@ -408,8 +408,6 @@ static struct pci_controller hose = {
void pci_init_board (void)
{
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init (struct pci_controller *hose);
pci_mpc85xx_init (&hose);
#endif /* CONFIG_PCI */
}

13
common/cmd_bootm.c
View File

@ -510,7 +510,7 @@ fixup_silent_linux ()
#endif /* CONFIG_SILENT_CONSOLE */
#ifdef CONFIG_PPC
static void
static void __attribute__((noinline))
do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
int argc, char *argv[],
ulong addr,
@ -625,7 +625,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
/* Look for a '-' which indicates to ignore the ramdisk argument */
if (argc >= 3 && strcmp(argv[2], "-") == 0) {
debug ("Skipping initrd\n");
data = 0;
len = data = 0;
}
else
#endif
@ -900,8 +900,6 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
(*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
#else
ft_setup(of_flat_tree, kbd, initrd_start, initrd_end);
/* ft_dump_blob(of_flat_tree); */
#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
unlock_ram_in_cache();
@ -917,9 +915,12 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
if (getenv("disable_of") != NULL)
(*kernel) ((bd_t *)of_flat_tree, initrd_start, initrd_end,
cmd_start, cmd_end);
else
else {
ft_setup(of_flat_tree, kbd, initrd_start, initrd_end);
/* ft_dump_blob(of_flat_tree); */
(*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
}
#endif
}
#endif /* CONFIG_PPC */

12
common/ft_build.c
View File

@ -87,9 +87,9 @@ static int lookup_string(struct ft_cxt *cxt, const char *name)
p = cxt->p;
while (p < cxt->p_end) {
if (strcmp(p, name) == 0)
if (strcmp((char *)p, name) == 0)
return p - cxt->p;
p += strlen(p) + 1;
p += strlen((char *)p) + 1;
}
return -1;
@ -103,7 +103,7 @@ void ft_prop(struct ft_cxt *cxt, const char *name, const void *data, int sz)
if (off == -1) {
memcpy(cxt->p_end, name, strlen(name) + 1);
off = cxt->p_end - cxt->p;
cxt->p_end += strlen(name) + 2;
cxt->p_end += strlen(name) + 1;
}
/* now put offset from beginning of *STRUCTURE* */
@ -143,9 +143,9 @@ void ft_init_cxt(struct ft_cxt *cxt, void *blob)
cxt->p_rsvmap += SIZE_OF_RSVMAP_ENTRY;
}
cxt->p_start = (char*)bph + bph->off_dt_struct;
cxt->p_end = (char *)bph + bph->totalsize;
cxt->p = (char *)bph + bph->off_dt_strings;
cxt->p_start = (u8 *)bph + bph->off_dt_struct;
cxt->p_end = (u8 *)bph + bph->totalsize;
cxt->p = (u8 *)bph + bph->off_dt_strings;
}
/* add a reserver physical area to the rsvmap */

5
cpu/mpc85xx/pci.c
View File

@ -29,6 +29,9 @@
#include <asm/cpm_85xx.h>
#include <pci.h>
#if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
#endif
#if defined(CONFIG_PCI)
@ -42,7 +45,9 @@ pci_mpc85xx_init(struct pci_controller *board_hose)
volatile immap_t *immap = (immap_t *)CFG_CCSRBAR;
volatile ccsr_pcix_t *pcix = &immap->im_pcix;
#ifdef CONFIG_MPC85XX_PCI2
volatile ccsr_pcix_t *pcix2 = &immap->im_pcix2;
#endif
volatile ccsr_gur_t *gur = &immap->im_gur;
struct pci_controller * hose;

2
include/ft_build.h
View File

@ -64,6 +64,8 @@ void *ft_get_prop(void *bphp, const char *propname, int *szp);
#ifdef CONFIG_OF_BOARD_SETUP
void ft_board_setup(void *blob, bd_t *bd);
void ft_cpu_setup(void *blob, bd_t *bd);
void ft_pci_setup(void *blob, bd_t *bd);
#endif
#endif

3
include/pci.h
View File

@ -501,4 +501,7 @@ extern int pci_hose_config_device(struct pci_controller *hose,
extern void pci_mpc824x_init (struct pci_controller *hose);
#endif
#ifdef CONFIG_MPC85xx
extern void pci_mpc85xx_init (struct pci_controller *hose);
#endif
#endif /* _PCI_H */