Fix bug when quitting AGB_FIRM

The wrong config.bin section was used to remember the last-used FIRM
This commit is contained in:
Aurora 2016-04-16 20:27:52 +02:00
parent 2323528975
commit 0f64fd73ec
2 changed files with 4 additions and 5 deletions

View File

@ -3,9 +3,8 @@
#include "fatfs/ff.h" #include "fatfs/ff.h"
#define PAYLOAD_ADDRESS 0x23F00000 #define PAYLOAD_ADDRESS 0x23F00000
#define PAYLOADS_FOLDER "/aurei/payloads/"
#define BASE_PATH "/aurei/payloads/" #define PAYLOAD_PATH(a) PAYLOADS_FOLDER a ".bin"
#define PAYLOAD_PATH(x) BASE_PATH x ".bin"
static u32 loadPayload(const char *path) static u32 loadPayload(const char *path)
{ {

View File

@ -111,7 +111,7 @@ void main(void)
if(previousFirm == 7) if(previousFirm == 7)
{ {
nandType = 0; nandType = 0;
firmSource = updatedSys ? 0 : BOOTCONFIG(0, 3); firmSource = updatedSys ? 0 : BOOTCONFIG(2, 1);
needConfig = 0; needConfig = 0;
//Flag to prevent multiple boot options-forcing //Flag to prevent multiple boot options-forcing
@ -198,7 +198,7 @@ static inline void loadFirm(u32 firmType, u32 externalFirm)
if(externalFirm) if(externalFirm)
{ {
const char *path = "/aurei/firmware.bin"; const char path[] = "/aurei/firmware.bin";
firmSize = fileSize(path); firmSize = fileSize(path);
if(firmSize) if(firmSize)