sdm845Pkg: Devices: remove PcdSystemMemorySize

2022-02-10 02:08:32 +08:00 · 2022-02-10 02:08:32 +08:00 · f98013a0d4
commit f98013a0d4
parent 8dc1d36bab
30 changed files with 2 additions and 174 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -24,12 +24,8 @@ jobs:
        device:
          - dipper
          - enchilada
-          - enchilada-8g
          - fajita
-          - fajita-8g
-          - fajita-10g
          - polaris
-          - polaris-8g
          - beryllium
          - perseus
          - nx616j
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -19,11 +19,8 @@ jobs:
          - dipper
          - draco
          - enchilada
-          - enchilada-8g
          - equuleus
          - fajita
-          - fajita-8g
-          - fajita-10g
          - judyln
          - m1882
          - m1892
@ -33,7 +30,6 @@ jobs:
          - pd1821
          - perseus
          - polaris
-          - polaris-8g
          - skr-a0
          - star2qltechn
          - trident
--- a/build.sh
+++ b/build.sh
@ -4,12 +4,8 @@
 DEVICES=(
 	dipper
 	enchilada
-	enchilada-8g
 	fajita
-	fajita-8g
-	fajita-10g
 	polaris
-	polaris-8g
 	beryllium
 	perseus
 	nx616j
--- a/sdm845Pkg/Devices/akershus.dsc
+++ b/sdm845Pkg/Devices/akershus.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2248
--- a/sdm845Pkg/Devices/beryllium.dsc
+++ b/sdm845Pkg/Devices/beryllium.dsc
@ -15,8 +15,6 @@
  GCC:*_*_AARCH64_CC_FLAGS = -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  #gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferAddress|0x9D469780
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
--- a/sdm845Pkg/Devices/dipper-old.dsc
+++ b/sdm845Pkg/Devices/dipper-old.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160
--- a/sdm845Pkg/Devices/dipper.dsc
+++ b/sdm845Pkg/Devices/dipper.dsc
@ -15,8 +15,6 @@
  GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1 -DDISPLAY_DPI=410 -DENABLE_SIMPLE_INIT

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2248
--- a/sdm845Pkg/Devices/draco.dsc
+++ b/sdm845Pkg/Devices/draco.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2246
--- a/sdm845Pkg/Devices/enchilada-8g.dsc
+++ b/sdm845Pkg/Devices/enchilada-8g.dsc
@ -1,30 +0,0 @@
-
-[Defines]
-  PLATFORM_NAME                  = sdm845Pkg
-  PLATFORM_GUID                  = 28f1a3bf-193a-47e3-a7b9-5a435eaab2ee
-  PLATFORM_VERSION               = 0.1
-  DSC_SPECIFICATION              = 0x00010019
-  OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
-  SUPPORTED_ARCHITECTURES        = AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
-  SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = sdm845Pkg/Devices/enchilada.fdf
-
-  # Enable A/B Slot Environment
-  DEFINE AB_SLOTS_SUPPORT        = TRUE
-
-!include sdm845Pkg/sdm845Pkg.dsc
-
-[BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DAB_SLOTS_SUPPORT=1 -DENABLE_LINUX_SIMPLE_MASS_STORAGE
-
-[PcdsFixedAtBuild.common]
-  # System Memory (7GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x1E0000000
-
-  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
-  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2280
-
-  gsdm845PkgTokenSpaceGuid.PcdDeviceVendor|"Oneplus"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceProduct|"6"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"enchilada"
--- a/sdm845Pkg/Devices/enchilada.dsc
+++ b/sdm845Pkg/Devices/enchilada.dsc
@ -18,8 +18,6 @@
  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)                    
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2280
--- a/sdm845Pkg/Devices/equuleus.dsc
+++ b/sdm845Pkg/Devices/equuleus.dsc
@ -15,8 +15,6 @@
  GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2248
--- a/sdm845Pkg/Devices/fajita-10g.dsc
+++ b/sdm845Pkg/Devices/fajita-10g.dsc
@ -1,29 +0,0 @@
-[Defines]
-  PLATFORM_NAME                  = sdm845Pkg
-  PLATFORM_GUID                  = 28f1a3bf-193a-47e3-a7b9-5a435eaab2ee
-  PLATFORM_VERSION               = 0.1
-  DSC_SPECIFICATION              = 0x00010019
-  OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
-  SUPPORTED_ARCHITECTURES        = AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
-  SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = sdm845Pkg/Devices/fajita.fdf
-
-  # Enable A/B Slot Environment
-  DEFINE AB_SLOTS_SUPPORT        = TRUE
-
-!include sdm845Pkg/sdm845Pkg.dsc
-
-[BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_10G=1 -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
-
-[PcdsFixedAtBuild.common]
-  # System Memory (10GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x260000000
-
-  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
-  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340
-
-  gsdm845PkgTokenSpaceGuid.PcdDeviceVendor|"Oneplus"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceProduct|"6T"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"fajita"
--- a/sdm845Pkg/Devices/fajita-8g.dsc
+++ b/sdm845Pkg/Devices/fajita-8g.dsc
@ -1,29 +0,0 @@
-[Defines]
-  PLATFORM_NAME                  = sdm845Pkg
-  PLATFORM_GUID                  = 28f1a3bf-193a-47e3-a7b9-5a435eaab2ee
-  PLATFORM_VERSION               = 0.1
-  DSC_SPECIFICATION              = 0x00010019
-  OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
-  SUPPORTED_ARCHITECTURES        = AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
-  SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = sdm845Pkg/Devices/fajita.fdf
-
-  # Enable A/B Slot Environment
-  DEFINE AB_SLOTS_SUPPORT        = TRUE
-
-!include sdm845Pkg/sdm845Pkg.dsc
-
-[BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1 -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
-
-[PcdsFixedAtBuild.common]
-  # System Memory (7GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x1E0000000
-
-  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
-  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340
-
-  gsdm845PkgTokenSpaceGuid.PcdDeviceVendor|"Oneplus"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceProduct|"6T"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"fajita"
--- a/sdm845Pkg/Devices/fajita.dsc
+++ b/sdm845Pkg/Devices/fajita.dsc
@ -18,8 +18,6 @@
  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340
--- a/sdm845Pkg/Devices/generic.dsc
+++ b/sdm845Pkg/Devices/generic.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|1920
--- a/sdm845Pkg/Devices/judyln.dsc
+++ b/sdm845Pkg/Devices/judyln.dsc
@ -11,12 +11,7 @@

 !include sdm845Pkg/sdm845Pkg.dsc

-[BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_4G=1
-
 [PcdsFixedAtBuild.common]
-  # System Memory (3GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0xC0000000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|3120
--- a/sdm845Pkg/Devices/m1882.dsc
+++ b/sdm845Pkg/Devices/m1882.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160
--- a/sdm845Pkg/Devices/m1892.dsc
+++ b/sdm845Pkg/Devices/m1892.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160
--- a/sdm845Pkg/Devices/nx616j.dsc
+++ b/sdm845Pkg/Devices/nx616j.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2280
--- a/sdm845Pkg/Devices/odin-base.dsc
+++ b/sdm845Pkg/Devices/odin-base.dsc
@ -12,11 +12,9 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DMEMORY_4G=1 -DDISPLAY_DPI=369 -DENABLE_SIMPLE_INIT
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=369 -DENABLE_SIMPLE_INIT

 [PcdsFixedAtBuild.common]
-  # System Memory (3GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0xC0000000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|1920
--- a/sdm845Pkg/Devices/olympic.dsc
+++ b/sdm845Pkg/Devices/olympic.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2880
--- a/sdm845Pkg/Devices/pafm00.dsc
+++ b/sdm845Pkg/Devices/pafm00.dsc
@ -15,8 +15,6 @@
  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1

 [PcdsFixedAtBuild.common]
-  # System Memory (7GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x1E0000000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340
--- a/sdm845Pkg/Devices/pd1821.dsc
+++ b/sdm845Pkg/Devices/pd1821.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340
--- a/sdm845Pkg/Devices/perseus.dsc
+++ b/sdm845Pkg/Devices/perseus.dsc
@ -15,8 +15,6 @@
  GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1 -DDISPLAY_DPI=403 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340
--- a/sdm845Pkg/Devices/polaris-8g.dsc
+++ b/sdm845Pkg/Devices/polaris-8g.dsc
@ -1,26 +0,0 @@
-[Defines]
-  PLATFORM_NAME                  = sdm845Pkg
-  PLATFORM_GUID                  = 28f1a3bf-193a-47e3-a7b9-5a435eaab2ee
-  PLATFORM_VERSION               = 0.1
-  DSC_SPECIFICATION              = 0x00010019
-  OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
-  SUPPORTED_ARCHITECTURES        = AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
-  SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = sdm845Pkg/Devices/polaris.fdf
-
-!include sdm845Pkg/sdm845Pkg.dsc
-
-[BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1 -DMEMORY_8G=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
-
-[PcdsFixedAtBuild.common]
-  # System Memory (7GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x1E0000000
-
-  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
-  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160
-
-  gsdm845PkgTokenSpaceGuid.PcdDeviceVendor|"Xiaomi"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceProduct|"MIX2S"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"polaris"
--- a/sdm845Pkg/Devices/polaris.dsc
+++ b/sdm845Pkg/Devices/polaris.dsc
@ -15,8 +15,6 @@
  GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160
--- a/sdm845Pkg/Devices/skr-a0.dsc
+++ b/sdm845Pkg/Devices/skr-a0.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160
--- a/sdm845Pkg/Devices/star2qltechn.dsc
+++ b/sdm845Pkg/Devices/star2qltechn.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2960
--- a/sdm845Pkg/Devices/trident.dsc
+++ b/sdm845Pkg/Devices/trident.dsc
@ -12,8 +12,6 @@
 !include sdm845Pkg/sdm845Pkg.dsc

 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2242
--- a/sdm845Pkg/sdm845Pkg.dsc
+++ b/sdm845Pkg/sdm845Pkg.dsc
@ -114,6 +114,7 @@
  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"

  gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0xC0000000

  # We bring up eight cores here!
  gArmPlatformTokenSpaceGuid.PcdCoreCount|8