From 1179d4f924dc61d5dd2425de932832a80e8c7f26 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 2 Jul 2014 16:37:23 +0000 Subject: [PATCH] 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 SVN-Revision: 41474 --- target/linux/lantiq/image/Makefile | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index 7d95061b54..768b227e62 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -12,6 +12,7 @@ include $(TOPDIR)/rules.mk 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 @@ define Image/Build/squashfs $(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 @@ ifneq ($($(PROFILE)_UBI_OPTS),) 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 @@ ifeq ($(CONFIG_TARGET_lantiq_xway),y) # 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)