diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-27 22:57:41 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-27 22:57:41 +0200 |
| commit | c303176aa0cf8c5fc38e7c2d5e181e89cca72ef6 (patch) | |
| tree | cfac3ea66f6977c3875dbb091370ee8483e462cb /board | |
| parent | c88d6ab19ffab06f372b15c290bdf5d6f1ebfe9a (diff) | |
| parent | 7e1afb62a7e68843248b9a76a265c9193e716768 (diff) | |
| download | blackbird-obmc-uboot-c303176aa0cf8c5fc38e7c2d5e181e89cca72ef6.tar.gz blackbird-obmc-uboot-c303176aa0cf8c5fc38e7c2d5e181e89cca72ef6.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/mpc837xemds/mpc837xemds.c | 2 | ||||
| -rw-r--r-- | board/freescale/mpc837xemds/pci.c | 2 | ||||
| -rw-r--r-- | board/freescale/mpc837xerdb/mpc837xerdb.c | 2 | ||||
| -rw-r--r-- | board/freescale/p1_p2_rdb/p1_p2_rdb.c | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c index 9d8b18d993..32a87adb9e 100644 --- a/board/freescale/mpc837xemds/mpc837xemds.c +++ b/board/freescale/mpc837xemds/mpc837xemds.c @@ -14,7 +14,7 @@ #include <hwconfig.h> #include <i2c.h> #include <asm/io.h> -#include <asm/fsl_serdes.h> +#include <asm/fsl_mpc83xx_serdes.h> #include <spd_sdram.h> #include <tsec.h> #include <libfdt.h> diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c index 6b7b8b2e7f..82f34f85c8 100644 --- a/board/freescale/mpc837xemds/pci.c +++ b/board/freescale/mpc837xemds/pci.c @@ -18,7 +18,7 @@ #include <i2c.h> #include <fdt_support.h> #include <asm/fsl_i2c.h> -#include <asm/fsl_serdes.h> +#include <asm/fsl_mpc83xx_serdes.h> static struct pci_region pci_regions[] = { { diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index c5c2e40833..d636796f85 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -16,7 +16,7 @@ #include <hwconfig.h> #include <i2c.h> #include <asm/io.h> -#include <asm/fsl_serdes.h> +#include <asm/fsl_mpc83xx_serdes.h> #include <fdt_support.h> #include <spd_sdram.h> #include <vsc7385.h> diff --git a/board/freescale/p1_p2_rdb/p1_p2_rdb.c b/board/freescale/p1_p2_rdb/p1_p2_rdb.c index 3af660e775..31cdf9ae4c 100644 --- a/board/freescale/p1_p2_rdb/p1_p2_rdb.c +++ b/board/freescale/p1_p2_rdb/p1_p2_rdb.c @@ -198,6 +198,8 @@ int board_eth_init(bd_t *bis) #endif #if defined(CONFIG_OF_BOARD_SETUP) +extern void ft_pci_board_setup(void *blob); + void ft_board_setup(void *blob, bd_t *bd) { phys_addr_t base; @@ -208,6 +210,8 @@ void ft_board_setup(void *blob, bd_t *bd) base = getenv_bootm_low(); size = getenv_bootm_size(); + ft_pci_board_setup(blob); + fdt_fixup_memory(blob, (u64)base, (u64)size); } #endif |
