[PATCH edk2-platforms v2 0/3] Merge ASL and CfgMngr directories

[PATCH edk2-platforms v2 0/3] Merge ASL and CfgMngr directories

[Sami Mujawar]

This v2 patch series:
 - Merges the PlatformASLTablesLib and ConfigurationManagerDxe
   directories on the Juno and VExpress plarforms. The
   PlatformASLTablesLib directory used to be a separated module
   to build ASL files independantly. This is not necessary anymore.

 - Fixes the build break for FVP & Juno firmware when Dynamic
   Tables Framework is used for generating ACPI tables.

 - The last patch in this series increases the Juno FD size as
   this has increased following the merge of Dynamic AML feature
   in DynamicTablesPkg. This patch has been copied from the
   Dynamic AML platform support series at 
   https://edk2.groups.io/g/devel/message/64169

The changes can be seen at:
https://github.com/samimujawar/edk2-platforms/tree/847_Merge_ASL_and_CfgMngr_dir_v2

Pierre Gondois (3):
  Platform/ARM/Juno: Merge ASL and CfgMngr directories
  Platform/ARM/VExpressPkg: Merge ASL and CfgMngr directories
  Platform/ARM/Juno: Increase FD size

 Platform/ARM/JunoPkg/ArmJuno.fdf                                                                                      |  8 ++--
 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc                                                | 10 +----
 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl        |  0
 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtJunoUsb.asl |  0
 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtPci.asl     |  0
 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtUart.asl    |  0
 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c                              |  8 +---
 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h                              | 11 +++++-
 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf                         |  7 +++-
 Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf                               | 39 --------------------
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc                                            | 10 +----
 Platform/ARM/VExpressPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl    |  0
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c                          |  5 +--
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h                          |  8 +++-
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf                     |  4 +-
 Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf                           | 29 ---------------
 16 files changed, 34 insertions(+), 105 deletions(-)
 rename Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl (100%)
 rename Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtJunoUsb.asl (100%)
 rename Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtPci.asl (100%)
 rename Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtUart.asl (100%)
 delete mode 100644 Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
 rename Platform/ARM/VExpressPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl (100%)
 delete mode 100644 Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf

-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 1/3] Platform/ARM/Juno: Merge ASL and CfgMngr directories

[Sami Mujawar]

From: Pierre Gondois <pierre.gondois@arm.com>

Due to the following patch available in edk2:
  0a4aa20e8d446c2f5dd54f3a0a7ec4d52f0ebdb6
  BaseTools: Compile AML bytecode arrays into .obj file
a C array containing the AML bytecode is generated from
ASL files, and a .obj file containing this array is
generated.

The Configuration Manager is currently providing an extra
flag to the ASL compiler to generate a C array containing
AML bytecode. This C array is contained in a .hex file.
This .hex file is included where necessary.

This mechanism was necessary due to the impossibility
to describe dependencies between ASL files and C files.
This mechanism is not required anymore. Thus the ASL and
CfgMngr directories can me merged in one module.

This patch merge the two directories for the Juno.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---

Notes:
    v2:
      - No code change. Resending with v2 series.                   [SAMI]
        Ref: https://edk2.groups.io/g/devel/message/63247
    
     v1:
      - Merge the PlatformASLTablesLib and ConfigurationManagerDxe  [Pierre]
        directories.

 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc                                                | 10 +----
 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl        |  0
 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtJunoUsb.asl |  0
 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtPci.asl     |  0
 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtUart.asl    |  0
 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c                              |  8 +---
 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h                              | 11 +++++-
 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf                         |  7 +++-
 Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf                               | 39 --------------------
 9 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
index 6699a016098623f9c8f567a8fa305b7cbf0b4fff..987c2d8ca3ba9757e36b9e16171a280523107a7a 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
@@ -1,7 +1,7 @@
 ## @file
 #  dsc include file for Configuration Manager
 #
-#  Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.
+#  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -14,10 +14,4 @@ [LibraryClasses.common]
 
 [Components.common]
   # Configuration Manager
