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

Sami Mujawar posted 3 patches 3 years, 4 months ago
Failed in applying to current master (apply log)
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
[edk2-devel] [PATCH edk2-platforms v2 0/3] Merge ASL and CfgMngr directories
Posted by Sami Mujawar 3 years, 4 months ago
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)'



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67122): https://edk2.groups.io/g/devel/message/67122
Mute This Topic: https://groups.io/mt/78092588/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH edk2-platforms v2 0/3] Merge ASL and CfgMngr directories
Posted by Ard Biesheuvel 3 years, 4 months ago
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
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67711): https://edk2.groups.io/g/devel/message/67711
Mute This Topic: https://groups.io/mt/78092588/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-