X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fboot%2Fuboot-omap%2FMakefile;h=17a4af42f2d9246fd4ea3ccf7f97dffa511aaa14;hb=f432114bba1f5ebc6fb05f2a0925280f640e05ec;hp=48488101c2c1e5d3bd3e09525662ab94482e40cc;hpb=3b2c74e5db85f363273b3cec39e03b66ccb5aa4e;p=openwrt%2Fstaging%2Flynxis%2Fomap.git

diff --git a/package/boot/uboot-omap/Makefile b/package/boot/uboot-omap/Makefile
index 48488101c2..17a4af42f2 100644
--- a/package/boot/uboot-omap/Makefile
+++ b/package/boot/uboot-omap/Makefile
@@ -6,95 +6,45 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
-PKG_NAME:=u-boot
-PKG_VERSION:=2013.10
+PKG_VERSION:=2017.01
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= \
-	http://mirror2.openwrt.org/sources \
-	ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=a076a044b64371edc52f7e562b13f6b2
-PKG_TARGETS:=bin
+PKG_HASH:=6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2
 
+include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
 
-define uboot/Default
-  TITLE:=
-  CONFIG:=
-  IMAGE:=
+define U-Boot/Default
+  BUILD_TARGET:=omap
+  UBOOT_IMAGE:=u-boot.img MLO
 endef
 
-define uboot/omap4_panda
-  TITLE:=U-Boot for the Pandaboard
+define U-Boot/omap4_panda
+  NAME:=Pandaboard
+  BUILD_DEVICES:=omap4-panda
 endef
 
-define uboot/am335x_evm
-  TITLE:=U-Boot for the AM335x EVM
+define U-Boot/am335x_evm
+  NAME:=AM335x EVM
+  BUILD_DEVICES:=am335x-evm
 endef
 
-define uboot/omap3_overo
-  TITLE:=U-Boot for the Gumstix Overo
+define U-Boot/omap3_overo
+  NAME:=Gumstix Overo
 endef
 
-define uboot/omap3_beagle
-  TITLE:=U-Boot for the BeagleBoard
+define U-Boot/omap3_beagle
+  NAME:=BeagleBoard
+  BUILD_DEVICES:=omap3-beagle
 endef
 
-UBOOTS:=omap4_panda am335x_evm omap3_overo omap3_beagle
+UBOOT_TARGETS:=omap4_panda am335x_evm omap3_overo omap3_beagle
 
-define Package/uboot/template
-define Package/uboot-omap-$(1)
-  SECTION:=boot
-  CATEGORY:=Boot Loaders
-  DEPENDS:=@TARGET_omap
-  TITLE:=$(2)
-  URL:=http://www.denx.de/wiki/U-Boot
-  VARIANT:=$(1)
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)
+	$(CP) $(patsubst %,$(PKG_BUILD_DIR)/%,$(UBOOT_IMAGE)) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)/
 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.img)
-endif
-
-define Build/Configure
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(UBOOT_CONFIG)_config
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CROSS_COMPILE=$(TARGET_CROSS)
-endef
-
-define Package/uboot/install/default
-	$(INSTALL_DIR) $(BIN_DIR)/uboot-$(BOARD)-$(1)
-	$(CP) $(PKG_BUILD_DIR)/u-boot.img $(BIN_DIR)/uboot-$(BOARD)-$(1)/u-boot.img
-	$(CP) $(PKG_BUILD_DIR)/MLO $(BIN_DIR)/uboot-$(BOARD)-$(1)/MLO
-endef
-
-define Package/uboot/install/template
-define Package/uboot-omap-$(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-omap-$(u))) \
-)
+$(eval $(call BuildPackage/U-Boot))