From: Felix Fietkau <nbd@nbd.name>
Date: Tue, 24 Jan 2017 14:53:28 +0000 (+0100)
Subject: uboot-zynq: switch to u-boot.mk
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=317bd88973e8c4868967190f6a12abed0d4cc1c3;p=openwrt%2Fstaging%2Fneocturne.git

uboot-zynq: switch to u-boot.mk

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/boot/uboot-zynq/Makefile b/package/boot/uboot-zynq/Makefile
index 61bb99dda2..d25ecfb4bb 100644
--- a/package/boot/uboot-zynq/Makefile
+++ b/package/boot/uboot-zynq/Makefile
@@ -6,121 +6,40 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
 
-PKG_NAME:=u-boot
 PKG_VERSION:=2016.03
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= \
-	http://mirror2.openwrt.org/sources \
-	ftp://ftp.denx.de/pub/u-boot
 
 PKG_HASH:=e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
-PKG_LICENSE_FILES:=Licenses/README
-
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
 
-define uboot/Default
-	TITLE:=
-	CONFIG:=
-	IMAGE:=
+define U-Boot/Default
+  BUILD_TARGET:=zynq
+  UBOOT_IMAGE:=u-boot u-boot-dtb.bin u-boot.dtb u-boot-dtb.img spl/boot.bin spl/u-boot-spl spl/u-boot-spl-dtb.bin
+  UBOOT_CONFIG:=zynq_$(1)
 endef
 
-define uboot/zc702
-	TITLE:=U-Boot $(PKG_VERSION) for Xilinx ZC702 Dev Board
+define U-Boot/zc702
+  NAME:=Xilinx ZC702 Dev Board
 endef
 
-define uboot/zc706
-	TITLE:=U-Boot $(PKG_VERSION) for Xilinx ZC706 Dev Board
+define U-Boot/zc706
+  NAME:=Xilinx ZC706 Dev Board
 endef
 
-define uboot/zed
-	TITLE:=U-Boot $(PKG_VERSION) for Avnet Digilent ZedBoard Dev Board
+define U-Boot/zed
+  NAME:=Avnet Digilent ZedBoard Dev Board
 endef
 
-define uboot/zybo
-	TITLE:=U-Boot $(PKG_VERSION) for Digilent Zybo Dev Board
+define U-Boot/zybo
+  NAME:=Digilent Zybo Dev Board
 endef
 
-UBOOTS := \
+UBOOT_TARGETS := \
 	zc702 \
 	zed \
-	zybo \
-
-define Package/uboot/template
-define Package/uboot-zynq-$(1)
-	SECTION:=boot
-	CATEGORY:=Boot Loaders
-	DEPENDS:=@TARGET_zynq
-	TITLE:=$(2)
-	URL:=http://www.denx.de/wiki/U-Boot
-	VARIANT:=$(1)
-	MAINTAINER:=Jason Wu <jason.wu.misc@gmail.com>
-endef
-endef
-
-define BuildUBootPackage
-	$(eval $(uboot/Default))
-	$(eval $(uboot/$(1)))
-	$(call Package/uboot/template,$(1),$(TITLE))
-endef
-
-ifdef BUILD_VARIANT
-$(eval $(call uboot/$(BUILD_VARIANT)))
-UBOOT_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
-UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),openwrt-$(BOARD)-$(BUILD_VARIANT)-u-boot.bin)
-endif
-
-define Build/Configure
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		$(BOARD)_$(UBOOT_CONFIG)_config
-endef
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		CROSS_COMPILE=$(TARGET_CROSS) DTC=$(LINUX_DIR)/scripts/dtc/dtc
-endef
-
-define Package/uboot/install/default
-	$(INSTALL_DIR) $(BIN_DIR)/uboot-$(BOARD)-$(1)
-
-	$(CP) $(PKG_BUILD_DIR)/u-boot \
-		$(BIN_DIR)/uboot-$(BOARD)-$(1)/u-boot.elf
-
-	$(CP) $(PKG_BUILD_DIR)/u-boot-dtb.bin \
-		$(BIN_DIR)/uboot-$(BOARD)-$(1)/u-boot-dtb.bin
-
-	$(CP) $(PKG_BUILD_DIR)/u-boot.dtb \
-		$(BIN_DIR)/uboot-$(BOARD)-$(1)/u-boot.dtb
-
-	$(CP) $(PKG_BUILD_DIR)/u-boot-dtb.img \
-		$(BIN_DIR)/uboot-$(BOARD)-$(1)/u-boot-dtb.img
-
-	$(CP) $(PKG_BUILD_DIR)/spl/boot.bin \
-		$(BIN_DIR)/uboot-$(BOARD)-$(1)/boot.bin
-
-	$(CP) $(PKG_BUILD_DIR)/spl/u-boot-spl \
-		$(BIN_DIR)/uboot-$(BOARD)-$(1)/u-boot-spl
-
-	$(CP) $(PKG_BUILD_DIR)/spl/u-boot-spl-dtb.bin \
-		$(BIN_DIR)/uboot-$(BOARD)-$(1)/u-boot-spl-dtb.bin
-endef
-
-define Package/uboot/install/template
-define Package/uboot-zynq-$(1)/install
-	$(call Package/uboot/install/default,$(2))
-endef
-endef
-
-$(foreach u,$(UBOOTS), \
-	$(eval $(call Package/uboot/install/template,$(u),$(u))) \
-)
+	zybo
 
-$(foreach u,$(UBOOTS), \
-	$(eval $(call BuildUBootPackage,$(u))) \
-	$(eval $(call BuildPackage,uboot-zynq-$(u))) \
-)
+$(eval $(call BuildPackage/U-Boot))