uboot-ar71xx: switch to using u-boot.mk

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2017-01-23 08:23:55 +01:00
parent b27241a1a1
commit 83783f296a
16 changed files with 19 additions and 82 deletions

View file

@ -6,90 +6,26 @@
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=u-boot
PKG_VERSION:=2010.03 PKG_VERSION:=2010.03
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_HASH:=902d1b2c15787df55186fae4033685fb0c5a5a12755a08383e97c4a3e255925b PKG_HASH:=902d1b2c15787df55186fae4033685fb0c5a5a12755a08383e97c4a3e255925b
PKG_SOURCE_URL:= \
http://mirror2.openwrt.org/sources \
ftp://ftp.denx.de/pub/u-boot
PKG_TARGETS:=bin
PKG_LICENSE:=GPL-2.0 GPL-2.0+
PKG_LICENSE_FILES:=Licenses/README
include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define uboot/Default define U-Boot/Default
TITLE:= BUILD_TARGET:=ar71xx
CONFIG:= BUILD_SUBTARGET:=generic
IMAGE:=
endef endef
define uboot/nbg460n_550n_550nh define U-Boot/nbg460n_550n_550nh
TITLE:=U-boot for the NBG460N/550N/550NH routers TITLE:=NBG460N/550N/550NH routers
DEFAULT:=y if (TARGET_ar71xx_generic_DEVICE_NBG_460N_550N_550NH || TARGET_DEVICE_ar71xx_generic_DEVICE_NBG_460N_550N_550NH || TARGET_ar71xx_generic_Default) BUILD_DEVICES:=NBG_460N_550N_550NH
HIDDEN:=y
endef endef
UBOOTS:=nbg460n_550n_550nh UBOOT_TARGETS:=nbg460n_550n_550nh
define Package/uboot/template $(eval $(call BuildPackage/U-Boot))
define Package/uboot-ar71xx-$(1)
SECTION:=boot
CATEGORY:=Boot Loaders
TITLE:=$(2)
DEPENDS:=@TARGET_ar71xx_generic
URL:=http://www.denx.de/wiki/U-Boot
VARIANT:=$(1)
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/Prepare
$(call Build/Prepare/Default)
$(CP) ./files/* $(PKG_BUILD_DIR)
find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf
endef
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/template
define Package/uboot-ar71xx-$(1)/install
$(INSTALL_DIR) $$(1)
$(CP) $(PKG_BUILD_DIR)/u-boot.bin $(BIN_DIR)/$(2)
endef
endef
$(foreach u,$(UBOOTS), \
$(eval $(call Package/uboot/install/template,$(u),openwrt-$(BOARD)-$(SUBTARGET)-$(u)-u-boot.bin)) \
)
$(foreach u,$(UBOOTS), \
$(eval $(call BuildUbootPackage,$(u))) \
$(eval $(call BuildPackage,uboot-ar71xx-$(u))) \
)

View file

@ -761,24 +761,24 @@ define Image/Build/NetgearNAND
$(call Image/Build/SysupgradeNAND,$(2),squashfs,$(KDIR_TMP)/vmlinux-$(2).uImage) $(call Image/Build/SysupgradeNAND,$(2),squashfs,$(KDIR_TMP)/vmlinux-$(2).uImage)
endef endef
ZYXEL_UBOOT = $(KDIR)/u-boot-nbg460n_550n_550nh.bin
ZYXEL_UBOOT_BIN = $(wildcard $(BIN_DIR)/u-boot-nbg460n_550n_550nh/u-boot.bin)
ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh Image/Build/ZyXEL/buildkernel=$(call MkuImageLzma,$(2),$(3))
Image/Build/ZyXEL/buildkernel=$(call MkuImageLzma,$(2),$(3))
define Image/Build/ZyXEL define Image/Build/ZyXEL
$(call Sysupgrade/KRuImage,$(1),$(2),917504,2752512) $(call Sysupgrade/KRuImage,$(1),$(2),917504,2752512)
if [ -e "$(call sysupname,$(1),$(2))" ]; then \ if [ -e "$(call sysupname,$(1),$(2))" ]; then \
if [ ! -f $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin ]; then \ if [ ! -f $(ZYXEL_UBOOT) ]; then \
echo "Warning: $(IMG_PREFIX)-$(2)-u-boot.bin not found" >&2; \ echo "Warning: $(ZYXEL_UBOOT) not found" >&2; \
else \ else \
$(STAGING_DIR_HOST)/bin/mkzynfw \ $(STAGING_DIR_HOST)/bin/mkzynfw \
-B $(4) \ -B $(4) \
-b $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin \ -b $(ZYXEL_UBOOT) \
-r $(call sysupname,$(1),$(2)):0x10000 \ -r $(call sysupname,$(1),$(2)):0x10000 \
-o $(call factoryname,$(1),$(2)); \ -o $(call factoryname,$(1),$(2)); \
fi; fi fi; fi
endef endef
endif
define Image/Build/ZyXELNAND/buildkernel define Image/Build/ZyXELNAND/buildkernel
$(eval kernelsize=$(call mtdpartsize,kernel,$(5))) $(eval kernelsize=$(call mtdpartsize,kernel,$(5)))
@ -1044,6 +1044,7 @@ define Image/Build/squashfs
endef endef
define Image/Prepare define Image/Prepare
$(if $(wildcard $(ZYXEL_UBOOT_BIN)),cp $(ZYXEL_UBOOT_BIN) $(ZYXEL_UBOOT))
$(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma) $(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(call CompressLzma,$(KDIR)/vmlinux-initramfs,$(KDIR)/vmlinux-initramfs.bin.lzma) $(call CompressLzma,$(KDIR)/vmlinux-initramfs,$(KDIR)/vmlinux-initramfs.bin.lzma)