Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=61d3b949b70802c4f32d540b11a93128c31c67ea
Commit:     61d3b949b70802c4f32d540b11a93128c31c67ea
Parent:     6e913c67b3eb93e2b8bc1dc0ff854f00a760f41b
Author:     Scott Wood <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 21 03:39:52 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Aug 22 15:21:48 2007 +1000

    [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 <[EMAIL PROTECTED]>
    Acked-by: David Gibson <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/boot/ppcboot.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/boot/ppcboot.h b/arch/powerpc/boot/ppcboot.h
index 5290ff2..6ae6f90 100644
--- a/arch/powerpc/boot/ppcboot.h
+++ b/arch/powerpc/boot/ppcboot.h
@@ -78,17 +78,18 @@ typedef struct bd_info {
        hymod_conf_t    bi_hymod_conf;  /* hymod configuration information */
 #endif
 #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 */
        unsigned char   bi_enet1addr[6];
 #define HAVE_ENET1ADDR
 #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 */
        unsigned char   bi_enet2addr[6];
 #define HAVE_ENET2ADDR
 #endif
-#if defined(TARGET_440GX)
+#if defined(TARGET_440GX) || defined(TARGET_HAS_ETH3)
        /* fourth onboard ethernet ports */
        unsigned char   bi_enet3addr[6];
 #define HAVE_ENET3ADDR
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to