diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-07-10 12:05:32 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-07-10 12:05:32 -0500 |
| commit | 859f24350e6e4313626f85161dd03f025a4dac59 (patch) | |
| tree | a025f68619045556e662326c8e1cbc147f9b633e /board/freescale/mpc8260ads | |
| parent | 3473ab737282b08ad61841fcbb14c4d264a93a8e (diff) | |
| parent | e0320b1ebec13755911a53b0af12cbf3e5e49a65 (diff) | |
| download | u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.zip u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.gz u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'board/freescale/mpc8260ads')
| -rw-r--r-- | board/freescale/mpc8260ads/Makefile | 2 | ||||
| -rw-r--r-- | board/freescale/mpc8260ads/mpc8260ads.c | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/board/freescale/mpc8260ads/Makefile b/board/freescale/mpc8260ads/Makefile index de7d847..e1d4af0 100644 --- a/board/freescale/mpc8260ads/Makefile +++ b/board/freescale/mpc8260ads/Makefile @@ -39,7 +39,7 @@ clean: rm -f $(SOBJS) $(OBJS) distclean: clean - rm -f $(LIB) core *.bak .depend + rm -f $(LIB) core *.bak $(obj).depend ######################################################################### diff --git a/board/freescale/mpc8260ads/mpc8260ads.c b/board/freescale/mpc8260ads/mpc8260ads.c index 6f683f0..8ab7d35 100644 --- a/board/freescale/mpc8260ads/mpc8260ads.c +++ b/board/freescale/mpc8260ads/mpc8260ads.c @@ -46,6 +46,10 @@ #ifdef CONFIG_PCI #include <pci.h> #endif +#ifdef CONFIG_OF_LIBFDT +#include <libfdt.h> +#include <fdt_support.h> +#endif /* * I/O Port configuration table @@ -544,3 +548,26 @@ void pci_init_board(void) pci_mpc8250_init(&hose); } #endif + +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) +void ft_blob_update(void *blob, bd_t *bd) +{ + int ret; + + ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); + + if (ret < 0) { + printf("ft_blob_update(): cannot set /memory/reg " + "property err:%s\n", fdt_strerror(ret)); + } +} + +void ft_board_setup(void *blob, bd_t *bd) +{ + ft_cpu_setup(blob, bd); +#ifdef CONFIG_PCI + ft_pci_setup(blob, bd); +#endif + ft_blob_update(blob, bd); +} +#endif |