From e726b1cdf7b574653ed823fe93c1a72f16c954eb Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 26 Dec 2017 00:36:06 +0100 Subject: [PATCH] update: fix some defines for ARM_HARDWARE Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d09f93645f06503d080d077eb4b3ebdbabc8a440 Author: vanhofen Date: 2017-12-26 (Tue, 26 Dec 2017) Origin message was: ------------------ - update: fix some defines for ARM_HARDWARE ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/update.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 00dbfbd09..0bff2f8dc 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -90,14 +90,22 @@ extern int allow_flash; #define gUserAgent "neutrino/softupdater 1.0" #define LIST_OF_UPDATES_LOCAL_FILENAME "update.list" -#define FILEBROWSER_UPDATE_FILTER "img" +// TODO: move this mess below to libstb-hal +#if HAVE_ARM_HARDWARE +#define FILEBROWSER_UPDATE_FILTER "tgz" +#define MTD_OF_WHOLE_IMAGE 999 +#define MTD_DEVICE_OF_UPDATE_PART "/dev/mtd999" +#else +#define FILEBROWSER_UPDATE_FILTER "img" #define MTD_OF_WHOLE_IMAGE 0 #ifdef BOXMODEL_CS_HD2 #define MTD_DEVICE_OF_UPDATE_PART "/dev/mtd0" #else #define MTD_DEVICE_OF_UPDATE_PART "/dev/mtd3" #endif +#endif + int pinghost (const std::string &hostname, std::string *ip = NULL); CFlashUpdate::CFlashUpdate() @@ -461,10 +469,6 @@ bool CFlashUpdate::checkVersion4Update() for(size_t i=0; i