ArmPlatformPkg/BootMonFs: Added support for the NorFlash File System of the ARM Development Boards

This is the filesystem created by the microcontroller on NOR Flash of the ARM Versatile
Express Development Board.

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@15126 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 34 insertions, 9 deletions

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
index 465b88a800..3454e2bcd1 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -1,5 +1,5 @@
 #

-#  Copyright (c) 2012, ARM Limited. All rights reserved.

+#  Copyright (c) 2012-2014, ARM Limited. All rights reserved.

 #  

 #  This program and the accompanying materials                          

 #  are licensed and made available under the terms and conditions of the BSD License         

@@ -120,6 +120,10 @@ READ_LOCK_STATUS   = TRUE
   INF FatBinPkg/EnhancedFatDxe/Fat.inf

   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

 

+  # Versatile Express FileSystem

+  INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf

+

+  # ACPI Support

   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

   

   #

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index cd44c51645..1b316c7ab5 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -1,6 +1,5 @@
-# FLASH layout file for ARM VE.

 #

-#  Copyright (c) 2011, ARM Limited. All rights reserved.

+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.

 #  

 #  This program and the accompanying materials                          

 #  are licensed and made available under the terms and conditions of the BSD License         

@@ -189,6 +188,9 @@ READ_LOCK_STATUS   = TRUE
   INF FatBinPkg/EnhancedFatDxe/Fat.inf

   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

 

+  # Versatile Express FileSystem

+  INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf

+

   #

   # Multimedia Card Interface

   #

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
index 133b2d5ecc..c9162f2417 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
@@ -1,6 +1,5 @@
-# FLASH layout file for ARM VE.

 #

-#  Copyright (c) 2011, ARM Limited. All rights reserved.

+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.

 #  

 #  This program and the accompanying materials                          

 #  are licensed and made available under the terms and conditions of the BSD License         

@@ -157,6 +156,9 @@ READ_LOCK_STATUS   = TRUE
   INF FatBinPkg/EnhancedFatDxe/Fat.inf

   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

 

+  # Versatile Express FileSystem

+  INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf

+

   #

   # Multimedia Card Interface

   #

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
index a3feee7003..ec20e33cd1 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
@@ -1,6 +1,5 @@
-# FLASH layout file for ARM VE.

 #

-#  Copyright (c) 2011, ARM Limited. All rights reserved.

+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.

 #  

 #  This program and the accompanying materials                          

 #  are licensed and made available under the terms and conditions of the BSD License         

@@ -157,6 +156,9 @@ READ_LOCK_STATUS   = TRUE
   INF FatBinPkg/EnhancedFatDxe/Fat.inf

   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

 

+  # Versatile Express FileSystem

+  INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf

+

   #

   # Multimedia Card Interface

   #

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
index f278355f9a..f4ae329ae8 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
@@ -1,5 +1,5 @@
 #

-#  Copyright (c) 2011, ARM Limited. All rights reserved.

+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.

 #  

 #  This program and the accompanying materials                          

 #  are licensed and made available under the terms and conditions of the BSD License         

@@ -149,6 +149,11 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPkg/Filesystem/SemihostFs/SemihostFs.inf

   

   #

+  # Versatile Express FileSystem

+  #

+  INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf

+

+  #

   # FAT filesystem + GPT/MBR partitioning

   #

   INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index 7d405379e6..19dd9cc669 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -1,5 +1,5 @@
 #

-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.

 #  

 #  This program and the accompanying materials                          

 #  are licensed and made available under the terms and conditions of the BSD License         

@@ -328,6 +328,13 @@
   #

 

   #

+  # FileSystem

+  #

+

+  # List of Device Paths that support BootMonFs

+  gArmPlatformTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)"

+

+  #

   # ARM OS Loader

   #

   # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux: 

@@ -342,3 +349,6 @@
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()"

   gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10

 

+[Components.common]

+  # Versatile Express FileSystem

+  ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf