|
|
@@ -163,7 +163,7 @@ void FF_SFDiskFlush( FF_Disk_t *pxDisk )
|
|
|
}
|
|
|
}
|
|
|
/*-----------------------------------------------------------*/
|
|
|
-
|
|
|
+
|
|
|
#define sfHIDDEN_SECTOR_COUNT 8
|
|
|
#define sfPRIMARY_PARTITIONS 1
|
|
|
#define sfPARTITION_NUMBER 0 /* Only a single partition is used. */
|
|
|
@@ -352,9 +352,21 @@ BaseType_t xReturn = pdFAIL;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- FF_PRINTF( "FF_SFDiskInit: SPI nor/nand Flash fail.\n");
|
|
|
- FF_SFDiskDelete( pxDisk );
|
|
|
- pxDisk = NULL;
|
|
|
+ if ( PartitionAndFormatSFDisk( pxDisk ) != FF_ERR_NONE )
|
|
|
+ {
|
|
|
+ FF_PRINTF( "FF_SFDiskFormatRemount: PartitionAndFormatSFDisk fail.\n");
|
|
|
+ FF_SFDiskDelete( pxDisk );
|
|
|
+ pxDisk = NULL;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if( pcName == NULL )
|
|
|
+ {
|
|
|
+ pcName = "/";
|
|
|
+ }
|
|
|
+ FF_FS_Add( pcName, pxDisk );
|
|
|
+ FF_PRINTF( "FF_SDDiskFormatRemount: Mount SPI nor/nand Flash as root \"%s\"\n", pcName );
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return xReturn;
|