From 15d0e98371b311b3d513c41dfda2514f21a7e52a Mon Sep 17 00:00:00 2001 From: HuangXin Date: Tue, 28 Aug 2018 15:26:43 +0800 Subject: [PATCH] 1: Uboot add ota_setup evn. 2: libconfig upgrade --- .../board/sunxi/common/netease_ota.c | 2 +- package/libs/libconfig/Makefile | 15 +++++++++++---- target/allwinner/mandolin-pv1/configs/env-4.9.cfg | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lichee/brandy/u-boot-2014.07/board/sunxi/common/netease_ota.c b/lichee/brandy/u-boot-2014.07/board/sunxi/common/netease_ota.c index 667baf143..6a91b5ae8 100644 --- a/lichee/brandy/u-boot-2014.07/board/sunxi/common/netease_ota.c +++ b/lichee/brandy/u-boot-2014.07/board/sunxi/common/netease_ota.c @@ -205,7 +205,7 @@ static int ota_read_params(POTA_PARAMS pInfo) memcpy(pInfo, (unsigned char*)READ_OTA_PARAMS_ADDR, sizeof(OTA_PARAMS)); - if(strncmp(pInfo->tags, OTA_PARAMS_TAG, 7) == 0) + if(strncmp(pInfo->tags, OTA_PARAMS_TAG, 8) == 0) { ota_print_params(pInfo); diff --git a/package/libs/libconfig/Makefile b/package/libs/libconfig/Makefile index d2924dcb5..695fa7bc4 100644 --- a/package/libs/libconfig/Makefile +++ b/package/libs/libconfig/Makefile @@ -8,13 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libconfig -PKG_VERSION:=1.4.9 +PKG_VERSION:=1.7.2 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.hyperrealm.com/libconfig -PKG_MD5SUM:=b6ee0ce2b3ef844bad7cac2803a90634 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL=https://github.com/hyperrealm/libconfig.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=9716f6224cdbc9f8bf3c8d3759a9fb3f864155df +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +#PKG_SOURCE_URL:=http://www.hyperrealm.com/libconfig +#PKG_MD5SUM:=b6ee0ce2b3ef844bad7cac2803a90634 + +PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/target/allwinner/mandolin-pv1/configs/env-4.9.cfg b/target/allwinner/mandolin-pv1/configs/env-4.9.cfg index b697e5f35..29ddb59ef 100755 --- a/target/allwinner/mandolin-pv1/configs/env-4.9.cfg +++ b/target/allwinner/mandolin-pv1/configs/env-4.9.cfg @@ -24,7 +24,7 @@ setargs_mmc=setenv bootargs console=${console} root=${mmc_root} rootwait init=${ #boot.img/raw same as sunxi-dev boot_normal=sunxi_flash read 40007800 ${boot_partition};boota 40007800 ${boot_partition} boot_recovery=sunxi_flash read 43800000 recovery;boota 43800000 recovery - +ota_setup=ota_setup boot_fastboot=fastboot #recovery key recovery_key_value_max=0x13