bmips: image: rename SERCOMM_VERSION to SERCOMM_FSVER

SERCOMM_VERSION is ambiguous and it should be more clear that it refers to the
version used for the filesystem.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/bmips/image/Makefile b/target/linux/bmips/image/Makefile
index af2fd98d1fa0ff832e452b6eba2006e9b9c1deea..907779847d360b55513d5988610f1817771eeb6b 100644 (file)
--- a/target/linux/bmips/image/Makefile
+++ b/target/linux/bmips/image/Makefile
@@ -208,18 +208,18 @@ define Build/cfe-sercomm-part
                --output-file $@.kernel_rootfs \
                --part-name kernel_rootfs \
                --part-version OpenWrt \
-               --rootfs-version $(SERCOMM_VERSION)
+               --rootfs-version $(SERCOMM_FSVER)
 
        rm -rf $@-rootfs_lib
        mkdir -p $@-rootfs_lib
-       echo $(SERCOMM_VERSION) > $@-rootfs_lib/lib_ver
+       echo $(SERCOMM_FSVER) > $@-rootfs_lib/lib_ver
        $(call Build/cfe-jffs2,$@-rootfs_lib)
        $(call Build/pad-to,$(BLOCKSIZE))
        $(TOPDIR)/scripts/sercomm-partition-tag.py \
                --input-file $@ \
                --output-file $@.rootfs_lib \
                --part-name rootfs_lib \
-               --part-version $(SERCOMM_VERSION)
+               --part-version $(SERCOMM_FSVER)
 
        mv $@.kernel_rootfs $@
        dd if=$@.rootfs_lib >> $@

diff --git a/target/linux/bmips/image/bcm63xx_nand.mk b/target/linux/bmips/image/bcm63xx_nand.mk
index 01540625ed0595275ebebfa04f63167bb78229bb..b8be3016c9be185aac1b811232ef58d3a97c7ef5 100644 (file)
--- a/target/linux/bmips/image/bcm63xx_nand.mk
+++ b/target/linux/bmips/image/bcm63xx_nand.mk
@@ -5,7 +5,7 @@ DEVICE_VARS += CFE_RAM_FILE
 DEVICE_VARS += CFE_RAM_JFFS2_NAME CFE_RAM_JFFS2_PAD
 DEVICE_VARS += CFE_WFI_CHIP_ID CFE_WFI_FLASH_TYPE
 DEVICE_VARS += CFE_WFI_FLAGS CFE_WFI_VERSION
-DEVICE_VARS += SERCOMM_PID SERCOMM_VERSION
+DEVICE_VARS += SERCOMM_PID SERCOMM_FSVER
 
 # CFE expects a single JFFS2 partition with cferam and kernel. However,
 # it's possible to fool CFE into properly loading both cferam and kernel
@@ -42,7 +42,7 @@ define Device/sercomm-nand
   IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi |\
     cfe-sercomm-part | gzip | cfe-sercomm-load | cfe-sercomm-crypto
   SERCOM_PID :=
-  SERCOMM_VERSION :=
+  SERCOMM_FSVER :=
 endef
 
 define Device/comtrend_vr-3032u
@@ -124,7 +124,7 @@ define Device/sercomm_h500-s-lowi
     30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 \
     30 30 30 30 33 33 30 35 30 30 30 30 30 30 30 30 \
     0D 0A 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-  SERCOMM_VERSION := 1001
+  SERCOMM_FSVER := 1001
 endef
 TARGET_DEVICES += sercomm_h500-s-lowi
 
@@ -151,6 +151,6 @@ define Device/sercomm_h500-s-vfes
     30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 \
     30 30 30 30 33 34 31 37 30 30 30 30 30 30 30 30 \
     0D 0A 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-  SERCOMM_VERSION := 1001
+  SERCOMM_FSVER := 1001
 endef
 TARGET_DEVICES += sercomm_h500-s-vfes