diff options
| author | Angus Ainslie <angus.ainslie@linaro.org> | 2011-06-29 09:03:23 -0600 |
|---|---|---|
| committer | Angus Ainslie <angus.ainslie@linaro.org> | 2011-06-29 09:03:23 -0600 |
| commit | d1f576314011609179495b302163372ff8038e21 (patch) | |
| tree | eeb84a24ac81d2c5ffc0cfd5dda1ff5c858016d7 | |
| parent | 5a7f35bd0ac874523bad59dfd3ae142aceae7381 (diff) | |
| parent | b1af6f532e0d348b153d5c148369229d24af361a (diff) | |
Merge branch 'master' of git://git.denx.de/u-bootlinaro-smdkv310-2011.07
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | arch/arm/cpu/ixp/start.S | 3 | ||||
| -rw-r--r-- | drivers/usb/eth/Makefile | 4 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-pci.c | 5 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_hcd.c | 7 | ||||
| -rw-r--r-- | include/configs/actux1.h | 2 | ||||
| -rw-r--r-- | include/configs/ixdp425.h | 3 |
7 files changed, 12 insertions, 18 deletions
@@ -1,5 +1,5 @@ # -# (C) Copyright 2000-2010 +# (C) Copyright 2000-2011 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -24,7 +24,7 @@ VERSION = 2011 PATCHLEVEL = 06 SUBLEVEL = -EXTRAVERSION = -rc3 +EXTRAVERSION = ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else @@ -266,7 +266,7 @@ endif LIBS += drivers/rtc/librtc.o LIBS += drivers/serial/libserial.o LIBS += drivers/twserial/libtws.o -LIBS += drivers/usb/eth/libusb_eth.a +LIBS += drivers/usb/eth/libusb_eth.o LIBS += drivers/usb/gadget/libusb_gadget.o LIBS += drivers/usb/host/libusb_host.o LIBS += drivers/usb/musb/libusb_musb.o diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S index faa9a8ff9..a975d42a2 100644 --- a/arch/arm/cpu/ixp/start.S +++ b/arch/arm/cpu/ixp/start.S @@ -551,8 +551,5 @@ reset_cpu: str r1, [r2] b reset_endless - reset_endless: - b reset_endless - diff --git a/drivers/usb/eth/Makefile b/drivers/usb/eth/Makefile index 6a5f25a38..a8e9eff91 100644 --- a/drivers/usb/eth/Makefile +++ b/drivers/usb/eth/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/config.mk -LIB := $(obj)libusb_eth.a +LIB := $(obj)libusb_eth.o # new USB host ethernet layer dependencies COBJS-$(CONFIG_USB_HOST_ETHER) += usb_ether.o @@ -36,7 +36,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) all: $(LIB) $(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(call cmd_link_o_target, $(OBJS)) ######################################################################### diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 4abe5e3b5..020ab1135 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -42,7 +42,6 @@ static struct pci_device_id ehci_pci_ids[] = { int ehci_hcd_init(void) { pci_dev_t pdev; - uint32_t addr; pdev = pci_find_devices(ehci_pci_ids, CONFIG_PCI_EHCI_DEVICE); if (pdev == -1) { @@ -50,8 +49,8 @@ int ehci_hcd_init(void) return -1; } - pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &addr); - hccr = (struct ehci_hccr *)addr; + hccr = (struct ehci_hccr *)pci_map_bar(pdev, + PCI_BASE_ADDRESS_0, PCI_REGION_MEM); hcor = (struct ehci_hcor *)((uint32_t) hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c index 8b0c61d64..974bb311c 100644 --- a/drivers/usb/musb/musb_hcd.c +++ b/drivers/usb/musb/musb_hcd.c @@ -853,8 +853,11 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer, #ifdef MUSB_NO_MULTIPOINT /* Control message is for the HUB? */ - if (devnum == rh_devnum) - return musb_submit_rh_msg(dev, pipe, buffer, len, setup); + if (devnum == rh_devnum) { + int stat = musb_submit_rh_msg(dev, pipe, buffer, len, setup); + if (stat) + return stat; + } #endif /* select control endpoint */ diff --git a/include/configs/actux1.h b/include/configs/actux1.h index 160c10af2..2717abace 100644 --- a/include/configs/actux1.h +++ b/include/configs/actux1.h @@ -131,8 +131,6 @@ # define CONFIG_SYS_DRAM_SIZE 0x01000000 #endif - - /* FLASH organization */ #define CONFIG_SYS_TEXT_BASE 0x50000000 #ifdef CONFIG_FLASH2X2 diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h index 4bad31dfe..d6ef3b3d9 100644 --- a/include/configs/ixdp425.h +++ b/include/configs/ixdp425.h @@ -126,8 +126,6 @@ * Hardware drivers */ - - /* * Physical Memory Map */ @@ -247,7 +245,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) - /* * GPIO settings */ |