AT91: Add flexibity board support

[openwrt.git] / target / linux / at91 / image / u-boot / Makefile

diff --git a/target/linux/at91/image/u-boot/Makefile b/target/linux/at91/image/u-boot/Makefile
index f53df11..1d1b314 100644 (file)
--- a/target/linux/at91/image/u-boot/Makefile
+++ b/target/linux/at91/image/u-boot/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=u-boot
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=u-boot

-PKG_VERSION:=1.1.4
+PKG_VERSION:=2010.06

 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)


@@ -20,9 +20,9 @@ PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-UBOOT_CONFIG=$(strip $(subst ",, $(CONFIG_UBOOT_TARGET)))
-LAN_IP=$(strip $(CONFIG_UBOOT_IPADDR))
-LAN_SERVERIP=$(strip $(subst ",, $(CONFIG_UBOOT_SERVERIP)))
+UBOOT_CONFIG=$(call qstrip,$(CONFIG_UBOOT_TARGET))
+LAN_IP=$(call qstrip,$(CONFIG_UBOOT_IPADDR))
+LAN_SERVERIP=$(call qstrip,$(CONFIG_UBOOT_SERVERIP))

 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIG)_config
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIG)_config


@@ -34,16 +34,18 @@ define Build/Compile
        $(CP) ./ubclient/* $(PKG_BUILD_DIR)/ubclient
        export LAN_IP=$(LAN_IP); \
        export LAN_SERVERIP=$(LAN_SERVERIP); \
        $(CP) ./ubclient/* $(PKG_BUILD_DIR)/ubclient
        export LAN_IP=$(LAN_IP); \
        export LAN_SERVERIP=$(LAN_SERVERIP); \

-       $(MAKE) -C $(PKG_BUILD_DIR)/ubclient \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS) -Dtarget_$(BOARD)=1"
+       #$(MAKE) -C $(PKG_BUILD_DIR)/ubclient \
+       #       $(TARGET_CONFIGURE_OPTS) \
+       #       CFLAGS="$(TARGET_CFLAGS) -Dtarget_$(BOARD)=1"

 endef
 
 define Build/InstallDev
        dd if=$(PKG_BUILD_DIR)/u-boot.bin of=$(PKG_BUILD_DIR)/u-boot.block bs=232k count=1 conv=sync
 #      $(INSTALL_DIR) $(STAGING_DIR)/ubclient/sbin
 #      $(INSTALL_BIN) $(PKG_BUILD_DIR)/ubclient/ubpar $(STAGING_DIR)/ubclient/sbin/
 endef
 
 define Build/InstallDev
        dd if=$(PKG_BUILD_DIR)/u-boot.bin of=$(PKG_BUILD_DIR)/u-boot.block bs=232k count=1 conv=sync
 #      $(INSTALL_DIR) $(STAGING_DIR)/ubclient/sbin
 #      $(INSTALL_BIN) $(PKG_BUILD_DIR)/ubclient/ubpar $(STAGING_DIR)/ubclient/sbin/

-       $(CP) $(PKG_BUILD_DIR)/ubclient/ubpar ../../base-files/sbin
+#      $(CP) $(PKG_BUILD_DIR)/ubclient/ubpar ../../base-files/sbin
+       mkdir -p $(BIN_DIR)/
+       cp $(PKG_BUILD_DIR)/u-boot.bin $(BIN_DIR)/u-boot.$(PKG_VERSION).bin

 endef
 
 $(eval $(call Build/DefaultTargets))
 endef
 
 $(eval $(call Build/DefaultTargets))