summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/image-legacy.mk10
-rw-r--r--target/linux/kirkwood/image/Makefile6
2 files changed, 5 insertions, 11 deletions
diff --git a/include/image-legacy.mk b/include/image-legacy.mk
index 1b8a911..da8279c 100644
--- a/include/image-legacy.mk
+++ b/include/image-legacy.mk
@@ -3,10 +3,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
$(CP) ./ubinize$(1).cfg $(KDIR)
( cd $(KDIR); \
$(STAGING_DIR_HOST)/bin/ubinize \
- $(if $($(PROFILE)_UBI_OPTS), \
- $(shell echo $($(PROFILE)_UBI_OPTS)), \
- $(shell echo $(UBI_OPTS)) \
- ) \
+ $(if $($(PROFILE)_UBI_OPTS),$($(PROFILE)_UBI_OPTS),$(shell echo $(UBI_OPTS))) \
-o $(KDIR)/root$(1).ubi \
ubinize$(1).cfg \
)
@@ -16,10 +13,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
$(if $($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),
$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
- $(if $($(PROFILE)_UBIFS_OPTS), \
- $(shell echo $($(PROFILE)_UBIFS_OPTS)), \
- $(shell echo $(UBIFS_OPTS)) \
- ) \
+ $(if $($(PROFILE)_UBIFS_OPTS),$($(PROFILE)_UBIFS_OPTS),$(UBIFS_OPTS)) \
$(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \
$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \
$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 20c697e..217ec23 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -14,7 +14,7 @@ DEVICE_VARS += KERNEL_SIZE
KERNEL_LOADADDR:=0x8000
TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome
-UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+UBI_OPTS := -m 2048 -p 128KiB -s 512
UBIFS_OPTS := -m 2048 -e 126KiB -c 4096
define Device/Default
@@ -141,8 +141,8 @@ define Image/Build/ubi
endif
endef
-IOMEGA_IX2_200_UBIFS_OPTS:="-m 512 -e 15872 -c 2048"
-IOMEGA_IX2_200_UBI_OPTS:="-m 512 -p 16384 -s 256"
+IOMEGA_IX2_200_UBIFS_OPTS := -m 512 -e 15872 -c 2048
+IOMEGA_IX2_200_UBI_OPTS := -m 512 -p 16384 -s 256
Image/BuildKernel/Template/Generic=$(call Image/BuildKernel/Template)
Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0)