[package] block-extroot: r20784 reverted r20735, add it back (#7104)

[openwrt.git] / package / uboot-lantiq / Makefile

diff --git a/package/uboot-lantiq/Makefile b/package/uboot-lantiq/Makefile
index 3ffe884..1864908 100644 (file)
--- a/package/uboot-lantiq/Makefile
+++ b/package/uboot-lantiq/Makefile
@@ -9,8 +9,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=u-boot
-PKG_VERSION:=2009.11.1
-PKG_MD5SUM:=6086421c9e2f3a0d0dbc5f706b551dbc
+
+PKG_VERSION:=2010.03
+PKG_MD5SUM:=2bf5ebf497dddc52440b1ea386cc1332
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -20,6 +21,10 @@ PKG_TARGETS:=bin
 
 include $(INCLUDE_DIR)/package.mk
 
+ifeq ($(DUMP),)
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep '^CONFIG_UBOOT_' $(TOPDIR)/.config | md5s)
+endif
+
 define Package/uboot-lantiq
   SECTION:=boot
   CATEGORY:=Boot Loaders
@@ -35,12 +40,18 @@ define Build/Prepare
        find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf
 endef
 
-UBOOT_CONFIG:=easy50712_DDR166M
+UBOOT_TARGET:=$(call qstrip,$(CONFIG_UBOOT_TARGET))
+UBOOT_RAMBOOT_DDR_CONFIG:=$(call qstrip,$(CONFIG_UBOOT_RAMBOOT_DDR_CONFIG))
+
 UBOOT_MAKE_OPTS:= \
        CROSS_COMPILE=$(TARGET_CROSS) \
        ENDIANNESS= \
        V=1
 
+define Package/uboot-lantiq/config
+       source "$(SOURCE)/Config.in"
+endef
+
 define Build/Configure/Target
        $(MAKE) -s -C $(PKG_BUILD_DIR) \
                $(UBOOT_MAKE_OPTS) \
@@ -49,8 +60,10 @@ define Build/Configure/Target
 endef
 
 define Build/Configure
-       $(call Build/Configure/Target,$(UBOOT_CONFIG))
-       $(call Build/Configure/Target,$(UBOOT_CONFIG)_ramboot)
+       $(call Build/Configure/Target,$(UBOOT_TARGET))
+ifeq ($(CONFIG_UBOOT_RAMBOOT),y)
+       $(call Build/Configure/Target,$(UBOOT_TARGET)_ramboot)
+endif
 endef
 
 define Build/Compile/Target
@@ -61,22 +74,26 @@ define Build/Compile/Target
 endef
 
 define Build/Compile
-       $(call Build/Compile/Target,$(UBOOT_CONFIG))
-       $(call Build/Compile/Target,$(UBOOT_CONFIG)_ramboot)
+       $(call Build/Compile/Target,$(UBOOT_TARGET))
+ifeq ($(CONFIG_UBOOT_RAMBOOT),y)
+       $(call Build/Compile/Target,$(UBOOT_TARGET)_ramboot)
+endif
 endef
 
 define Package/uboot-lantiq/install
-       mkdir -p $(1)/$(UBOOT_CONFIG)
+       mkdir -p $(1)/$(UBOOT_TARGET)
        dd \
-               if=$(PKG_BUILD_DIR)/$(UBOOT_CONFIG)/u-boot.bin \
-               of=$(1)/$(UBOOT_CONFIG)/u-boot.bin \
+               if=$(PKG_BUILD_DIR)/$(UBOOT_TARGET)/u-boot.bin \
+               of=$(1)/$(UBOOT_TARGET)/u-boot.bin \
                bs=64k conv=sync
-       if [ -e $(UBOOT_CONFIG).conf ]; then \
+ifeq ($(CONFIG_UBOOT_RAMBOOT),y)
+       if [ -e $(UBOOT_RAMBOOT_DDR_CONFIG) ]; then \
                perl ./gct \
-                       $(UBOOT_CONFIG).conf \
-                       $(PKG_BUILD_DIR)/$(UBOOT_CONFIG)_ramboot/u-boot.srec \
-                       $(1)/$(UBOOT_CONFIG)/u-boot.asc; \
+                       $(UBOOT_RAMBOOT_DDR_CONFIG) \
+                       $(PKG_BUILD_DIR)/$(UBOOT_TARGET)_ramboot/u-boot.srec \
+                       $(1)/$(UBOOT_TARGET)/u-boot.asc; \
        fi
+endif
 endef
 
 $(eval $(call BuildPackage,uboot-lantiq))