-  Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf {
-    <LibraryClasses>
-    # Platform ASL Tables
-    PlatformAslTablesLib|Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
-  <BuildOptions>
-   *_*_*_PLATFORM_FLAGS = -I$(BIN_DIR)/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib/OUTPUT
-  }
+  Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/Dsdt.asl
similarity index 100%
rename from Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
rename to Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/Dsdt.asl
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtJunoUsb.asl
similarity index 100%
rename from Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl
rename to Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtJunoUsb.asl
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtPci.asl
similarity index 100%
rename from Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl
rename to Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtPci.asl
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtUart.asl
similarity index 100%
rename from Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl
rename to Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtUart.asl
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index d52cc2982334ded1c3bf2f5e8f570378d8fb0ae1..913cffc9b994319065b5292b0d28970a0a0d8320 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1,7 +1,7 @@
 /** @file
   Configuration Manager Dxe
 
-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
+  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -25,12 +25,6 @@
 #include "ConfigurationManager.h"
 #include "Platform.h"
 
-// AML Code Include files generated by iASL Compiler
-#include <Dsdt.hex>
-#include <SsdtJunoUsb.hex>
-#include <SsdtUart.hex>
-#include <SsdtPci.hex>
-
 /** The platform configuration repository information.
 */
 STATIC
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 7fdf663fc6d2ad80da26ff1f1635c858d5be4e93..2073ae4902e540de869612353bfaf0ebacaea50d 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
+  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -12,6 +12,15 @@
 #ifndef CONFIGURATION_MANAGER_H__
 #define CONFIGURATION_MANAGER_H__
 
+/** C array containing the compiled AML template.
+    These symbols are defined in the auto generated C file
+    containing the AML bytecode array.
+*/
+extern CHAR8  dsdt_aml_code[];
+extern CHAR8  ssdtjunousb_aml_code[];
+extern CHAR8  ssdtpci_aml_code[];
+extern CHAR8  ssdtuart_aml_code[];
+
 /** The configuration manager version
 */
 #define CONFIGURATION_MANAGER_REVISION CREATE_REVISION (1, 0)
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index dd71f815db672f25f04713460acb2460bdc45699..a3e7db12f8c913f7111b5ff4ad724a5bdcc35956 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Configuration Manager Dxe
 #
-#  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
+#  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -22,6 +22,10 @@ [Defines]
 
 [Sources]
   ConfigurationManager.c
+  AslTables/Dsdt.asl
+  AslTables/SsdtJunoUsb.asl
+  AslTables/SsdtPci.asl
+  AslTables/SsdtUart.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
@@ -33,7 +37,6 @@ [Packages]
 
 [LibraryClasses]
   ArmPlatformLib
-  PlatformAslTablesLib
   PrintLib
   UefiBootServicesTableLib
   UefiDriverEntryPoint
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
deleted file mode 100644
index 93978cff97d9704f8639732c55d01bf559a5a2d6..0000000000000000000000000000000000000000
--- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-## @file
-#  Platform ASL Tables
-#
-#  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
-#
-#  SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-
-[Defines]
-  INF_VERSION                    = 0x0001001B
-  BASE_NAME                      = JunoAslTablesLib
-  FILE_GUID                      = 557004DB-DF45-426B-9E5E-1E8ABAA2EE2C
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = PlatformAslTablesLib|DXE_DRIVER
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-#  VALID_ARCHITECTURES           = ARM AARCH64
-#
-
-[Sources]
-  Dsdt.asl
-  SsdtJunoUsb.asl
-  SsdtPci.asl
-  SsdtUart.asl
-
-[Packages]
-  ArmPkg/ArmPkg.dec
-  ArmPlatformPkg/ArmPlatformPkg.dec
-  MdeModulePkg/MdeModulePkg.dec
-  MdePkg/MdePkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
-
-[FixedPcd]
-  gArmPlatformTokenSpaceGuid.PL011UartInterrupt
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 2/3] Platform/ARM/VExpressPkg: Merge ASL and CfgMngr directories

[Sami Mujawar]

From: Pierre Gondois <pierre.gondois@arm.com>

Due to the following patch available in edk2:
  0a4aa20e8d446c2f5dd54f3a0a7ec4d52f0ebdb6
  BaseTools: Compile AML bytecode arrays into .obj file
a C array containing the AML bytecode is generated from
ASL files, and a .obj file containing this array is
generated.

The Configuration Manager is currently providing an extra
flag to the ASL compiler to generate a C array containing
AML bytecode. This C array is contained in a .hex file.
This .hex file is included where necessary.

