[U-Boot] [PATCH 1/3][ppc4xx] Changed PPC4xx EMAC driver to require CONFIG_PPC4xx_EMAC

[Stefan Roese]

On Tuesday 04 November 2008, Ben Warren wrote:
> All in-tree IBM/AMCC PPC4xx boards using the EMAC get this new CONFIG
>
> Signed-off-by: Ben Warren <biggerbadderben at gmail.com>
> ---
>
> Rebased against 4xx tree.  Please test and ACK/NAK.

I'm testing right now. It seems to work on "most" boards. Here a small patch 
that you should incorporate:

diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile
index 463b575..96ab5c6 100644
--- a/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
@@ -60,7 +60,6 @@ COBJS += usb.o
 COBJS  += usb_ohci.o
 COBJS  += usbdev.o
 ifndef CONFIG_XILINX_440
-COBJS  += 4xx_enet.o
 COBJS  += 4xx_uart.o
 COBJS  += gpio.o
 COBJS  += miiphy.o


And also there are some boards that include the 4xx_enet object directly from 
their linker script:

[stefan at kubuntu u-boot-ppc4xx (master)]$ git grep "cpu/ppc4xx/4xx_enet.o"
board/cray/L1/u-boot.lds:    cpu/ppc4xx/4xx_enet.o      (.text)
board/csb272/u-boot.lds:    cpu/ppc4xx/4xx_enet.o       (.text)
board/csb472/u-boot.lds:    cpu/ppc4xx/4xx_enet.o       (.text)
board/dave/PPChameleonEVB/u-boot.lds:    cpu/ppc4xx/4xx_enet.o  (.text)
board/eric/u-boot.lds:    cpu/ppc4xx/4xx_enet.o (.text)
board/esd/ar405/u-boot.lds:    cpu/ppc4xx/4xx_enet.o    (.text)
board/esd/dp405/u-boot.lds:    cpu/ppc4xx/4xx_enet.o    (.text)
board/esd/hub405/u-boot.lds:    cpu/ppc4xx/4xx_enet.o   (.text)
board/esd/voh405/u-boot.lds:    cpu/ppc4xx/4xx_enet.o   (.text)
board/g2000/u-boot.lds:    cpu/ppc4xx/4xx_enet.o        (.text)
board/ml2/u-boot.lds:    cpu/ppc4xx/4xx_enet.o  (.text)
board/mpl/mip405/u-boot.lds:    cpu/ppc4xx/4xx_enet.o   (.text)
board/sandburst/karef/u-boot.lds:    cpu/ppc4xx/4xx_enet.o      (.text)
board/sandburst/karef/u-boot.lds.debug:    cpu/ppc4xx/4xx_enet.o        
(.text)
board/sandburst/metrobox/u-boot.lds:    cpu/ppc4xx/4xx_enet.o   (.text)
board/sandburst/metrobox/u-boot.lds.debug:    cpu/ppc4xx/4xx_enet.o     
(.text)
board/sbc405/u-boot.lds:    cpu/ppc4xx/4xx_enet.o       (.text)
board/xilinx/ml300/u-boot.lds:    cpu/ppc4xx/4xx_enet.o (.text)

It should be safe to remove this reference completely, but the fix with least 
consequences is the change to the new object location.

Please change this in your next patch submission and you can add my Acked-by 
and include it into your net repository.

Thanks for your work on this.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================