[PATCH] ppc32: cleanup AMCC PPC40x eval boards to support U-Boot
Cleanup PPC40x eval boards (bubinga, walnut and sycamore) to support U-Boot as bootloader. The OpenBIOS bd_info struct is not used in the kernel anymore (only U-Boot now). uImage (U-Boot) tested on walnut, sycamore and bubinga zImage (OpenBIOS) tested on sycamore, bubinga and ebony Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
90eb266584
commit
3e9e7c1d0b
@@ -131,9 +131,22 @@ static inline void ibm_ocp_set_emac(int start, int end)
|
||||
/* Copy MAC addresses to EMAC additions */
|
||||
for (i=start; i<=end; i++) {
|
||||
def = ocp_get_one_device(OCP_VENDOR_IBM, OCP_FUNC_EMAC, i);
|
||||
memcpy(((struct ocp_func_emac_data *)def->additions)->mac_addr,
|
||||
&__res.bi_enetaddr[i],
|
||||
6);
|
||||
if (i == 0)
|
||||
memcpy(((struct ocp_func_emac_data *)def->additions)->mac_addr,
|
||||
__res.bi_enetaddr, 6);
|
||||
#if defined(CONFIG_405EP) || defined(CONFIG_44x)
|
||||
else if (i == 1)
|
||||
memcpy(((struct ocp_func_emac_data *)def->additions)->mac_addr,
|
||||
__res.bi_enet1addr, 6);
|
||||
#endif
|
||||
#if defined(CONFIG_440GX)
|
||||
else if (i == 2)
|
||||
memcpy(((struct ocp_func_emac_data *)def->additions)->mac_addr,
|
||||
__res.bi_enet2addr, 6);
|
||||
else if (i == 3)
|
||||
memcpy(((struct ocp_func_emac_data *)def->additions)->mac_addr,
|
||||
__res.bi_enet3addr, 6);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user