This mechanism was necessary due to the impossibility
to describe dependencies between ASL files and C files.
This mechanism is not required anymore. Thus the ASL and
CfgMngr directories can me merged in one module.

This patch merge the two directories for the FVP.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---

Notes:
    v2:
      - No code change. Resending with v2 series.                   [SAMI]
        Ref: https://edk2.groups.io/g/devel/message/63245
    
    v1:
      - Merge the PlatformASLTablesLib and ConfigurationManagerDxe  [Pierre]
        directories.

 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc                                         | 10 ++-----
 Platform/ARM/VExpressPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl |  0
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c                       |  5 +---
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h                       |  8 +++++-
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf                  |  4 +--
 Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf                        | 29 --------------------
 6 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc
index 9b044bba5d907d1a53eb73c1c912968f7ee321da..0915c154cce6b0686f67a383dc69231ed3ed6f36 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc
@@ -1,7 +1,7 @@
 ## @file
 #  dsc include file for Configuration Manager
 #
-#  Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.
+#  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -16,10 +16,4 @@ [LibraryClasses.common]
 
 [Components.common]
   # Configuration Manager
-  Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf {
-    <LibraryClasses>
-    # Platform ASL Tables
-    PlatformAslTablesLib|Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
-  <BuildOptions>
-   *_*_*_PLATFORM_FLAGS = -I$(BIN_DIR)/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib/OUTPUT
-  }
+  Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/Dsdt.asl
similarity index 100%
rename from Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
rename to Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/Dsdt.asl
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 010702ae1daee515d079273975920c8af5c0bf41..a48eb0285c60177078324bdbcd8fa29c308e6a13 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1,7 +1,7 @@
 /** @file
   Configuration Manager Dxe
 
-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
+  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -24,9 +24,6 @@
 #include "ConfigurationManager.h"
 #include "Platform.h"
 
-// AML Code Include files generated by iASL Compiler
-#include <Dsdt.hex>
-
 /** The platform configuration repository information.
 */
 STATIC
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index c61750dc55cd260ca7c1a4720c354cb7dfed1c0c..6fb959ab7ae2c77f750781d05660957488fae8cd 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
+  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -12,6 +12,12 @@
 #ifndef CONFIGURATION_MANAGER_H__
 #define CONFIGURATION_MANAGER_H__
 
+/** C array containing the compiled AML template.
+    This symbol is defined in the auto generated C file
+    containing the AML bytecode array.
+*/
+extern CHAR8  dsdt_aml_code[];
+
 /** The configuration manager version.
 */
 #define CONFIGURATION_MANAGER_REVISION CREATE_REVISION (1, 0)
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index 14f4323f0015a7b0950ee7b3316f03c8c9c4fb9b..c17595b7ec37cdd1c99b258cd32d1bde6c76a5ed 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Configuration Manager Dxe
 #
-#  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
+#  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -22,6 +22,7 @@ [Defines]
 
 [Sources]
   ConfigurationManager.c
+  AslTables/Dsdt.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
@@ -33,7 +34,6 @@ [Packages]
 
 [LibraryClasses]
   ArmPlatformLib
-  PlatformAslTablesLib
   PrintLib
   UefiBootServicesTableLib
   UefiDriverEntryPoint
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
deleted file mode 100644
index 23a71c365b7387a91353e2492bc7a19e03ffb9a0..0000000000000000000000000000000000000000
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
+++ /dev/null
@@ -1,29 +0,0 @@
-## @file
-#  Platform ASL Tables
-#
-#  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
-#
-#  SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-
-[Defines]
-  INF_VERSION                    = 0x0001001B
-  BASE_NAME                      = PlatformAslTablesLib
-  FILE_GUID                      = 4000AEAB-C6D3-4F67-ADE3-D4B504FC164B
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = PlatformAslTablesLib|DXE_DRIVER
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-#  VALID_ARCHITECTURES           = ARM AARCH64
-#
-
-[Sources]
-  Dsdt.asl
-
-[Packages]
-  ArmPlatformPkg/ArmPlatformPkg.dec
-  MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 3/3] Platform/ARM/Juno: Increase FD size

[Sami Mujawar]

