Author: blogic Date: 2014-07-02 18:37:23 +0200 (Wed, 02 Jul 2014) New Revision: 41474
Modified: trunk/target/linux/lantiq/image/Makefile Log: lantiq: UbinizeImage instead of lantiq-specific ubinize.cfg files New make target in lantiq to use UbinizeImage and SysupgradeNand. Only enabled for BTHOMEHUBV2B for the moment but should be useable for other lantiq nand boards. Signed-off-by: Ben Mulvihill <[email protected]> Modified: trunk/target/linux/lantiq/image/Makefile =================================================================== --- trunk/target/linux/lantiq/image/Makefile 2014-07-02 16:33:20 UTC (rev 41473) +++ trunk/target/linux/lantiq/image/Makefile 2014-07-02 16:37:23 UTC (rev 41474) @@ -12,6 +12,7 @@ include $(INCLUDE_DIR)/image.mk JFFS2_BLOCKSIZE = 64k 128k 256k +KDIR_TMP:=$(KDIR)/tmp LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) @@ -82,6 +83,15 @@ $(if $(3),$(call MkBrnImage,$(3),$(4),$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(3)-brnImage,$(2),$(1),$(5))) endef +define Image/BuildNAND/squashfs + +ifneq ($($(PROFILE)_UBI_OPTS),) + $(call prepare_generic_squashfs,$(KDIR)/root.$(1)) + $(call Image/Build/UbinizeImage,$(PROFILE),,squashfs,$($(PROFILE)_UBI_OPTS)) + $(call Image/Build/SysupgradeNAND,$(PROFILE),$(1),$(KDIR)/uImage-$(PROFILE)) +endif +endef + DGN3500_SKERNEL=0x50000 DGN3500_SKERNEL_DECIMAL=327680 define Image/BuildDGN3500/squashfs @@ -185,6 +195,18 @@ endif endef + +define Image/BuildNAND/ubifs + +ifneq ($($(PROFILE)_UBIFS_OPTS),) +ifneq ($($(PROFILE)_UBI_OPTS),) + $(call Image/Build/UbinizeImage,$(PROFILE),,ubifs,$($(PROFILE)_UBI_OPTS)) + $(call Image/Build/SysupgradeNAND,$(PROFILE),$(1),$(KDIR)/uImage-$(PROFILE)) +endif +endif +endef + + define Image/InstallKernel/Template ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),) @@ -293,7 +315,7 @@ # Danube Image/BuildKernel/Profile/BTHOMEHUBV2B=$(call Image/BuildKernel/Template,BTHOMEHUBV2B) -Image/Build/Profile/BTHOMEHUBV2B=$(call Image/Build/$(1),$(1),BTHOMEHUBV2B) +Image/Build/Profile/BTHOMEHUBV2B=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV2B) Image/BuildKernel/Profile/EASY50712=$(call Image/BuildKernel/Template,EASY50712) Image/Build/Profile/EASY50712=$(call Image/Build/$(1),$(1),EASY50712) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
