Преглед изворни кода

[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>
Scott Wood пре 17 година
родитељ
комит
61d3b949b7
1 измењених фајлова са 4 додато и 3 уклоњено
  1. 4 3
      arch/powerpc/boot/ppcboot.h

+ 4 - 3
arch/powerpc/boot/ppcboot.h

@@ -78,17 +78,18 @@ typedef struct bd_info {
 	hymod_conf_t	bi_hymod_conf;	/* hymod configuration information */
 	hymod_conf_t	bi_hymod_conf;	/* hymod configuration information */
 #endif
 #endif
 #if defined(TARGET_EVB64260) || defined(TARGET_405EP) || defined(TARGET_44x) || \
 #if defined(TARGET_EVB64260) || defined(TARGET_405EP) || defined(TARGET_44x) || \
-	defined(TARGET_85xx) ||	defined(TARGET_83xx)
+	defined(TARGET_85xx) ||	defined(TARGET_83xx) || defined(TARGET_HAS_ETH1)
 	/* second onboard ethernet port */
 	/* second onboard ethernet port */
 	unsigned char	bi_enet1addr[6];
 	unsigned char	bi_enet1addr[6];
 #define HAVE_ENET1ADDR
 #define HAVE_ENET1ADDR
 #endif
 #endif
-#if defined(TARGET_EVB64260) || defined(TARGET_440GX) || defined(TARGET_85xx)
+#if defined(TARGET_EVB64260) || defined(TARGET_440GX) || \
+    defined(TARGET_85xx) || defined(TARGET_HAS_ETH2)
 	/* third onboard ethernet ports */
 	/* third onboard ethernet ports */
 	unsigned char	bi_enet2addr[6];
 	unsigned char	bi_enet2addr[6];
 #define HAVE_ENET2ADDR
 #define HAVE_ENET2ADDR
 #endif
 #endif
-#if defined(TARGET_440GX)
+#if defined(TARGET_440GX) || defined(TARGET_HAS_ETH3)
 	/* fourth onboard ethernet ports */
 	/* fourth onboard ethernet ports */
 	unsigned char	bi_enet3addr[6];
 	unsigned char	bi_enet3addr[6];
 #define HAVE_ENET3ADDR
 #define HAVE_ENET3ADDR