From: Pierre Gondois <pierre.gondois@arm.com>

Dynamic Tables Framework has been updated to include
support for SSDT Serial Port generator. The SSDT Serial
port generator uses AmlLib library to parse, iterate
and update AML nodes.

The addition of these libraries to the Dynamic Tables
Framework have increased the size requirement of the
Firmware Device (FD) Image.

The current FD size is not sufficient due to which the
Juno firmware builds are failing. This patch adds one
additional block to accommodate the increase in FD size.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
---

Notes:
    v2:
     - New patch introduced in this series. This patch has been        [SAMI]
       copied from the Dynamic AML platform support series at
       https://edk2.groups.io/g/devel/message/64169
       This patch is needed as the Dynamic AML patches merged
       in DynamicTablesPkg have increased the firmware size.

 Platform/ARM/JunoPkg/ArmJuno.fdf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf
index 5d791a4e16075073992a5646db34d094677837d2..f70d30c6a9d9d6eb73087dc673f0c9287d23d666 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.fdf
+++ b/Platform/ARM/JunoPkg/ArmJuno.fdf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2013-2018, ARM Limited. All rights reserved.
+#  Copyright (c) 2013-2019, Arm Limited. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -20,12 +20,12 @@
 
 [FD.BL33_AP_UEFI]
 BaseAddress   = 0xE0000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.
-Size          = 0x000F8000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device
+Size          = 0x000F9000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device
 ErasePolarity = 1
 
 # This one is tricky, it must be: BlockSize * NumBlocks = Size
 BlockSize     = 0x00001000
-NumBlocks     = 0xF8
+NumBlocks     = 0xF9
 
 ################################################################################
 #
@@ -43,7 +43,7 @@ [FD.BL33_AP_UEFI]
 #
 ################################################################################
 
-0x00000000|0x000F8000
+0x00000000|0x000F9000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

Re: [PATCH edk2-platforms v2 0/3] Merge ASL and CfgMngr directories

[Ard Biesheuvel]

On 11/7/20 10:45 AM, Sami Mujawar wrote:
> This v2 patch series:
>   - Merges the PlatformASLTablesLib and ConfigurationManagerDxe
>     directories on the Juno and VExpress plarforms. The
>     PlatformASLTablesLib directory used to be a separated module
>     to build ASL files independantly. This is not necessary anymore.
> 
>   - Fixes the build break for FVP & Juno firmware when Dynamic
>     Tables Framework is used for generating ACPI tables.
> 
>   - The last patch in this series increases the Juno FD size as
>     this has increased following the merge of Dynamic AML feature
>     in DynamicTablesPkg. This patch has been copied from the
>     Dynamic AML platform support series at
>     https://edk2.groups.io/g/devel/message/64169
> 
> The changes can be seen at:
> https://github.com/samimujawar/edk2-platforms/tree/847_Merge_ASL_and_CfgMngr_dir_v2
> 
> Pierre Gondois (3):
>    Platform/ARM/Juno: Merge ASL and CfgMngr directories
>    Platform/ARM/VExpressPkg: Merge ASL and CfgMngr directories
>    Platform/ARM/Juno: Increase FD size
> 

Pushed as 867efd012b2f..adcb0c92ca57

Apologies for the delay.

>   Platform/ARM/JunoPkg/ArmJuno.fdf                                                                                      |  8 ++--
>   Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc                                                | 10 +----
>   Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl        |  0
>   Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtJunoUsb.asl |  0
>   Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtPci.asl     |  0
>   Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtUart.asl    |  0
>   Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c                              |  8 +---
>   Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h                              | 11 +++++-
>   Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf                         |  7 +++-
>   Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf                               | 39 --------------------
>   Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc                                            | 10 +----
>   Platform/ARM/VExpressPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl    |  0
>   Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c                          |  5 +--
>   Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h                          |  8 +++-
>   Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf                     |  4 +-
>   Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf                           | 29 ---------------
>   16 files changed, 34 insertions(+), 105 deletions(-)
>   rename Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl (100%)
>   rename Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtJunoUsb.asl (100%)
>   rename Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtPci.asl (100%)
>   rename Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtUart.asl (100%)
>   delete mode 100644 Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
>   rename Platform/ARM/VExpressPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl (100%)
>   delete mode 100644 Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
>