Author: rmilecki Date: 2014-09-22 10:04:26 +0200 (Mon, 22 Sep 2014) New Revision: 42644
Modified: trunk/target/linux/bcm53xx/image/Makefile Log: bcm53xx: image: rework Makefile and merge some functions Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/bcm53xx/image/Makefile =================================================================== --- trunk/target/linux/bcm53xx/image/Makefile 2014-09-22 06:15:45 UTC (rev 42643) +++ trunk/target/linux/bcm53xx/image/Makefile 2014-09-22 08:04:26 UTC (rev 42644) @@ -13,16 +13,7 @@ $(call prepare_generic_squashfs,$(KDIR)/fs_mark) endef -define Image/Build/Initramfs - $(call Image/Build/Initramfs/Chk,bcm4708-netgear-r6250,U12H245T00_NETGEAR,2,initramfs) -endef - -define Image/Build/Initramfs/Chk - $(call Image/Build/Initramfs/DTB,$(1)) - $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(1)-$(4).chk -k $(KDIR)/$(IMG_PREFIX)-$(4)-$(1).trx -b $(2) -r $(3) -endef - -define Image/Build/Initramfs/DTB +define Image/Build/initramfs/DTB $(call Image/Build/DTB,zImage-initramfs,$(1)) $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/$(IMG_PREFIX)-initramfs-$(1).trx \ -f $(KDIR)/zImage-initramfs-$(1).lzma @@ -35,11 +26,6 @@ -a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(KDIR)/fs_mark endef -define Image/Build/squashfs/Chk - $(call Image/Build/squashfs/DTB,$(1)) - $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(1)-$(4).chk -k $(KDIR)/$(IMG_PREFIX)-$(4)-$(1).trx -b $(2) -r $(3) -endef - define Image/Build/DTB rm -f $(KDIR)/$(1)-$(2).lzma rm -f $(KDIR)/$(1)-$(2).dts @@ -47,10 +33,18 @@ $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/$(1)-$(2).dts $(KDIR)/$(1)-$(2).lzma -d16 endef +define Image/Build/Chk + $(call Image/Build/$(1)/DTB,$(2)) + $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(2)-$(1).chk -k $(KDIR)/$(IMG_PREFIX)-$(1)-$(2).trx -b $(3) -r $(4) +endef + +# $(1): filesystem type (e.g. squashfs, initramfs). define Image/Build - $(call Image/Build/$(1),$(1)) - $(call Image/Build/squashfs/Chk,bcm4708-netgear-r6250,U12H245T00_NETGEAR,2,squashfs) + $(call Image/Build/Chk,$(1),bcm4708-netgear-r6250,U12H245T00_NETGEAR,2) endef +define Image/Build/Initramfs + $(call Image/Build,initramfs) +endef $(eval $(call BuildImage)) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
