uboot-layerscape: switch to u-boot.mk

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

diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile
index 6cd35b8e8d3211e82f5cc5d456d3c684346ad0f0..f0ab72653458c0b450f45d0bf7d667e7c33e8c32 100644 (file)
--- a/package/boot/uboot-layerscape/Makefile
+++ b/package/boot/uboot-layerscape/Makefile
@@ -6,7 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=uboot-layerscape
 PKG_VERSION:=v1.0
@@ -17,89 +17,42 @@ PKG_MIRROR_HASH:=6aba7cb32d655dacb49bd188706bf1284159ae9b1fa69056df634b90070c376
 PKG_SOURCE_URL:=https://github.com/fsl-jyt/u-boot.git
 PKG_SOURCE_VERSION:=aefcbf4c2bb36e1f0ead61181e5fe1119b5683ad
 
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
-PKG_LICENSE_FILES:=Licenses/README
-
+include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
 
-define uboot/Default
-       TITLE:=
-       CONFIG:=
-       IMAGE:=
+define U-Boot/Default
+  BUILD_TARGET:=layerscape
+  BUILD_SUBTARGET:=64b
+  BUILD_DEVICES:=$(1)
+  UBOOT_IMAGE:=u-boot-dtb.bin
+  HIDDEN:=y
 endef
 
-define uboot/ls1043ardb
-       TITLE:=U-Boot $(PKG_NAME)-$(PKG_VERSION) for NXP ls1043ardb 64b Dev Board
-       CONFIG=ls1043ardb
+define U-Boot/ls1043ardb
+  NAME:=NXP ls1043ardb 64b Dev Board
 endef
 
-define uboot/ls1046ardb
-       TITLE:=U-Boot $(PKG_NAME)-$(PKG_VERSION) for NXP ls1046ardb 64b Dev Board
-       CONFIG=ls1046ardb_qspi
+define U-Boot/ls1046ardb
+  NAME:=NXP ls1046ardb 64b Dev Board
+  UBOOT_CONFIG:=ls1046ardb_qspi
 endef
 
-define uboot/ls1012ardb
-       TITLE:=U-Boot $(PKG_NAME)-$(PKG_VERSION) for NXP ls1012ardb 64b Dev Board
-       CONFIG=ls1012ardb_qspi
-       IMAGE=u-boot-swap.bin
+define U-Boot/ls1012ardb
+  NAME:=NXP ls1012ardb 64b Dev Board
+  UBOOT_CONFIG:=ls1012ardb_qspi
+  UBOOT_IMAGE:=u-boot-swap.bin
 endef
 
-UBOOTS := \
+UBOOT_TARGETS := \
        ls1043ardb \
        ls1046ardb \
        ls1012ardb
 
-define Package/uboot/template
-define Package/uboot-layerscape-64b-$(1)
-       SECTION:=boot
-       CATEGORY:=Boot Loaders
-       DEPENDS:= @TARGET_layerscape_64b
-       TITLE:=$(2)
-       URL:=http://git.freescale.com/git/cgit.cgi/ppc/sdk/u-boot.git/snapshot
-       VARIANT:=$(1)
-       MAINTAINER:=Jiang Yutang <jiangyutang1978@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),u-boot-dtb.bin)
-endif
-
-define Build/Configure
-       +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-               $(UBOOT_CONFIG)_config
-endef
-
-define Build/Compile
-       +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-               CROSS_COMPILE=$(TARGET_CROSS) DTC=$(LINUX_DIR)/scripts/dtc/dtc
+define Build/InstallDev
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(KERNEL_BUILD_DIR)/$(BUILD_VARIANT)-64b-uboot.bin
 endef
 
-define Package/uboot/install/default
-       $(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(KDIR)/$(1)-64b-uboot.bin
+define Package/u-boot/install/default
 endef
 
-define Package/uboot/install/template
-define Package/uboot-layerscape-64b-$(1)/install
-       $(call Package/uboot/install/default,$(2))
-endef
-endef
-
-$(foreach u,$(UBOOTS), \
-       $(eval $(call Package/uboot/install/template,$(u),$(u))) \
-)
-
-$(foreach u,$(UBOOTS), \
-       $(eval $(call BuildUBootPackage,$(u))) \
-       $(eval $(call BuildPackage,uboot-layerscape-64b-$(u))) \
-)
+$(eval $(call BuildPackage/U-Boot))