Buildsystem: update flashimage.mk for Apollo/Kronos

diff --git a/make/flashimage.mk b/make/flashimage.mk
index bc37f44fa6edab7f7b0015501faa6c9c10461fb1..6a0389593a41f7064bcf7b2391ee321577364883 100755 (executable)
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -2,9 +2,36 @@
 
 DATE := $(shell date +%Y-%m-%d)
 
+
 flash-customize: $(BASE_DIR)/customize/flash-customize.sh
        $(BASE_DIR)/customize/flash-customize.sh
 
+ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
+FLASHPARAMS   = -n
+ERASEBLOCK    = 0x20000
+FLASHSIZE     = 268435456
+FLASHIMG_BODY = rootfs.arm.jffs2.nand
+SUMIMG_BODY   = rootfs.arm.jffs2.nand
+
+ifeq ($(BOXMODEL), tank)
+ERASEBLOCK    = 0x40000
+FLASHIMG      = $(FLASHIMG_BODY).256k.img
+SUMIMG        = $(SUMIMG_BODY).256k.sum.img
+else
+FLASHIMG      = $(FLASHIMG_BODY).img
+SUMIMG        = $(SUMIMG_BODY).sum.img
+endif
+
+else # Nevis
+FLASHPARAMS   = -p
+ERASEBLOCK    = 0x20000
+FLASHSIZE     = 28835840
+FLASHIMG_BODY = nevis-system
+FLASHIMG      = $(FLASHIMG_BODY).img
+SUMIMG        = $(FLASHIMG_BODY).sum.img
+
+endif #($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
+
 flash-prepare:
        rm -fr $(BUILD_TMP)/install
        mkdir -p $(BUILD_TMP)/install
@@ -14,206 +41,42 @@ flash-prepare:
        rm -fr $(BUILD_TMP)/install/oldroot
        cp -a $(SCRIPTS)/linuxrc $(BUILD_TMP)/install
 
-ifeq ($(PLATFORM), nevis)
-
-ERASEBLOCK = 0x20000
-FLASHIMG = $(BUILD_TMP)/nevis-system-tmp.img
-SUMIMG   = $(BUILD_TMP)/nevis-system-$(DATE).sum.img
-
 flash: $(D)/mtd-utils
        echo "/dev/console c 0600 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable; \
-       mkfs.jffs2 -e $(ERASEBLOCK) -p -U -D $(BUILD_TMP)/devtable -d $(BUILD_TMP)/install -o $(FLASHIMG); \
-       sumtool -e $(ERASEBLOCK) -p -i $(FLASHIMG) -o $(SUMIMG); \
+       echo "/dev/null c 0666 0 0 1 3 0 0 0" >> $(BUILD_TMP)/devtable; \
+       mkfs.jffs2 -e $(ERASEBLOCK) $(FLASHPARAMS) -l -U -D $(BUILD_TMP)/devtable -d $(BUILD_TMP)/install -o $(BUILD_TMP)/$(FLASHIMG); \
+       sumtool    -e $(ERASEBLOCK) $(FLASHPARAMS) -l -i $(BUILD_TMP)/$(FLASHIMG) -o $(BUILD_TMP)/$(SUMIMG); \
        rm -f $(BUILD_TMP)/devtable;
