board/eltec/elppc/misc.c: Fix GCC 4.6 build warning

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index cfd44b1ef4dba5282eec01beaf081d3dff096507..05966f417410a3eb19cfab965b2a0e16ad7c649f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@
 #
 
 VERSION = 2011
-PATCHLEVEL = 09
+PATCHLEVEL = 12
 SUBLEVEL =
-EXTRAVERSION =
+EXTRAVERSION = -rc2
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
@@ -286,6 +286,7 @@ LIBS += drivers/usb/gadget/libusb_gadget.o
 LIBS += drivers/usb/host/libusb_host.o
 LIBS += drivers/usb/musb/libusb_musb.o
 LIBS += drivers/usb/phy/libusb_phy.o
+LIBS += drivers/usb/ulpi/libusb_ulpi.o
 LIBS += drivers/video/libvideo.o
 LIBS += drivers/watchdog/libwatchdog.o
 LIBS += common/libcommon.o
@@ -654,17 +655,6 @@ ucname     = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
 # ARM
 #========================================================================
 
-omap730p2_config \
-omap730p2_cs0boot_config \
-omap730p2_cs3boot_config :     unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _cs0boot_, $@)" ] ; then \
-               echo "#define CONFIG_CS0_BOOT" >> $(obj)include/config.h ; \
-       else \
-               echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
-       fi;
-       @$(MKCONFIG) -n $@ -a omap730p2 arm arm926ejs omap730p2 ti omap
-
 spear300_config \
 spear310_config \
 spear320_config :      unconfig