Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-14 20:10:18 +03:00
Code Issues Wiki Activity

Fixes for some further FLASH cloud build errors.

Browse source
This commit is contained in:
blckmn 2022-10-31 15:10:19 +11:00
parent 455965aa40
commit af99690cda
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/cli/cli.c
View file

@ -2451,8 +2451,7 @@ static void cliSdInfo(const char *cmdName, char *cmdline)
#endif #endif
#ifdef USE_FLASH_CHIP #ifdef USE_FLASHFS
static void cliFlashInfo(const char *cmdName, char *cmdline) static void cliFlashInfo(const char *cmdName, char *cmdline)
{ {
UNUSED(cmdName); UNUSED(cmdName);
@ -2474,17 +2473,15 @@ static void cliFlashInfo(const char *cmdName, char *cmdline)
} }
cliPrintLinef(" %d: %s %u %u", index, flashPartitionGetTypeName(partition->type), partition->startSector, partition->endSector); cliPrintLinef(" %d: %s %u %u", index, flashPartitionGetTypeName(partition->type), partition->startSector, partition->endSector);
} }
#ifdef USE_FLASHFS
const flashPartition_t *flashPartition = flashPartitionFindByType(FLASH_PARTITION_TYPE_FLASHFS); const flashPartition_t *flashPartition = flashPartitionFindByType(FLASH_PARTITION_TYPE_FLASHFS);
cliPrintLinef("FlashFS size=%u, usedSize=%u", cliPrintLinef("FlashFS size=%u, usedSize=%u",
FLASH_PARTITION_SECTOR_COUNT(flashPartition) * layout->sectorSize, FLASH_PARTITION_SECTOR_COUNT(flashPartition) * layout->sectorSize,
flashfsGetOffset() flashfsGetOffset()
); );
#endif
} }
#ifdef USE_FLASH_TOOLS
static void cliFlashErase(const char *cmdName, char *cmdline) static void cliFlashErase(const char *cmdName, char *cmdline)
{ {
UNUSED(cmdName); UNUSED(cmdName);
@ -2521,6 +2518,7 @@ static void cliFlashErase(const char *cmdName, char *cmdline)
cliPrintLine("Done."); cliPrintLine("Done.");
} }
#ifdef USE_FLASH_TOOLS
static void cliFlashVerify(const char *cmdName, char *cmdline) static void cliFlashVerify(const char *cmdName, char *cmdline)
{ {
UNUSED(cmdline); UNUSED(cmdline);

3
src/main/drivers/flash.c
View file

@ -332,7 +332,7 @@ const flashGeometry_t *flashGetGeometry(void)
static void flashConfigurePartitions(void) static void flashConfigurePartitions(void)
{ {
#if defined(FIRMWARE_SIZE) || defined(CONFIG_IN_EXTERNAL_FLASH) || defined(USE_FLASHFS)
const flashGeometry_t *flashGeometry = flashGetGeometry(); const flashGeometry_t *flashGeometry = flashGetGeometry();
if (flashGeometry->totalSize == 0) { if (flashGeometry->totalSize == 0) {
return; return;
@ -345,6 +345,7 @@ static void flashConfigurePartitions(void)
if (badBlockPartition) { if (badBlockPartition) {
endSector = badBlockPartition->startSector - 1; endSector = badBlockPartition->startSector - 1;
} }
#endif
#if defined(FIRMWARE_SIZE) #if defined(FIRMWARE_SIZE)
const uint32_t firmwareSize = (FIRMWARE_SIZE * 1024); const uint32_t firmwareSize = (FIRMWARE_SIZE * 1024);