diff --git a/src/Makefile b/src/Makefile index 5bef230..39564f5 100755 --- a/src/Makefile +++ b/src/Makefile @@ -39,7 +39,51 @@ SVN_VER_NUM=122T4 SVN_VER_NUM=123 SVN_VER_NUM=124 SVN_VER_NUM=125 +SVN_VER_NUM=125T +SVN_VER_NUM=130R + +#1.修正之前版本FWD/FSSI等显示问题; +#2.已经支持网页升级FPGA功能; SVN_VER_NUM=131R +SVN_VER_NUM=132 + +#132R +#1.调整软件中AB反馈口的使用习惯和历史型号兼容; +#2.修正TSOIP参数开机加载问题; +#3.调整网页相关布局和显示内容(标题/频谱图/SNR/FSSI显示等内容); +SVN_VER_NUM=132R + +SVN_VER_NUM=132RT1 +SVN_VER_NUM=132RT2 + + +#133R +#1.修正升级或执行网页System Reset可能导致频谱无法正常恢复问题; +#2.恢复网页端的LIMD和UIMD的固定显示偏置; +#3.调整 FSSI Refresh 开启时,频谱图和眼图停止更新; +#4.修正login页面title未正确显示问题; +SVN_VER_NUM=133R + +#134R +#1.对RF IN A/B做了调整,适配最新版本260805的FPGA; +SVN_VER_NUM=134R + +#1.合并补充overview页面,支持登录后自动跳转到overview页面; +SVN_VER_NUM=135R + +#未正式发布,存在开机后SNR LIMD/UIMD不更新和显示问题 +SVN_VER_NUM=136R + +#加入偏置 切换频点降功率 +SVN_VER_NUM=136RT + +#加入偏置 切换频点不降功率 +SVN_VER_NUM=136RT2 + +#更新473-887 +SVN_VER_NUM=136RT3 + +SVN_VER_NUM=137R OUT_FS_DIR := $(PWD)/../out/rootfs UPGARDE_IMX_FS_DIR := SMOD @@ -76,29 +120,29 @@ all: # @cp logrotate_master/popt-1.7/oneshu_install/libpopt.so* ../out/upgrade_imx_fs/$(UPGARDE_IMX_FS_DIR)/src/lib/ # @cp logrotate_master/popt-1.7/oneshu_install/libpopt.so* ../out/rootfs/lib/ @echo "\n\n\t APP+WEB+9528+log+daemon intall ok\n\n" - + cp $(PWD)/anywave_exc_start.sh $(OUT_FS_DIR)/aw/ cp $(PWD)/anywave_exc_start.sh $(OUT_WEB_PKG_DIR)/aw/ cp $(PWD)/sh/load_to_cfg_file.sh $(OUT_FS_DIR)/aw/anywave/ cp $(PWD)/sh/load_to_cfg_file.sh $(OUT_WEB_PKG_DIR)/aw/anywave/ cp $(PWD)/sh/sync_to_bkp_file.sh $(OUT_FS_DIR)/aw/anywave/ cp $(PWD)/sh/sync_to_bkp_file.sh $(OUT_WEB_PKG_DIR)/aw/anywave/ - + @ echo -n "$(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)" > $(OUT_FS_DIR)/aw/release_version.ini @ echo -n "$(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)" > $(OUT_WEB_PKG_DIR)/aw/release_version.ini @ echo "\n\t $(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)\n" - + cp $(PWD)/web/upgrade_shell/* $(OUT_FS_DIR)/aw/anywave/upgrade_shell/ cp $(PWD)/web/upgrade_shell/* $(OUT_WEB_PKG_DIR)/aw/anywave/upgrade_shell/ cp $(PWD)/web/sh/* $(OUT_WEB_PKG_DIR)/aw/anywave/web/sh/ cp $(PWD)/web/sh/* $(OUT_FS_DIR)/aw/anywave/web/sh/ - - + + @rm -rf $(OUT_FS_DIR)/*.tar.bz2 @cd $(OUT_FS_DIR)/; tar cjf rootfs-console.tar.bz2 * @mv $(OUT_FS_DIR)/rootfs-console.tar.bz2 $(OUT_FS_DIR)/../ @echo "\n\n\t rootfs-console.tar.bz2 compress and mv ok\n\n" - + @rm -rf $(PWD)/../out/upgrade_imx_fs/*.tar.gz dos2unix $(PWD)/../out/upgrade_imx_fs/$(UPGARDE_IMX_FS_DIR)/*.sh @cd $(PWD)/../out/upgrade_imx_fs/; tar czf $(WEB_PKG_NAME) $(UPGARDE_IMX_FS_DIR) @@ -109,7 +153,7 @@ all: rm -rf ~/$(WEB_PKG_NAME) @echo "Done!" @echo "" - + all_key: @$(MAKE) -C atsc_app_new_key_lcd clean @$(MAKE) -C atsc_app_new_key_lcd install @@ -130,29 +174,29 @@ all_key: # @cp logrotate_master/popt-1.7/oneshu_install/libpopt.so* ../out/upgrade_imx_fs/$(UPGARDE_IMX_FS_DIR)/src/lib/ # @cp logrotate_master/popt-1.7/oneshu_install/libpopt.so* ../out/rootfs/lib/ @echo "\n\n\t APP+WEB+9528+log+daemon intall ok\n\n" - + cp $(PWD)/anywave_exc_start.sh $(OUT_FS_DIR)/aw/ cp $(PWD)/anywave_exc_start.sh $(OUT_WEB_PKG_DIR)/aw/ cp $(PWD)/sh/load_to_cfg_file.sh $(OUT_FS_DIR)/aw/anywave/ cp $(PWD)/sh/load_to_cfg_file.sh $(OUT_WEB_PKG_DIR)/aw/anywave/ cp $(PWD)/sh/sync_to_bkp_file.sh $(OUT_FS_DIR)/aw/anywave/ cp $(PWD)/sh/sync_to_bkp_file.sh $(OUT_WEB_PKG_DIR)/aw/anywave/ - + @ echo -n "$(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)" > $(OUT_FS_DIR)/aw/release_version.ini @ echo -n "$(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)" > $(OUT_WEB_PKG_DIR)/aw/release_version.ini @ echo "\n\t $(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)\n" - + cp $(PWD)/web/upgrade_shell/* $(OUT_FS_DIR)/aw/anywave/upgrade_shell/ cp $(PWD)/web/upgrade_shell/* $(OUT_WEB_PKG_DIR)/aw/anywave/upgrade_shell/ cp $(PWD)/web/sh/* $(OUT_WEB_PKG_DIR)/aw/anywave/web/sh/ cp $(PWD)/web/sh/* $(OUT_FS_DIR)/aw/anywave/web/sh/ - - + + @rm -rf $(OUT_FS_DIR)/*.tar.bz2 @cd $(OUT_FS_DIR)/; tar cjf rootfs-console.tar.bz2 * @mv $(OUT_FS_DIR)/rootfs-console.tar.bz2 $(OUT_FS_DIR)/../ @echo "\n\n\t rootfs-console.tar.bz2 compress and mv ok\n\n" - + @rm -rf $(PWD)/../out/upgrade_imx_fs/*.tar.gz dos2unix $(PWD)/../out/upgrade_imx_fs/$(UPGARDE_IMX_FS_DIR)/*.sh @cd $(PWD)/../out/upgrade_imx_fs/; tar czf $(WEB_PKG_NAME) $(UPGARDE_IMX_FS_DIR) @@ -163,7 +207,7 @@ all_key: rm -rf ~/$(WEB_PKG_NAME) @echo "Done!" @echo "" - + all_nlogo: @$(MAKE) -C atsc_app clean @$(MAKE) -C atsc_app all @@ -185,29 +229,29 @@ all_nlogo: @cp logrotate_master/popt-1.7/oneshu_install/libpopt.so* ../out/upgrade_imx_fs/$(UPGARDE_IMX_FS_DIR)/src/lib/ @cp logrotate_master/popt-1.7/oneshu_install/libpopt.so* ../out/rootfs/lib/ @echo "\n\n\t APP+WEB+9528+log+daemon intall ok\n\n" - + cp $(PWD)/anywave_exc_start.sh $(OUT_FS_DIR)/aw/ cp $(PWD)/anywave_exc_start.sh $(OUT_WEB_PKG_DIR)/aw/ cp $(PWD)/sh/load_to_cfg_file.sh $(OUT_FS_DIR)/aw/anywave/ cp $(PWD)/sh/load_to_cfg_file.sh $(OUT_WEB_PKG_DIR)/aw/anywave/ cp $(PWD)/sh/sync_to_bkp_file.sh $(OUT_FS_DIR)/aw/anywave/ cp $(PWD)/sh/sync_to_bkp_file.sh $(OUT_WEB_PKG_DIR)/aw/anywave/ - + @ echo -n "$(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)" > $(OUT_FS_DIR)/aw/release_version.ini @ echo -n "$(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)" > $(OUT_WEB_PKG_DIR)/aw/release_version.ini @ echo "\n\t $(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)\n" - + cp $(PWD)/web/upgrade_shell/* $(OUT_FS_DIR)/aw/anywave/upgrade_shell/ cp $(PWD)/web/upgrade_shell/* $(OUT_WEB_PKG_DIR)/aw/anywave/upgrade_shell/ cp $(PWD)/web/sh/* $(OUT_WEB_PKG_DIR)/aw/anywave/web/sh/ cp $(PWD)/web/sh/* $(OUT_FS_DIR)/aw/anywave/web/sh/ - - + + @rm -rf $(OUT_FS_DIR)/*.tar.bz2 @cd $(OUT_FS_DIR)/; tar cjf rootfs-console.tar.bz2 * @mv $(OUT_FS_DIR)/rootfs-console.tar.bz2 $(OUT_FS_DIR)/../ @echo "\n\n\t rootfs-console.tar.bz2 compress and mv ok\n\n" - + @rm -rf $(PWD)/../out/upgrade_imx_fs/*.tar.gz dos2unix $(PWD)/../out/upgrade_imx_fs/$(UPGARDE_IMX_FS_DIR)/*.sh @cd $(PWD)/../out/upgrade_imx_fs/; tar czf $(WEB_PKG_NAME_NL) $(UPGARDE_IMX_FS_DIR) @@ -216,7 +260,7 @@ all_nlogo: rm -rf ~/$(WEB_PKG_NAME_NL) @echo "Done!" @echo "" - + all_korea_logo: @$(MAKE) -C atsc_app install # @$(MAKE) -C cttb_app_38j82 install @@ -236,42 +280,42 @@ all_korea_logo: @cp logrotate_master/popt-1.7/oneshu_install/libpopt.so* ../out/upgrade_imx_fs/$(UPGARDE_IMX_FS_DIR)/src/lib/ @cp logrotate_master/popt-1.7/oneshu_install/libpopt.so* ../out/rootfs/lib/ @echo "\n\n\t APP+WEB+9528+log+daemon intall ok\n\n" - + cp $(PWD)/anywave_exc_start.sh $(OUT_FS_DIR)/aw/ cp $(PWD)/anywave_exc_start.sh $(OUT_WEB_PKG_DIR)/aw/ cp $(PWD)/sh/load_to_cfg_file.sh $(OUT_FS_DIR)/aw/anywave/ cp $(PWD)/sh/load_to_cfg_file.sh $(OUT_WEB_PKG_DIR)/aw/anywave/ cp $(PWD)/sh/sync_to_bkp_file.sh $(OUT_FS_DIR)/aw/anywave/ cp $(PWD)/sh/sync_to_bkp_file.sh $(OUT_WEB_PKG_DIR)/aw/anywave/ - + @ echo -n "$(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)" > $(OUT_FS_DIR)/aw/release_version.ini @ echo -n "$(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)" > $(OUT_WEB_PKG_DIR)/aw/release_version.ini @ echo "\n\t $(RELEAS_NUM)_$(RLS_DATETIME)_$(SVN_VER_NUM)\n" - + cp $(PWD)/web/upgrade_shell/* $(OUT_FS_DIR)/aw/anywave/upgrade_shell/ cp $(PWD)/web/upgrade_shell/* $(OUT_WEB_PKG_DIR)/aw/anywave/upgrade_shell/ cp $(PWD)/web/sh/* $(OUT_WEB_PKG_DIR)/aw/anywave/web/sh/ cp $(PWD)/web/sh/* $(OUT_FS_DIR)/aw/anywave/web/sh/ - - + + @rm -rf $(OUT_FS_DIR)/*.tar.bz2 @cd $(OUT_FS_DIR)/; tar cjf rootfs-console.tar.bz2 * @mv $(OUT_FS_DIR)/rootfs-console.tar.bz2 $(OUT_FS_DIR)/../ @echo "\n\n\t rootfs-console.tar.bz2 compress and mv ok\n\n" - + @rm -rf $(PWD)/../out/upgrade_imx_fs/*.tar.gz dos2unix $(PWD)/../out/upgrade_imx_fs/$(UPGARDE_IMX_FS_DIR)/*.sh @cd $(PWD)/../out/upgrade_imx_fs/; tar czf $(WEB_PKG_NAME_KOREA) $(UPGARDE_IMX_FS_DIR) @mv $(PWD)/../out/upgrade_imx_fs/$(WEB_PKG_NAME_KOREA) $(PWD)/../out/ @echo "\n\n\t $(WEB_PKG_NAME_KOREA) compress and mv ok\n\n" - rm -rf ~/$(WEB_PKG_NAME_KOREA) + rm -rf ~/$(WEB_PKG_NAME_KOREA) @echo "Done!" @echo "" - + dtb: @cp $(PWD)/../tools/linux-4.1.15/arch/arm/boot/dts/imx6ull-S-gpmi-1024x600c7.dtb $(PWD)/../out/ @echo "\n\n\t imx6ull-S-gpmi-1024x600c7.dtb mv ok\n\n" - + zImage: @cp $(PWD)/../tools/linux-4.1.15/arch/arm/boot/zImage $(PWD)/../out/ @echo "\n\n\t zImage mv ok\n\n" @@ -283,10 +327,10 @@ kernel_zImage: @echo "$(KERNEL_PATH) is existed\n\n" @$(MAKE) -C $(KERNEL_PATH) zImage -j4 else - @echo "$(KERNEL_PATH) is not exist , uncompress linux-4.1.15.tar.gz ...ing" + @echo "$(KERNEL_PATH) is not exist , uncompress linux-4.1.15.tar.gz ...ing" @cd $(PWD)/../tools/; tar -xzf linux-4.1.15.tar.gz @cp $(PWD)/../kernel/linux-4.1.15/config_emv6.3 $(KERNEL_PATH)/.config - @$(MAKE) -C $(KERNEL_PATH) zImage -j4 + @$(MAKE) -C $(KERNEL_PATH) zImage -j4 endif @@ -295,7 +339,7 @@ kernel_dtbs: @echo "$(KERNEL_PATH) " @$(MAKE) -C $(KERNEL_PATH) dtbs -j4 else - @echo "$(KERNEL_PATH) is not exist , uncompress linux-4.1.15.tar.gz ...ing" + @echo "$(KERNEL_PATH) is not exist , uncompress linux-4.1.15.tar.gz ...ing" @cd $(PWD)/../tools/; tar -xzf linux-4.1.15.tar.gz @cp $(PWD)/../kernel/linux-4.1.15/config_emv6.3 $(KERNEL_PATH)/.config @$(MAKE) -C $(KERNEL_PATH) zImage -j4