Merge remote-tracking branch 'tuxbox/pu/fb-modules'

only compile tested ;-)
This commit is contained in:
Stefan Seyfried
2017-02-12 21:29:10 +01:00
45 changed files with 859 additions and 157 deletions

View File

@@ -182,7 +182,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
std::string flashfile;
bool skipCopy = false;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
if (strcmp(dn, "/tmp") != 0) {
uint64_t btotal = 0, bused = 0;
long bsize = 0;
@@ -689,7 +689,7 @@ int CMTDInfo::getMTDEraseSize( const std::string & filename )
std::string CMTDInfo::findMTDsystem()
{
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
std::string sysfs = "root0";
#else
std::string sysfs = "systemFS";