sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ArmPlatformPkg/BootMonFs: Added support for new revision of the NOR Flash file system

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15324 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin 2014-03-12 17:23:33 +00:00 committed by oliviermartin
parent 0698723204
commit cb77b48ad9
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsHw.h
View File

@ -19,9 +19,13 @@
#define HW_IMAGE_FOOTER_SIGNATURE_1 0x464C5348 #define HW_IMAGE_FOOTER_SIGNATURE_1 0x464C5348
#define HW_IMAGE_FOOTER_SIGNATURE_2 0x464F4F54 #define HW_IMAGE_FOOTER_SIGNATURE_2 0x464F4F54
#define HW_IMAGE_FOOTER_VERSION 1 #define HW_IMAGE_FOOTER_VERSION 1
#define HW_IMAGE_FOOTER_OFFSET 92 #define HW_IMAGE_FOOTER_OFFSET 92
#define HW_IMAGE_FOOTER_VERSION2 2
#define HW_IMAGE_FOOTER_OFFSET2 96
typedef struct { typedef struct {
CHAR8 Filename[MAX_NAME_LENGTH]; CHAR8 Filename[MAX_NAME_LENGTH];
UINT32 Offset; UINT32 Offset;

14
ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsImages.c
View File

@ -109,11 +109,15 @@ BootMonFsImageInThisBlock (
return FALSE; return FALSE;
} }
if (Ptr->Version != HW_IMAGE_FOOTER_VERSION) { if (Ptr->Version == HW_IMAGE_FOOTER_VERSION) {
return FALSE; if (Ptr->Offset != HW_IMAGE_FOOTER_OFFSET) {
} return FALSE;
}
if (Ptr->Offset != HW_IMAGE_FOOTER_OFFSET) { } else if (Ptr->Version == HW_IMAGE_FOOTER_VERSION2) {
if (Ptr->Offset != HW_IMAGE_FOOTER_OFFSET2) {
return FALSE;
}
} else {
return FALSE; return FALSE;
} }

5
ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c
View File

@ -100,8 +100,13 @@ FlushAppendRegion (
Description->BlockEnd = Description->BlockStart + (NewFileSize / BlockSize); Description->BlockEnd = Description->BlockStart + (NewFileSize / BlockSize);
Description->Footer.FooterSignature1 = HW_IMAGE_FOOTER_SIGNATURE_1; Description->Footer.FooterSignature1 = HW_IMAGE_FOOTER_SIGNATURE_1;
Description->Footer.FooterSignature2 = HW_IMAGE_FOOTER_SIGNATURE_2; Description->Footer.FooterSignature2 = HW_IMAGE_FOOTER_SIGNATURE_2;
#ifdef MDE_CPU_ARM
Description->Footer.Version = HW_IMAGE_FOOTER_VERSION; Description->Footer.Version = HW_IMAGE_FOOTER_VERSION;
Description->Footer.Offset = HW_IMAGE_FOOTER_OFFSET; Description->Footer.Offset = HW_IMAGE_FOOTER_OFFSET;
#else
Description->Footer.Version = HW_IMAGE_FOOTER_VERSION2;
Description->Footer.Offset = HW_IMAGE_FOOTER_OFFSET2;
#endif
Description->RegionCount = 1; Description->RegionCount = 1;
Description->Region[0].Checksum = 0; Description->Region[0].Checksum = 0;
Description->Region[0].Offset = Description->BlockStart * BlockSize; Description->Region[0].Offset = Description->BlockStart * BlockSize;