From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kumar Gala Date: Thu, 29 Nov 2007 15:21:00 -0600 Subject: [U-Boot-Users] [PATCH 10/18] Update MPC8568 MDS to use libfdt In-Reply-To: <1196371279614-git-send-email-galak@kernel.crashing.org> References: 8544 <11963712683331-git-send-email-galak@kernel.crashing.org> <11963712693052-git-send-email-galak@kernel.crashing.org> <11963712701600-git-send-email-galak@kernel.crashing.org> <11963712711762-git-send-email-galak@kernel.crashing.org> <11963712723538-git-send-email-galak@kernel.crashing.org> <11963712751600-git-send-email-galak@kernel.crashing.org> <11963712762952-git-send-email-galak@kernel.crashing.org> <11963712773354-git-send-email-galak@kernel.crashing.org> <11963712782585-git-send-email-galak@kernel.crashing.org> <1196371279614-git-send-email-galak@kernel.crashing.org> Message-ID: <11963712813067-git-send-email-galak@kernel.crashing.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Updated the MPC8568 MDS config to use libfdt and assume use of aliases for ethernet, pci, and serial for the various fixups that are done. Signed-off-by: Kumar Gala --- board/mpc8568mds/mpc8568mds.c | 46 +++++++++++++++++------------------------ include/configs/MPC8568MDS.h | 11 ++------- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/board/mpc8568mds/mpc8568mds.c b/board/mpc8568mds/mpc8568mds.c index ab5b67d..3e3feec 100644 --- a/board/mpc8568mds/mpc8568mds.c +++ b/board/mpc8568mds/mpc8568mds.c @@ -30,10 +30,8 @@ #include #include #include - -#if defined(CONFIG_OF_FLAT_TREE) -#include -#endif +#include +#include #include "bcsr.h" @@ -528,38 +526,32 @@ pci_init_board(void) } #endif /* CONFIG_PCI */ -#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) +#if defined(CONFIG_OF_BOARD_SETUP) void ft_board_setup(void *blob, bd_t *bd) { - u32 *p; - int len; + int node, tmp[2]; + const char *path; ft_cpu_setup(blob, bd); - p = ft_get_prop(blob, "/memory/reg", &len); - if (p != NULL) { - *p++ = cpu_to_be32(bd->bi_memstart); - *p = cpu_to_be32(bd->bi_memsize); - } + node = fdt_path_offset(blob, "/aliases"); + tmp[0] = 0; + if (node >= 0) { #ifdef CONFIG_PCI1 - p = (u32 *)ft_get_prop(blob, "/" OF_SOC "/pci at 8000/bus-range", &len); - if (p != NULL) { - p[0] = 0; - p[1] = pci1_hose.last_busno - pci1_hose.first_busno; - debug("PCI at 8000 first_busno=%d last_busno=%d\n",p[0],p[1]); - } + path = fdt_getprop(blob, node, "pci0", NULL); + if (path) { + tmp[1] = pci1_hose.last_busno - pci1_hose.first_busno; + do_fixup_by_path(blob, path, "bus-range", &tmp, 8, 1); + } #endif - #ifdef CONFIG_PCIE1 - p = (u32 *)ft_get_prop(blob, "/" OF_SOC "/pcie at a000/bus-range", &len); - if (p != NULL) { - p[0] = 0; - p[1] = pcie1_hose.last_busno - pcie1_hose.first_busno; - debug("PCI at a000 first_busno=%d last_busno=%d\n",p[0],p[1]); - } + path = fdt_getprop(blob, node, "pci1", NULL); + if (path) { + tmp[1] = pcie1_hose.last_busno - pcie1_hose.first_busno; + do_fixup_by_path(blob, path, "bus-range", &tmp, 8, 1); + } #endif + } } #endif - - diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index cf79257..2f4bc70 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -296,14 +296,9 @@ extern unsigned long get_clock_freq(void); #endif /* pass open firmware flat tree */ -#define CONFIG_OF_FLAT_TREE 1 -#define CONFIG_OF_BOARD_SETUP 1 - -#define OF_CPU "PowerPC,8568 at 0" -#define OF_SOC "soc8568 at e0000000" -#define OF_QE "qe at e0080000" -#define OF_TBCLK (bd->bi_busfreq / 8) -#define OF_STDOUT_PATH "/soc8568 at e0000000/serial at 4500" +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_OF_STDOUT_VIA_ALIAS 1 /* * I2C -- 1.5.3.4