diff --git a/board/cds/mpc8541cds/mpc8541cds.c b/board/cds/mpc8541cds/mpc8541cds.c
index c2b3009fd2bf1652ce901e0cc06af542d0a7eabc..a42904cf735e4b03aca54ffd192a4dcaee45b352 100644
--- a/board/cds/mpc8541cds/mpc8541cds.c
+++ b/board/cds/mpc8541cds/mpc8541cds.c
@@ -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
}
diff --git a/board/cds/mpc8548cds/mpc8548cds.c b/board/cds/mpc8548cds/mpc8548cds.c
index 6eedb4a2095c8e36ad4eb57e98713e131f127123..ab5835dbe315c964b307de0a2b7d71531b986a41 100644
--- a/board/cds/mpc8548cds/mpc8548cds.c
+++ b/board/cds/mpc8548cds/mpc8548cds.c
@@ -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
}
diff --git a/board/cds/mpc8555cds/mpc8555cds.c b/board/cds/mpc8555cds/mpc8555cds.c
index 012181c31d3470c6a7f723646ba2e82b0bb4d295..d980ea63102ada4fdd480016b569ed130848dd91 100644
--- a/board/cds/mpc8555cds/mpc8555cds.c
+++ b/board/cds/mpc8555cds/mpc8555cds.c
@@ -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
}
diff --git a/board/mpc8540ads/mpc8540ads.c b/board/mpc8540ads/mpc8540ads.c
index fbcb397290a4c11ba1d743ae0aa65950b7c8f078..914e51a7607014662fcabcdb72f9e1e4001a82d3 100644
--- a/board/mpc8540ads/mpc8540ads.c
+++ b/board/mpc8540ads/mpc8540ads.c
@@ -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 */
}
diff --git a/board/mpc8560ads/mpc8560ads.c b/board/mpc8560ads/mpc8560ads.c
index f9d75e80510aae6c63d6169a08cb014b54c5a788..c1572a35d3f7be4c6dd469958654a53a1c6064d3 100644
--- a/board/mpc8560ads/mpc8560ads.c
+++ b/board/mpc8560ads/mpc8560ads.c
@@ -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 */
}
diff --git a/board/pm854/pm854.c b/board/pm854/pm854.c
index 94c492f7821483f0f0670bbdfe9b97fd87b52228..6ead1d06309af46aadbf08906d0b643e4b423bcf 100644
--- a/board/pm854/pm854.c
+++ b/board/pm854/pm854.c
@@ -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 */
}
diff --git a/board/pm856/pm856.c b/board/pm856/pm856.c
index 504470837087ee007cdf456b48c71f5281f859bf..a10075451e00ee905b51220172bc9a2123549aee 100644
--- a/board/pm856/pm856.c
+++ b/board/pm856/pm856.c
@@ -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 */
}
diff --git a/board/stxgp3/stxgp3.c b/board/stxgp3/stxgp3.c
index 2b3949cd7b368802dae7328ef2c91e5630cc80ae..a58c043b629fa66fbce11300010ac90e4e9e2585 100644
--- a/board/stxgp3/stxgp3.c
+++ b/board/stxgp3/stxgp3.c
@@ -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 */
}
diff --git a/board/tqm85xx/tqm85xx.c b/board/tqm85xx/tqm85xx.c
index befe8b76c8bfdaf89afed718e418dd7ca3eebe31..9f03ec50f736682f4880eb3eac6e7696c51b614b 100644
--- a/board/tqm85xx/tqm85xx.c
+++ b/board/tqm85xx/tqm85xx.c
@@ -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 */
}
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 04bce762c86c49a60a5f05be1f9289c2fabb6e17..b785b9ea4f6b1735e204e9092877a79c5963c78a 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -623,7 +623,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
diff --git a/common/ft_build.c b/common/ft_build.c
index b5937e35f7abe1abff3cf262bd76140fa03c1ef0..c6a018de240293fbc2a0bafb561191995933661e 100644
--- a/common/ft_build.c
+++ b/common/ft_build.c
@@ -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;
@@ -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 */
diff --git a/cpu/mpc85xx/pci.c b/cpu/mpc85xx/pci.c
index cfb7dcdc89551a0d6023726a67fb390e69ddecd1..84f839ae1e4fee2cf6af1212c1830899bd30abc7 100644
--- a/cpu/mpc85xx/pci.c
+++ b/cpu/mpc85xx/pci.c
@@ -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;
diff --git a/include/ft_build.h b/include/ft_build.h
index f5156879de3f8204650533d6511fae05a32b68bf..89c689c0847b0cfaa52dc6db32abfa170dfe1736 100644
--- a/include/ft_build.h
+++ b/include/ft_build.h
@@ -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
diff --git a/include/pci.h b/include/pci.h
index e0e8783a7aa1f85b41aa1d9866aa994dc5dac9c4..cc216e17d4d73a65f4926489a469677253929912 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -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 */