Merge branch 'master' into developer

This commit is contained in:
Aurora 2016-09-02 14:28:47 +02:00
commit ca0a79fc89

View File

@ -83,10 +83,10 @@ void main(void)
//Determine if this is a firmlaunch boot
if(launchedFirmTidLow[5] != 0)
{
if(needConfig == CREATE_CONFIGURATION) mcuReboot();
isFirmlaunch = true;
if(needConfig == CREATE_CONFIGURATION) mcuReboot();
//'0' = NATIVE_FIRM, '1' = TWL_FIRM, '2' = AGB_FIRM
firmType = launchedFirmTidLow[7] == u'3' ? SAFE_FIRM : (FirmwareType)(launchedFirmTidLow[5] - u'0');