From: Grant Likely <grant.likely@secretlab.ca>
Date: Sat, 17 Nov 2007 04:01:19 +0000 (-0700)
Subject: Merge branch 'origin' into kconfig-for-1.3.1
X-Git-Tag: v1.3.1-rc1~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=efe33035acd5f7c13963a4d52e5aac1b68612ae4;p=oweals%2Fu-boot.git

Merge branch 'origin' into kconfig-for-1.3.1

Conflicts:

	drivers/Makefile
---

efe33035acd5f7c13963a4d52e5aac1b68612ae4
diff --cc drivers/Makefile
index a81c820072,207606a3aa..480b3581f6
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -27,122 -27,34 +27,123 @@@ include $(TOPDIR)/config.m
  
  LIB	= $(obj)libdrivers.a
  
 -COBJS	= 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o \
 -	  ati_radeon_fb.o atmel_usart.o \
 -	  bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \
 -	  cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
 -	  ds1722.o e1000.o eepro100.o enc28j60.o \
 -	  fsl_i2c.o fsl_pci_init.o \
 -	  i8042.o inca-ip_sw.o isp116x-hcd.o \
 -	  keyboard.o ks8695eth.o \
 -	  lan91c96.o macb.o mpc8xx_pcmcia.o mw_eeprom.o \
 -	  natsemi.o ne2000.o netarm_eth.o netconsole.o \
 -	  ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
 -	  omap24xx_i2c.o pc_keyb.o \
 -	  pci.o pci_auto.o pci_indirect.o \
 -	  pcnet.o plb2800_eth.o ps2ser.o ps2mult.o pxa_pcmcia.o \
 -	  rpx_pcmcia.o rtl8019.o rtl8139.o rtl8169.o uli526x.o\
 -	  s3c4510b_eth.o s3c4510b_uart.o \
 -	  sed13806.o sed156x.o \
 -	  serial.o serial_max3100.o \
 -	  serial_xuartlite.o \
 -	  sil680.o sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
 -	  status_led.o sym53c8xx.o systemace.o ahci.o \
 -	  ti_pci1410a.o tigon3.o tqm8xx_pcmcia.o tsec.o \
 -	  tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
 -	  usb_ohci.o \
 -	  usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \
 -	  usbtty.o \
 -	  videomodes.o w83c553f.o
 +COBJS-y += ali512x.o
 +COBJS-y += ds1722.o
 +COBJS-y += ns87308.o
 +COBJS-y += status_led.o
  
 +#
 +# Block and Flash Drivers
 +#
 +COBJS-y += ahci.o
 +COBJS-y += at45.o
 +COBJS-y += ata_piix.o
 +COBJS-y += cfi_flash.o
 +COBJS-y += dataflash.o
 +COBJS-y += mw_eeprom.o
 +COBJS-y += sil680.o
 +COBJS-y += sym53c8xx.o
 +COBJS-y += systemace.o
 +
 +#
 +# Console Drivers
 +#
 +COBJS-y += ati_radeon_fb.o
 +COBJS-y += atmel_usart.o
 +COBJS-y += cfb_console.o
 +COBJS-y += ct69000.o
 +COBJS-y += i8042.o
 +COBJS-y += keyboard.o
 +COBJS-y += netconsole.o
 +COBJS-y += ns16550.o
 +COBJS-y += pc_keyb.o
 +COBJS-y += ps2ser.o
 +COBJS-y += ps2mult.o
 +COBJS-y += s3c4510b_uart.o
 +COBJS-y += sed13806.o
 +COBJS-y += sed156x.o
 +COBJS-y += serial.o
 +COBJS-y += serial_max3100.o
 +COBJS-y += serial_xuartlite.o
 +COBJS-y += sm501.o
 +COBJS-y += smiLynxEM.o
 +COBJS-y += usbtty.o
 +COBJS-y += videomodes.o
 +
 +#
 +# I2C Drivers
 +#
 +COBJS-y += omap1510_i2c.o
 +COBJS-y += omap24xx_i2c.o
 +COBJS-y += tsi108_i2c.o
 +COBJS-y += fsl_i2c.o
 +
 +#
 +# Network Drivers
 +#
 +COBJS-y += 3c589.o
 +COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o
 +COBJS-y += cs8900.o
 +COBJS-y += dc2114x.o
 +COBJS-y += dm9000x.o
 +COBJS-y += e1000.o
 +COBJS-y += eepro100.o
 +COBJS-y += enc28j60.o
 +COBJS-y += inca-ip_sw.o
 +COBJS-y += ks8695eth.o
 +COBJS-y += lan91c96.o
 +COBJS-y += macb.o
 +COBJS-y += natsemi.o
 +COBJS-y += ne2000.o
 +COBJS-y += netarm_eth.o
 +COBJS-y += ns7520_eth.o
 +COBJS-y += ns8382x.o
 +COBJS-y += pcnet.o
 +COBJS-y += plb2800_eth.o
 +COBJS-y += rtl8019.o
 +COBJS-y += rtl8139.o
 +COBJS-y += rtl8169.o
 +COBJS-y += s3c4510b_eth.o
 +COBJS-y += smc91111.o
 +COBJS-y += tigon3.o
 +COBJS-y += tsec.o
 +COBJS-y += tsi108_eth.o
++COBJS-y += uli526x.o
 +
 +#
 +# PCI/PCMCIA device drivers
 +#
 +COBJS-y += fsl_pci_init.o
 +COBJS-y += mpc8xx_pcmcia.o
 +COBJS-y += pci.o
 +COBJS-y += pci_auto.o
 +COBJS-y += pci_indirect.o
 +COBJS-y += pxa_pcmcia.o
 +COBJS-y += rpx_pcmcia.o
 +COBJS-y += ti_pci1410a.o
 +COBJS-y += tqm8xx_pcmcia.o
 +COBJS-y += tsi108_pci.o
 +COBJS-y += w83c553f.o
 +
 +#
 +# USB Drivers
 +#
 +COBJS-y += isp116x-hcd.o
 +COBJS-y += sl811_usb.o
 +COBJS-y += usb_ohci.o
 +COBJS-y += usbdcore.o
 +COBJS-y += usbdcore_ep0.o
 +COBJS-y += usbdcore_mpc8xx.o
 +COBJS-y += usbdcore_omap1510.o
 +
 +#
 +# Miscellaneous Drivers
 +#
 +COBJS-y += ali512x.o
 +COBJS-y += ns87308.o
 +COBJS-y += status_led.o
 +
 +COBJS	:= $(COBJS-y)
  SRCS	:= $(COBJS:.o=.c)
  OBJS	:= $(addprefix $(obj),$(COBJS))