Odin: add odin-base

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d0d572d89351916222f7ff1b6d8ff12ee9c578ab..9209a74cd6c606a8b4e77d207fa494a371b7fa36 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
           - trident
           - draco
           - pd1821
-          - ayn-odin
+          - odin-base
           - akershus
           - equuleus
 

diff --git a/README.md b/README.md
index 8a62c17fb171d21e216062c915379a917945b7e5..f4821196febb4ea5203de74a1280590515f3d6ee 100644 (file)
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ QQ chinese group: 697666196 (Main group)    737223105 (Linux/edk2)
 16. Nokia9 PureView           (olympic)
 17. ASUS ZenFone 5Z           (draco)
 18. Vivo NEX Dual Display     (pd1821)
-19. ayn odin handheld         (ayn-odin)
+19. AYN Odin Handheld         (odin-base)
 20. ZTE Axon 9 Pro            (akershus)
 21. Xiaomi MI 8 UD            (equuleus)
 

diff --git a/README.zh.md b/README.zh.md
index a08f6f6e9b654470da6eda13b3c911d31f368cf6..ed3775ce4ae77831051451af13190809cb041e2d 100644 (file)
--- a/README.zh.md
+++ b/README.zh.md
@@ -45,7 +45,7 @@ QQ中文交流群: 697666196 (主群)      737223105 (Linux/edk2)
 16. 诺基亚9 PureView       (olympic)\r
 17. 华硕 ZenFone 5Z        (draco)\r
 18. Vivo NEX 双屏版        (pd1821)\r
-19. ayn odin handheld      (ayn-odin)\r
+19. AYN Odin Handheld      (odin-base)\r
 20. 中兴天机Axon 9 Pro     (akershus)\r
 21. 小米8UD 屏幕指纹版     (equuleus)\r
 \r

diff --git a/build.sh b/build.sh
index d9ba91e5fa125f4db65a43df951fff94ac8bf1e7..6fde84eead769d33a48c1a03f868f1d2b4350e8e 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -23,7 +23,7 @@ DEVICES=(
        olympic
        draco
        pd1821
-       ayn-odin
+       odin-base
        akershus
        equuleus
 )

diff --git a/device_specific/ayn-odin.dtb b/device_specific/odin-base.dtb
similarity index 100%
rename from device_specific/ayn-odin.dtb
rename to device_specific/odin-base.dtb

diff --git a/sdm845Pkg/Devices/ayn-odin.dsc b/sdm845Pkg/Devices/odin-base.dsc
similarity index 71%
rename from sdm845Pkg/Devices/ayn-odin.dsc
rename to sdm845Pkg/Devices/odin-base.dsc
index d7e637eab362abcfc4497dcbe755d8cc006736a0..cfd58ffa97067e5d7a2b8f8447ff207aac6a9cd4 100644 (file)
--- a/sdm845Pkg/Devices/ayn-odin.dsc
+++ b/sdm845Pkg/Devices/odin-base.dsc
@@ -7,16 +7,16 @@
   SUPPORTED_ARCHITECTURES        = AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = sdm845Pkg/Devices/ayn-odin.fdf
+  FLASH_DEFINITION               = sdm845Pkg/Devices/odin.fdf
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DMEMORY_4G=1 -DDISPLAY_DPI=369 -DENABLE_SIMPLE_INIT
 
 [PcdsFixedAtBuild.common]
-  # System Memory (8GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
+  # System Memory (3GB)
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0xC0000000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|1920

diff --git a/sdm845Pkg/Devices/ayn-odin.fdf b/sdm845Pkg/Devices/odin.fdf
similarity index 98%
rename from sdm845Pkg/Devices/ayn-odin.fdf
rename to sdm845Pkg/Devices/odin.fdf
index 2586bbcaf0d783585dee3e47826fdb5c0ace150a..d2b89e94379e6dc307fe31facc4e739d6a8bdd3b 100644 (file)
--- a/sdm845Pkg/Devices/ayn-odin.fdf
+++ b/sdm845Pkg/Devices/odin.fdf
@@ -289,8 +289,8 @@ APRIORI DXE {
   }
 
   FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/ayn-odin/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/ayn-odin/ButtonsDxe/ButtonsDxe.efi
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/Odin/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/Odin/ButtonsDxe/ButtonsDxe.efi
     SECTION UI = "ButtonsDxe"
   }
 
@@ -474,8 +474,8 @@ APRIORI DXE {
   }
 
   FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/ayn-odin/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/ayn-odin/ButtonsDxe/ButtonsDxe.efi
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/Odin/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/Odin/ButtonsDxe/ButtonsDxe.efi
     SECTION UI = "ButtonsDxe"
   }
 
@@ -523,7 +523,7 @@ APRIORI DXE {
 
   FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {   
     SECTION RAW = sdm845Pkg/AcpiTables/testing/DBG2.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/perseus/DSDT.aml
+    SECTION RAW = sdm845Pkg/AcpiTables/odin/DSDT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/MADT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/FADT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/GTDT.aml
@@ -560,6 +560,10 @@ APRIORI DXE {
   INF MdeModulePkg/Application/UiApp/UiApp.inf
   INF sdm845Pkg/Drivers/LogoDxe/LogoDxe.inf
 
+  #
+  # Simple Init GUI
+  #
+  INF src/main/SimpleInitMain.inf
 
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 8