-       rm -f $(FLASHIMG); \
-
-endif
-
-ifeq ($(PLATFORM), apollo)
-ERASEBLOCK    = 
-FLASHIMG_BODY = $(BUILD_TMP)/rootfs.arm.jffs2.nand
-SUMIMG_BODY   = $(BUILD_TMP)/rootfs.arm.jffs2.nand
-
-ifeq ($(BOXMODEL), tank)
-ERASEBLOCK  = 0x40000
-FLASHIMG   = $(FLASHIMG_BODY).256k.$(DATE).tmp.img
-SUMIMG     = $(SUMIMG_BODY).256k.$(DATE).img
-endif
-
-ifeq ($(BOXMODEL), trinity)
-ERASEBLOCK = 0x20000
-FLASHIMG   = $(FLASHIMG_BODY).$(DATE).tmp.img
-SUMIMG     = $(SUMIMG_BODY).$(DATE).img
-endif
-
-flash: $(D)/mtd-utils
-       rm -fr $(BUILD_TMP)/rootfs/oldroot; \
-       echo "/dev/console c 0600 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable; \
-       mkfs.jffs2 -n -e $(ERASEBLOCK) -l -U -D $(BUILD_TMP)/devtable -r $(BUILD_TMP)/rootfs -o $(FLASHIMG); \
-       sumtool -n -e $(ERASEBLOCK) -l -i $(FLASHIMG) -o $(SUMIMG); \
-       rm -f $(BUILD_TMP)/devtable; \
-       rm -f $(FLASHIMG); \
-       mkdir -p $(BUILD_TMP)/rootfs/oldroot
-
-endif # ($(PLATFORM), apollo)
-
-ifeq ($(PLATFORM), kronos)
-ERASEBLOCK    = 
-FLASHIMG_BODY = $(BUILD_TMP)/rootfs.arm.jffs2.nand
-SUMIMG_BODY   = $(BUILD_TMP)/rootfs.arm.jffs2.nand
-
-ERASEBLOCK = 0x20000
-FLASHIMG   = $(FLASHIMG_BODY).$(DATE).tmp.img
-SUMIMG     = $(SUMIMG_BODY).$(DATE).img
-
-
-flash: $(D)/mtd-utils
-       rm -fr $(BUILD_TMP)/rootfs/oldroot; \
-       echo "/dev/console c 0600 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable; \
-       mkfs.jffs2 -n -e $(ERASEBLOCK) -l -U -D $(BUILD_TMP)/devtable -r $(BUILD_TMP)/rootfs -o $(FLASHIMG); \
-       sumtool -n -e $(ERASEBLOCK) -l -i $(FLASHIMG) -o $(SUMIMG); \
-       rm -f $(BUILD_TMP)/devtable; \
-       rm -f $(FLASHIMG); \
-       mkdir -p $(BUILD_TMP)/rootfs/oldroot
-
-endif # ($(PLATFORM), kronos)
+       rm -f $(FLASHIMG);
 
 
 flash-check:
