diff options
author | Scott Wood <scottwood@freescale.com> | 2007-08-20 13:40:02 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-08-22 01:37:09 -0400 |
commit | e5d8d54db25790524da34b0143f4e0176fb7677b (patch) | |
tree | 5424562c9dd166eadd10b58d38ea9b3ce1a68ae0 /arch/powerpc/boot/devtree.c | |
parent | 0b195812dfbccc2ac33e17b35b899dd4fea7611f (diff) |
[POWERPC] bootwrapper: Add PowerQUICC II (82xx with CPM) cuboot support
This allows booting on legacy, non-device-tree aware versions of U-boot.
It also fixes up the hardware to match the PCI and chipselect information
in the device tree, as u-boot is inconsistent in setting these up
correctly (or at all).
Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/devtree.c')
-rw-r--r-- | arch/powerpc/boot/devtree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c index 3a18bfe0fdf7..e1b8122b4393 100644 --- a/arch/powerpc/boot/devtree.c +++ b/arch/powerpc/boot/devtree.c | |||
@@ -114,7 +114,7 @@ void __dt_fixup_mac_addresses(u32 startindex, ...) | |||
114 | 114 | ||
115 | #define MAX_ADDR_CELLS 4 | 115 | #define MAX_ADDR_CELLS 4 |
116 | 116 | ||
117 | static void get_reg_format(void *node, u32 *naddr, u32 *nsize) | 117 | void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize) |
118 | { | 118 | { |
119 | if (getprop(node, "#address-cells", naddr, 4) != 4) | 119 | if (getprop(node, "#address-cells", naddr, 4) != 4) |
120 | *naddr = 2; | 120 | *naddr = 2; |
@@ -224,7 +224,7 @@ static int dt_xlate(void *node, int res, int reglen, unsigned long *addr, | |||
224 | if (!parent) | 224 | if (!parent) |
225 | return 0; | 225 | return 0; |
226 | 226 | ||
227 | get_reg_format(parent, &naddr, &nsize); | 227 | dt_get_reg_format(parent, &naddr, &nsize); |
228 | 228 | ||
229 | if (nsize > 2) | 229 | if (nsize > 2) |
230 | return 0; | 230 | return 0; |
@@ -252,7 +252,7 @@ static int dt_xlate(void *node, int res, int reglen, unsigned long *addr, | |||
252 | if (!parent) | 252 | if (!parent) |
253 | break; | 253 | break; |
254 | 254 | ||
255 | get_reg_format(parent, &naddr, &nsize); | 255 | dt_get_reg_format(parent, &naddr, &nsize); |
256 | 256 | ||
257 | buflen = getprop(node, "ranges", prop_buf, | 257 | buflen = getprop(node, "ranges", prop_buf, |
258 | sizeof(prop_buf)); | 258 | sizeof(prop_buf)); |