mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
Moved PPC4xx EMAC driver to drivers/net
Also changed path in all linker scripts that reference this driver Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Acked-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
96e21f86e8
commit
4d03a4e20e
21 changed files with 19 additions and 20 deletions
|
@ -68,7 +68,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -68,7 +68,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -68,7 +68,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -66,7 +66,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -66,7 +66,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -66,7 +66,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -66,7 +66,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -66,7 +66,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -63,7 +63,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -72,7 +72,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -74,7 +74,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -64,7 +64,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -74,7 +74,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -64,7 +64,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -66,7 +66,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -64,7 +64,7 @@ SECTIONS
|
||||||
cpu/ppc4xx/4xx_uart.o (.text)
|
cpu/ppc4xx/4xx_uart.o (.text)
|
||||||
cpu/ppc4xx/cpu_init.o (.text)
|
cpu/ppc4xx/cpu_init.o (.text)
|
||||||
cpu/ppc4xx/speed.o (.text)
|
cpu/ppc4xx/speed.o (.text)
|
||||||
cpu/ppc4xx/4xx_enet.o (.text)
|
drivers/net/4xx_enet.o (.text)
|
||||||
common/dlmalloc.o (.text)
|
common/dlmalloc.o (.text)
|
||||||
lib_generic/crc32.o (.text)
|
lib_generic/crc32.o (.text)
|
||||||
lib_ppc/extable.o (.text)
|
lib_ppc/extable.o (.text)
|
||||||
|
|
|
@ -38,7 +38,6 @@ COBJS += 44x_spd_ddr2.o
|
||||||
ifdef CONFIG_PPC4xx_DDR_AUTOCALIBRATION
|
ifdef CONFIG_PPC4xx_DDR_AUTOCALIBRATION
|
||||||
COBJS += 4xx_ibm_ddr2_autocalib.o
|
COBJS += 4xx_ibm_ddr2_autocalib.o
|
||||||
endif
|
endif
|
||||||
COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
|
|
||||||
COBJS += 4xx_pci.o
|
COBJS += 4xx_pci.o
|
||||||
COBJS += 4xx_pcie.o
|
COBJS += 4xx_pcie.o
|
||||||
COBJS += bedbug_405.o
|
COBJS += bedbug_405.o
|
||||||
|
@ -61,7 +60,6 @@ COBJS += usb.o
|
||||||
COBJS += usb_ohci.o
|
COBJS += usb_ohci.o
|
||||||
COBJS += usbdev.o
|
COBJS += usbdev.o
|
||||||
ifndef CONFIG_XILINX_440
|
ifndef CONFIG_XILINX_440
|
||||||
COBJS += 4xx_enet.o
|
|
||||||
COBJS += 4xx_uart.o
|
COBJS += 4xx_uart.o
|
||||||
COBJS += gpio.o
|
COBJS += gpio.o
|
||||||
COBJS += miiphy.o
|
COBJS += miiphy.o
|
||||||
|
|
|
@ -54,6 +54,7 @@ COBJS-$(CONFIG_NS8382X) += ns8382x.o
|
||||||
COBJS-$(CONFIG_DRIVER_NS9750_ETHERNET) += ns9750_eth.o
|
COBJS-$(CONFIG_DRIVER_NS9750_ETHERNET) += ns9750_eth.o
|
||||||
COBJS-$(CONFIG_PCNET) += pcnet.o
|
COBJS-$(CONFIG_PCNET) += pcnet.o
|
||||||
COBJS-$(CONFIG_PLB2800_ETHER) += plb2800_eth.o
|
COBJS-$(CONFIG_PLB2800_ETHER) += plb2800_eth.o
|
||||||
|
COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
|
||||||
COBJS-$(CONFIG_DRIVER_RTL8019) += rtl8019.o
|
COBJS-$(CONFIG_DRIVER_RTL8019) += rtl8019.o
|
||||||
COBJS-$(CONFIG_RTL8139) += rtl8139.o
|
COBJS-$(CONFIG_RTL8139) += rtl8139.o
|
||||||
COBJS-$(CONFIG_RTL8169) += rtl8169.o
|
COBJS-$(CONFIG_RTL8169) += rtl8169.o
|
||||||
|
|
Loading…
Add table
Reference in a new issue