Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[POWERPC] bootwrapper: Add TARGET_HAS_ETHn tests to ppcboot.h

U-boots more recent than when ppcboot.h was forked allow the board config
file to enable additional ethernet ports explicitly, rather than
using a hardcoded list of targets. This allows bootwrapper platform
files to do the same.

Fortunately, nothing after the ethernet addresses is of interest to
cuboot platforms, so the inevitable mismatches won't be too catastrophic.

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>

authored by

Scott Wood and committed by
Paul Mackerras
61d3b949 6e913c67

+4 -3
+4 -3
arch/powerpc/boot/ppcboot.h
··· 78 78 hymod_conf_t bi_hymod_conf; /* hymod configuration information */ 79 79 #endif 80 80 #if defined(TARGET_EVB64260) || defined(TARGET_405EP) || defined(TARGET_44x) || \ 81 - defined(TARGET_85xx) || defined(TARGET_83xx) 81 + defined(TARGET_85xx) || defined(TARGET_83xx) || defined(TARGET_HAS_ETH1) 82 82 /* second onboard ethernet port */ 83 83 unsigned char bi_enet1addr[6]; 84 84 #define HAVE_ENET1ADDR 85 85 #endif 86 - #if defined(TARGET_EVB64260) || defined(TARGET_440GX) || defined(TARGET_85xx) 86 + #if defined(TARGET_EVB64260) || defined(TARGET_440GX) || \ 87 + defined(TARGET_85xx) || defined(TARGET_HAS_ETH2) 87 88 /* third onboard ethernet ports */ 88 89 unsigned char bi_enet2addr[6]; 89 90 #define HAVE_ENET2ADDR 90 91 #endif 91 - #if defined(TARGET_440GX) 92 + #if defined(TARGET_440GX) || defined(TARGET_HAS_ETH3) 92 93 /* fourth onboard ethernet ports */ 93 94 unsigned char bi_enet3addr[6]; 94 95 #define HAVE_ENET3ADDR