build: remove cpio.gz and tar.gz from regular filesystem types

[openwrt/openwrt.git] / target / linux / zynq / image / Makefile

diff --git a/target/linux/zynq/image/Makefile b/target/linux/zynq/image/Makefile
index 2924a5d3ea0b10a12bc51a41cd4fb6f155d6eded..4c85bc283d9abb75c34fe3743f180b1311d6bfe4 100644 (file)
--- a/target/linux/zynq/image/Makefile
+++ b/target/linux/zynq/image/Makefile
@@ -22,9 +22,6 @@ define Image/boot-imgs
        $(call Image/BuildDTB,$(DTS_DIR)/$(DEVICE_DTS).dts,\
                $(BIN_DIR)/$(IMG_PREFIX)-system.dtb)
 
-       $(call Image/mkfs/cpiogz)
-       $(call Image/mkfs/targz)
-
        # Create uboot cpio.gz
        mkimage -A arm -T ramdisk -C gzip -n "$(PROFILE) OpenWRT rootfs" \
                -d $(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz \
@@ -32,13 +29,13 @@ define Image/boot-imgs
 
        # create FIT image with rootfs
        ./mkits.sh \
-               -D $(1) -o $(KDIR)/fit-$(1).its -k $(KDIR)/zImage \
+               -D $(DEVICE_LC) -o $(KDIR)/fit-$(DEVICE_LC).its -k $(KDIR)/zImage \
                -d $(BIN_DIR)/$(IMG_PREFIX)-system.dtb \
                -C none -a $(KERNEL_LOADADDR) -e $(KERNEL_ENTRY_POINT) \
                -A $(ARCH) -v $(LINUX_VERSION) \
                -r $(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz -z gzip
-       PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $(KDIR)/fit-$(1).its $(KDIR)/fit-$(1).itb
-       $(CP) $(KDIR)/fit-$(1).itb $(BIN_DIR)/$(IMG_PREFIX)-fit.itb
+       PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $(KDIR)/fit-$(DEVICE_LC).its $(KDIR)/fit-$(DEVICE_LC).itb
+       $(CP) $(KDIR)/fit-$(DEVICE_LC).itb $(BIN_DIR)/$(IMG_PREFIX)-fit.itb
        ln -fs $(IMG_PREFIX)-fit.itb $(BIN_DIR)/fit.itb
 
 endef
@@ -54,22 +51,31 @@ KERNEL_ENTRY_POINT=0x8000
 ### Device macros ###
 define Device/Default
        IMG_PREFIX := zynq
-       DEVICE_DTS :=
        PROFILE_SANITIZED :=
 endef
 
-DEVICE_VARS += DEVICE_DTS
+define Device/DefaultConfig
+       DEVICE_LC = $(1)
+       IMG_PREFIX = zynq-$(1)
+       DEVICE_DTS = zynq-$(1)
+endef
 
 ### ZC702 ###
 define Device/ZC702
-       DEVICE_DTS := zynq-zc702
+       $(call Device/DefaultConfig,zc702)
 endef
 
-Image/boot-imgs/ZC702=$(call Image/boot-imgs,zc702)
+define Device/ZED
+       $(call Device/DefaultConfig,zed)
+endef
+
+define Device/ZYBO
+       $(call Device/DefaultConfig,zybo)
+endef
 
 define Image/BuildKernel
        $(eval $(call Device/$(PROFILE)))
-       $(call Image/boot-imgs/$(PROFILE))
+       $(call Image/boot-imgs)
 endef
 
 $(eval $(call BuildImage))