-       @if [ $(PLATFORM) = "apollo" ]; then \
-               make flash-check-apollo; \
-       elif [ $(PLATFORM) = "kronos" ]; then \
-               make flash-check-kronos; \
-       else \
-               make flash-check-nevis; \
-       fi
-
-flash-check-nevis:
-       @if [ "28835840" -gt "`stat -c %s $(BUILD_TMP)/nevis-system-$(DATE)*.img`" ]; then \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[32mNEVIS IMAGE SIZE: `stat -c %s $(BUILD_TMP)/nevis-system-$(DATE)*.img` BYTES >> OK (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
-       else \
+       @if [ "$(FLASHSIZE)" -gt "`stat -c %s $(BUILD_TMP)/$(FLASHIMG_BODY).sum.img`" ]; then \
                echo ""; \
                echo " ============================================================================== "; \
-               echo -e "    \033[31mNEVIS IMAGE SIZE: `stat -c %s $(BUILD_TMP)/nevis-system-$(DATE)*.sum.img` BYTES >> NOT OK !!! (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
-       fi
-
-flash-check-apollo:
-       @if [ "28835840" -gt "`stat -c %s $(BUILD_TMP)/apollo-system-$(DATE)*.img`" ]; then \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[32mAPOLLO IMAGE SIZE: `stat -c %s $(BUILD_TMP)/apollo-system-$(DATE)*.img` BYTES >> OK (MAX 28835840 BYTES)\033[0m"; \
+               echo -e "    \033[32mIMAGE SIZE: `stat -c %s $(BUILD_TMP)/$(FLASHIMG_BODY).sum.img` BYTES >> OK (MAX $(FLASHSIZE) BYTES)\033[0m"; \
                echo " ============================================================================== "; \
                echo ""; \
        else \
                echo ""; \
                echo " ============================================================================== "; \
-               echo -e "    \033[31mAPOLLO IMAGE SIZE: `stat -c %s $(BUILD_TMP)/apollo-system-$(DATE)*.img` BYTES >> NOT OK !!! (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
-       fi
-
-flash-check-kronos:
-       @if [ "28835840" -gt "`stat -c %s $(BUILD_TMP)/kronos-system-$(DATE)*.img`" ]; then \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[32mKRONOS IMAGE SIZE: `stat -c %s $(BUILD_TMP)/kronos-system-$(DATE)*.img` BYTES >> OK (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
-       else \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[31mKRONOS IMAGE SIZE: `stat -c %s $(BUILD_TMP)/kronos-system-$(DATE)*.img` BYTES >> NOT OK !!! (MAX 28835840 BYTES)\033[0m"; \
+               echo -e "    \033[31mIMAGE SIZE: `stat -c %s $(BUILD_TMP)/$(FLASHIMG_BODY).sum.img` BYTES >> NOT OK !!! (MAX $(FLASHSIZE) BYTES)\033[0m"; \
                echo " ============================================================================== "; \
                echo ""; \
        fi
 
 flash-full:
-       rm -fr $(BUILD_TMP)/rootfs/oldroot
-       if [ $(PLATFORM) = "apollo" ]; then \
-               cd $(BUILD_TMP)/rootfs && \
-               cp -f $(BUILD_TMP)/rootfs/sbin/devtable $(BUILD_TMP)/devtable && \
-               rm -f $(BUILD_TMP)/rootfs/sbin/devtable && \
-               cp -f $(BUILD_TMP)/apollo-kernel-compressed-??.??.????.ub.gz $(BUILD_TMP)/rootfs/var/update/uImage; \
-               $(HOSTPREFIX)/bin/mkfs.jffs2 -U -p -r $(BUILD_TMP)/rootfs -D $(BUILD_TMP)/devtable -e 128KiB -o $(BUILD_TMP)/apollo-full-$(DATE).img; \
-               cp -f $(BUILD_TMP)/devtable $(BUILD_TMP)/rootfs/sbin/devtable; \
-               rm -f $(BUILD_TMP)/devtable; \
-               rm -f $(BUILD_TMP)/rootfs/var/update/uImage; \
-       elif [ $(PLATFORM) = "kronos" ]; then \
-               cd $(BUILD_TMP)/rootfs && \
-               cp -f $(BUILD_TMP)/rootfs/sbin/devtable $(BUILD_TMP)/devtable && \
-               rm -f $(BUILD_TMP)/rootfs/sbin/devtable && \
-               cp -f $(BUILD_TMP)/kronos-kernel-compressed-??.??.????.ub.gz $(BUILD_TMP)/rootfs/var/update/uImage; \
-               $(HOSTPREFIX)/bin/mkfs.jffs2 -U -p -r $(BUILD_TMP)/rootfs -D $(BUILD_TMP)/devtable -e 128KiB -o $(BUILD_TMP)/kronos-full-$(DATE).img; \
-               cp -f $(BUILD_TMP)/devtable $(BUILD_TMP)/rootfs/sbin/devtable; \
-               rm -f $(BUILD_TMP)/devtable; \
-               rm -f $(BUILD_TMP)/rootfs/var/update/uImage; \
-       else \
-               cd $(BUILD_TMP)/rootfs && \
-               cp -f $(BUILD_TMP)/rootfs/sbin/devtable $(BUILD_TMP)/devtable && \
-               rm -f $(BUILD_TMP)/rootfs/sbin/devtable && \
-               cp -f $(BUILD_TMP)/nevis-kernel-compressed-??.??.????.img $(BUILD_TMP)/rootfs/var/update/uImage; \
-               $(HOSTPREFIX)/bin/mkfs.jffs2 -U -p -r $(BUILD_TMP)/rootfs -D $(BUILD_TMP)/devtable -e 128KiB -o $(BUILD_TMP)/nevis-full-$(DATE).img; \
-               cp -f $(BUILD_TMP)/devtable $(BUILD_TMP)/rootfs/sbin/devtable; \
-               rm -f $(BUILD_TMP)/devtable; \
-               rm -f $(BUILD_TMP)/rootfs/var/update/uImage; \
-       fi
-
-flash-full-check:
-       @if [ $(PLATFORM) = "apollo" ]; then \
-               make flash-full-check-apollo; \
-       elif [ $(PLATFORM) = "kronos" ]; then \
-               make flash-full-check-kronos; \
-       else \
-               make flash-full-check-nevis; \
+       echo "/dev/console c 0600 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable; \
+       echo "/dev/null c 0666 0 0 1 3 0 0 0" >> $(BUILD_TMP)/devtable; \
+       if [ -f $(BUILD_TMP)/zImage.img ]; then \
+               cp -a $(BUILD_TMP)/zImage.img $(BUILD_TMP)/install/var/update/zImage.img; \
        fi
-
-flash-full-check-nevis:
-       @if [ "28835840" -gt "`stat -c %s $(BUILD_TMP)/nevis-full*.img`" ]; then \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[32mNEVIS FULL IMAGE SIZE: `stat -c %s $(BUILD_TMP)/nevis-full*.img` BYTES >> OK (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
-       else \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[31mNEVIS FULL IMAGE SIZE: `stat -c %s $(BUILD_TMP)/nevis-full*.img` BYTES >> NOT OK !!! (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
+       if [ -f $(BUILD_TMP)/vmlinux.ub.gz ]; then \
+               cp -a $(BUILD_TMP)/vmlinux.ub.gz $(BUILD_TMP)/install/var/update/zImage.img; \
        fi
+       mkfs.jffs2 -e $(ERASEBLOCK) $(FLASHPARAMS) -l -U -D $(BUILD_TMP)/devtable -d $(BUILD_TMP)/install -o $(BUILD_TMP)/full-$(FLASHIMG); \
+       sumtool    -e $(ERASEBLOCK) $(FLASHPARAMS) -l -i $(BUILD_TMP)/full-$(FLASHIMG) -o $(BUILD_TMP)/full-$(SUMIMG); \
+       rm -f $(BUILD_TMP)/devtable;
+       rm -f full-$(FLASHIMG);
 
-flash-full-check-apollo:
-       @if [ "28835840" -gt "`stat -c %s $(BUILD_TMP)/apollo-full*.img`" ]; then \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[32mAPOLLO FULL IMAGE SIZE: `stat -c %s $(BUILD_TMP)/apollo-full*.img` BYTES >> OK (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
-       else \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[31mAPOLLO FULL IMAGE SIZE: `stat -c %s $(BUILD_TMP)/apollo-full*.img` BYTES >> NOT OK !!! (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
-       fi
 
-flash-full-check-kronos:
-       @if [ "28835840" -gt "`stat -c %s $(BUILD_TMP)/kronos-full*.img`" ]; then \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[32mKRONOS FULL IMAGE SIZE: `stat -c %s $(BUILD_TMP)/kronos-full*.img` BYTES >> OK (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
-       else \
-               echo ""; \
-               echo " ============================================================================== "; \
-               echo -e "    \033[31mKRONOS FULL IMAGE SIZE: `stat -c %s $(BUILD_TMP)/kronos-full*.img` BYTES >> NOT OK !!! (MAX 28835840 BYTES)\033[0m"; \
-               echo " ============================================================================== "; \
-               echo ""; \
-       fi