From 83783f296a18e6e481f23b2019575e45c437db4e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 23 Jan 2017 08:23:55 +0100 Subject: [PATCH] uboot-ar71xx: switch to using u-boot.mk Signed-off-by: Felix Fietkau --- package/boot/uboot-ar71xx/Makefile | 84 +++---------------- .../board/zyxel/nbg460n/Makefile | 0 .../board/zyxel/nbg460n/config.mk | 0 .../board/zyxel/nbg460n/lowlevel_init.S | 0 .../board/zyxel/nbg460n/nbg460n.c | 0 .../board/zyxel/nbg460n/u-boot.lds | 0 .../{files => src}/cpu/mips/ar71xx_serial.c | 0 .../{files => src}/drivers/net/ag71xx.c | 0 .../{files => src}/drivers/net/ag71xx.h | 0 .../{files => src}/drivers/net/phy/rtl8366.h | 0 .../drivers/net/phy/rtl8366_mii.c | 0 .../{files => src}/drivers/spi/ar71xx_spi.c | 0 .../{files => src}/include/asm-mips/ar71xx.h | 0 .../include/asm-mips/ar71xx_gpio.h | 0 .../{files => src}/include/configs/nbg460n.h | 0 target/linux/ar71xx/image/legacy.mk | 17 ++-- 16 files changed, 19 insertions(+), 82 deletions(-) rename package/boot/uboot-ar71xx/{files => src}/board/zyxel/nbg460n/Makefile (100%) rename package/boot/uboot-ar71xx/{files => src}/board/zyxel/nbg460n/config.mk (100%) rename package/boot/uboot-ar71xx/{files => src}/board/zyxel/nbg460n/lowlevel_init.S (100%) rename package/boot/uboot-ar71xx/{files => src}/board/zyxel/nbg460n/nbg460n.c (100%) rename package/boot/uboot-ar71xx/{files => src}/board/zyxel/nbg460n/u-boot.lds (100%) rename package/boot/uboot-ar71xx/{files => src}/cpu/mips/ar71xx_serial.c (100%) rename package/boot/uboot-ar71xx/{files => src}/drivers/net/ag71xx.c (100%) rename package/boot/uboot-ar71xx/{files => src}/drivers/net/ag71xx.h (100%) rename package/boot/uboot-ar71xx/{files => src}/drivers/net/phy/rtl8366.h (100%) rename package/boot/uboot-ar71xx/{files => src}/drivers/net/phy/rtl8366_mii.c (100%) rename package/boot/uboot-ar71xx/{files => src}/drivers/spi/ar71xx_spi.c (100%) rename package/boot/uboot-ar71xx/{files => src}/include/asm-mips/ar71xx.h (100%) rename package/boot/uboot-ar71xx/{files => src}/include/asm-mips/ar71xx_gpio.h (100%) rename package/boot/uboot-ar71xx/{files => src}/include/configs/nbg460n.h (100%) diff --git a/package/boot/uboot-ar71xx/Makefile b/package/boot/uboot-ar71xx/Makefile index 70f96713e6..e0bc39fe94 100644 --- a/package/boot/uboot-ar71xx/Makefile +++ b/package/boot/uboot-ar71xx/Makefile @@ -6,90 +6,26 @@ # include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk -PKG_NAME:=u-boot PKG_VERSION:=2010.03 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_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 -define uboot/Default - TITLE:= - CONFIG:= - IMAGE:= -endef - -define uboot/nbg460n_550n_550nh - TITLE:=U-boot for the 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) -endef - -UBOOTS:=nbg460n_550n_550nh - -define Package/uboot/template -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)) +define U-Boot/Default + BUILD_TARGET:=ar71xx + BUILD_SUBTARGET:=generic 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 +define U-Boot/nbg460n_550n_550nh + TITLE:=NBG460N/550N/550NH routers + BUILD_DEVICES:=NBG_460N_550N_550NH + HIDDEN:=y endef -$(foreach u,$(UBOOTS), \ - $(eval $(call Package/uboot/install/template,$(u),openwrt-$(BOARD)-$(SUBTARGET)-$(u)-u-boot.bin)) \ -) +UBOOT_TARGETS:=nbg460n_550n_550nh -$(foreach u,$(UBOOTS), \ - $(eval $(call BuildUbootPackage,$(u))) \ - $(eval $(call BuildPackage,uboot-ar71xx-$(u))) \ -) +$(eval $(call BuildPackage/U-Boot)) diff --git a/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/Makefile b/package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/Makefile similarity index 100% rename from package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/Makefile rename to package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/Makefile diff --git a/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/config.mk b/package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/config.mk similarity index 100% rename from package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/config.mk rename to package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/config.mk diff --git a/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/lowlevel_init.S b/package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/lowlevel_init.S similarity index 100% rename from package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/lowlevel_init.S rename to package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/lowlevel_init.S diff --git a/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/nbg460n.c b/package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/nbg460n.c similarity index 100% rename from package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/nbg460n.c rename to package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/nbg460n.c diff --git a/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/u-boot.lds b/package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/u-boot.lds similarity index 100% rename from package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/u-boot.lds rename to package/boot/uboot-ar71xx/src/board/zyxel/nbg460n/u-boot.lds diff --git a/package/boot/uboot-ar71xx/files/cpu/mips/ar71xx_serial.c b/package/boot/uboot-ar71xx/src/cpu/mips/ar71xx_serial.c similarity index 100% rename from package/boot/uboot-ar71xx/files/cpu/mips/ar71xx_serial.c rename to package/boot/uboot-ar71xx/src/cpu/mips/ar71xx_serial.c diff --git a/package/boot/uboot-ar71xx/files/drivers/net/ag71xx.c b/package/boot/uboot-ar71xx/src/drivers/net/ag71xx.c similarity index 100% rename from package/boot/uboot-ar71xx/files/drivers/net/ag71xx.c rename to package/boot/uboot-ar71xx/src/drivers/net/ag71xx.c diff --git a/package/boot/uboot-ar71xx/files/drivers/net/ag71xx.h b/package/boot/uboot-ar71xx/src/drivers/net/ag71xx.h similarity index 100% rename from package/boot/uboot-ar71xx/files/drivers/net/ag71xx.h rename to package/boot/uboot-ar71xx/src/drivers/net/ag71xx.h diff --git a/package/boot/uboot-ar71xx/files/drivers/net/phy/rtl8366.h b/package/boot/uboot-ar71xx/src/drivers/net/phy/rtl8366.h similarity index 100% rename from package/boot/uboot-ar71xx/files/drivers/net/phy/rtl8366.h rename to package/boot/uboot-ar71xx/src/drivers/net/phy/rtl8366.h diff --git a/package/boot/uboot-ar71xx/files/drivers/net/phy/rtl8366_mii.c b/package/boot/uboot-ar71xx/src/drivers/net/phy/rtl8366_mii.c similarity index 100% rename from package/boot/uboot-ar71xx/files/drivers/net/phy/rtl8366_mii.c rename to package/boot/uboot-ar71xx/src/drivers/net/phy/rtl8366_mii.c diff --git a/package/boot/uboot-ar71xx/files/drivers/spi/ar71xx_spi.c b/package/boot/uboot-ar71xx/src/drivers/spi/ar71xx_spi.c similarity index 100% rename from package/boot/uboot-ar71xx/files/drivers/spi/ar71xx_spi.c rename to package/boot/uboot-ar71xx/src/drivers/spi/ar71xx_spi.c diff --git a/package/boot/uboot-ar71xx/files/include/asm-mips/ar71xx.h b/package/boot/uboot-ar71xx/src/include/asm-mips/ar71xx.h similarity index 100% rename from package/boot/uboot-ar71xx/files/include/asm-mips/ar71xx.h rename to package/boot/uboot-ar71xx/src/include/asm-mips/ar71xx.h diff --git a/package/boot/uboot-ar71xx/files/include/asm-mips/ar71xx_gpio.h b/package/boot/uboot-ar71xx/src/include/asm-mips/ar71xx_gpio.h similarity index 100% rename from package/boot/uboot-ar71xx/files/include/asm-mips/ar71xx_gpio.h rename to package/boot/uboot-ar71xx/src/include/asm-mips/ar71xx_gpio.h diff --git a/package/boot/uboot-ar71xx/files/include/configs/nbg460n.h b/package/boot/uboot-ar71xx/src/include/configs/nbg460n.h similarity index 100% rename from package/boot/uboot-ar71xx/files/include/configs/nbg460n.h rename to package/boot/uboot-ar71xx/src/include/configs/nbg460n.h diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk index f80b700be8..d2f05e993e 100644 --- a/target/linux/ar71xx/image/legacy.mk +++ b/target/linux/ar71xx/image/legacy.mk @@ -761,24 +761,24 @@ define Image/Build/NetgearNAND $(call Image/Build/SysupgradeNAND,$(2),squashfs,$(KDIR_TMP)/vmlinux-$(2).uImage) 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) if [ -e "$(call sysupname,$(1),$(2))" ]; then \ - if [ ! -f $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin ]; then \ - echo "Warning: $(IMG_PREFIX)-$(2)-u-boot.bin not found" >&2; \ + if [ ! -f $(ZYXEL_UBOOT) ]; then \ + echo "Warning: $(ZYXEL_UBOOT) not found" >&2; \ else \ $(STAGING_DIR_HOST)/bin/mkzynfw \ -B $(4) \ - -b $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin \ + -b $(ZYXEL_UBOOT) \ -r $(call sysupname,$(1),$(2)):0x10000 \ -o $(call factoryname,$(1),$(2)); \ fi; fi - endef -endif +endef define Image/Build/ZyXELNAND/buildkernel $(eval kernelsize=$(call mtdpartsize,kernel,$(5))) @@ -1044,6 +1044,7 @@ define Image/Build/squashfs endef define Image/Prepare + $(if $(wildcard $(ZYXEL_UBOOT_BIN)),cp $(ZYXEL_UBOOT_BIN) $(ZYXEL_UBOOT)) $(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) $(call CompressLzma,$(KDIR)/vmlinux-initramfs,$(KDIR)/vmlinux-initramfs.bin.lzma) -- 2.25.1