diff mbox series

[Concept,11/25] efi: arm: Provide CHIDs for the app

Message ID 20250903133639.3235920-12-sjg@u-boot.org
State New
Headers
Series Selection of devicetree using CHIDs |

Commit Message

Simon Glass Sept. 3, 2025, 1:36 p.m. UTC 
  From: Simon Glass <sjg@chromium.org>

Provide some CHIDs for the app, so it can locate the compatible strings.

These are taken from Stubble commit bac4edb14be, with the original files
generated by running 'fwupdtool hwids' on each device.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 .../hwids/msm8998-lenovo-miix-630-81f1.txt    | 33 ++++++++++++++++
 .../efi-arm_app/hwids/sc7180-acer-aspire1.txt | 32 ++++++++++++++++
 .../hwids/sc8180x-lenovo-flex-5g-81xe.txt     | 32 ++++++++++++++++
 .../hwids/sc8180x-lenovo-flex-5g-82ak.txt     | 33 ++++++++++++++++
 .../hwids/sc8280xp-huawei-gaokun3.txt         | 38 +++++++++++++++++++
 .../sc8280xp-lenovo-thinkpad-x13s-21bx.txt    | 33 ++++++++++++++++
 .../sc8280xp-lenovo-thinkpad-x13s-21by.txt    | 32 ++++++++++++++++
 .../hwids/sc8280xp-microsoft-blackrock.txt    | 32 ++++++++++++++++
 .../sc8280xp-microsoft-surface-pro-9-5G.txt   | 32 ++++++++++++++++
 .../hwids/sdm850-lenovo-yoga-c630.txt         | 32 ++++++++++++++++
 .../efi/efi-arm_app/hwids/x1e001de-devkit.txt | 30 +++++++++++++++
 .../x1e78100-lenovo-thinkpad-t14s-21n1.txt    | 38 +++++++++++++++++++
 .../x1e78100-lenovo-thinkpad-t14s-21n2.txt    | 37 ++++++++++++++++++
 .../hwids/x1e80100-asus-vivobook-s15.txt      | 38 +++++++++++++++++++
 .../hwids/x1e80100-asus-zenbook-a14.txt       | 37 ++++++++++++++++++
 board/efi/efi-arm_app/hwids/x1e80100-crd.txt  | 34 +++++++++++++++++
 .../x1e80100-dell-inspiron-14-plus-7441.txt   | 37 ++++++++++++++++++
 .../hwids/x1e80100-dell-latitude-7455.txt     | 33 ++++++++++++++++
 .../hwids/x1e80100-dell-xps13-9345.txt        | 32 ++++++++++++++++
 .../hwids/x1e80100-hp-omnibook-x14.txt        | 33 ++++++++++++++++
 .../hwids/x1e80100-lenovo-yoga-slim7x.txt     | 32 ++++++++++++++++
 .../hwids/x1e80100-microsoft-denali.txt       | 37 ++++++++++++++++++
 .../hwids/x1e80100-microsoft-romulus13.txt    | 37 ++++++++++++++++++
 .../hwids/x1e80100-microsoft-romulus15.txt    | 37 ++++++++++++++++++
 .../hwids/x1p42100-asus-vivobook-s15.txt      | 37 ++++++++++++++++++
 .../hwids/x1p42100-asus-zenbook-a14.txt       | 37 ++++++++++++++++++
 .../hwids/x1p42100-hp-omnibook-x14.txt        | 33 ++++++++++++++++
 .../hwids/x1p42100-lenovo-ideapad-5-2in1.txt  | 37 ++++++++++++++++++
 .../x1p42100-microsoft-surface-pro-12in.txt   | 37 ++++++++++++++++++
 .../hwids/x1p64100-acer-swift-sf14-11.txt     | 37 ++++++++++++++++++
 30 files changed, 1039 insertions(+)
 create mode 100644 board/efi/efi-arm_app/hwids/msm8998-lenovo-miix-630-81f1.txt
 create mode 100644 board/efi/efi-arm_app/hwids/sc7180-acer-aspire1.txt
 create mode 100644 board/efi/efi-arm_app/hwids/sc8180x-lenovo-flex-5g-81xe.txt
 create mode 100644 board/efi/efi-arm_app/hwids/sc8180x-lenovo-flex-5g-82ak.txt
 create mode 100644 board/efi/efi-arm_app/hwids/sc8280xp-huawei-gaokun3.txt
 create mode 100644 board/efi/efi-arm_app/hwids/sc8280xp-lenovo-thinkpad-x13s-21bx.txt
 create mode 100644 board/efi/efi-arm_app/hwids/sc8280xp-lenovo-thinkpad-x13s-21by.txt
 create mode 100644 board/efi/efi-arm_app/hwids/sc8280xp-microsoft-blackrock.txt
 create mode 100644 board/efi/efi-arm_app/hwids/sc8280xp-microsoft-surface-pro-9-5G.txt
 create mode 100644 board/efi/efi-arm_app/hwids/sdm850-lenovo-yoga-c630.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e001de-devkit.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e78100-lenovo-thinkpad-t14s-21n1.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e78100-lenovo-thinkpad-t14s-21n2.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-asus-vivobook-s15.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-asus-zenbook-a14.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-crd.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-dell-inspiron-14-plus-7441.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-dell-latitude-7455.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-dell-xps13-9345.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-hp-omnibook-x14.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-lenovo-yoga-slim7x.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-microsoft-denali.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-microsoft-romulus13.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1e80100-microsoft-romulus15.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1p42100-asus-vivobook-s15.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1p42100-asus-zenbook-a14.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1p42100-hp-omnibook-x14.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1p42100-lenovo-ideapad-5-2in1.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1p42100-microsoft-surface-pro-12in.txt
 create mode 100644 board/efi/efi-arm_app/hwids/x1p64100-acer-swift-sf14-11.txt
diff mbox series

Patch

diff --git a/board/efi/efi-arm_app/hwids/msm8998-lenovo-miix-630-81f1.txt b/board/efi/efi-arm_app/hwids/msm8998-lenovo-miix-630-81f1.txt
new file mode 100644
index 00000000000..56758dac60e
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/msm8998-lenovo-miix-630-81f1.txt
@@ -0,0 +1,33 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: 8WCN25WW
+Manufacturer: LENOVO
+Family: Miix 630
+ProductName: 81F1
+ProductSku: LENOVO_MT_81F1_BU_idea_FM_Miix 630
+EnclosureKind: 32
+BaseboardManufacturer: LENOVO
+BaseboardProduct: LNVNB161216
+Hardware IDs
+------------
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+{16a55446-eba9-5f97-80e3-5e39d8209bc3}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{c4c9a6be-5383-5de7-af35-c2de505edec8}   <- Manufacturer + Family + ProductName + ProductSku
+{14f581d2-d059-5cb2-9f8b-56d8be7932c9}   <- Manufacturer + Family + ProductName
+{a51054fb-5eef-594a-a5a0-cd87632d0aea}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{307ab358-ed84-57fe-bf05-e9195a28198d}   <- Manufacturer + ProductSku
+{7e613574-5445-5797-9567-2d0ed86e6ffa}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{b0f4463c-f851-5ec3-b031-2ccb873a609a}   <- Manufacturer + ProductName
+{08b75d1f-6643-52a1-9bdd-071052860b33}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{dacf4a59-8e87-55c5-8b93-6912ded6bf7f}   <- Manufacturer + Family
+{d0a8deb1-4cb5-50cd-bdda-595cfc13230c}   <- Manufacturer + EnclosureKind
+{71d86d4d-02f8-5566-a7a1-529cef184b7e}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{34df58d6-b605-50aa-9313-9b34f5c4b6fc}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{e0a96696-f0a6-5466-a6db-207fbe8bae3c}   <- Manufacturer + Family + ProductName + BiosVendor
+{99431f53-09a1-5869-be79-65e2fa3f341d}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/sc7180-acer-aspire1.txt b/board/efi/efi-arm_app/hwids/sc7180-acer-aspire1.txt
new file mode 100644
index 00000000000..77713dc8a81
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/sc7180-acer-aspire1.txt
@@ -0,0 +1,32 @@ 
+Computer Information
+--------------------
+BiosVendor: Phoenix
+BiosVersion: V1.13
+BiosMajorRelease: 1
+BiosMinorRelease: 13
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 07
+Manufacturer: Acer
+Family: Aspire 1
+ProductName: Aspire A114-61
+ProductSku:
+EnclosureKind: a
+BaseboardManufacturer: S7C
+BaseboardProduct: Daisy_7C
+Hardware IDs
+------------
+{45d37dbe-40fb-57bd-a257-55f422d4dc0a}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{373bfde5-ffaa-504c-84f3-f8f5357dfc29}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{e12521bf-0ed8-5406-af87-adad812c57c5}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{faa12ed4-bd49-5471-8f74-75c2267c3b46}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{965e3681-de3b-5e39-bb62-7d4917d7e36f}   <- Manufacturer + Family + ProductName + ProductSku
+{82fe1869-361c-56b2-b853-631747e64aa7}   <- Manufacturer + Family + ProductName
+{7e15f49e-04b4-5d56-a567-e7a15ba2aca1}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{7c107a7f-2d77-51aa-aef8-8d777e26ffbc}   <- Manufacturer + ProductSku
+{68b38fff-aadc-512c-937b-99d9c13eb484}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{260192d4-06d4-5124-ab46-ba210f4c14d7}   <- Manufacturer + ProductName
+{175f000b-3d05-5c01-aedd-817b1a141f93}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{24277a94-7064-500f-9854-5264f20cfa99}   <- Manufacturer + Family
+{92dcc94d-48f7-5ee8-b9ec-a6393fb7a484}   <- Manufacturer + EnclosureKind
+{d234a917-df0b-5453-a3d9-f27c06307395}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{1e301734-5d49-5df4-9ed2-aa1c0a9dddda}   <- Manufacturer
diff --git a/board/efi/efi-arm_app/hwids/sc8180x-lenovo-flex-5g-81xe.txt b/board/efi/efi-arm_app/hwids/sc8180x-lenovo-flex-5g-81xe.txt
new file mode 100644
index 00000000000..d14cc2d1b89
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/sc8180x-lenovo-flex-5g-81xe.txt
@@ -0,0 +1,32 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: EACN41WW(V1.13)
+BiosMajorRelease: 1
+BiosMinorRelease: 41
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 29
+Manufacturer: LENOVO
+Family: Yoga 5G 14Q8CX05
+ProductName: 81XE
+ProductSku: LENOVO_MT_81XE_BU_idea_FM_Yoga 5G 14Q8CX05
+EnclosureKind: 1f
+BaseboardManufacturer: LENOVO
+BaseboardProduct: LNVNB161216
+Hardware IDs
+------------
+{ea646c11-3da1-5c8d-9346-8ff156746650}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{5100eeed-c5e2-5b74-9c24-a22ca0644826}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{ddb3bcda-db7b-579d-9dd9-bcc4f5b052b8}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{fb364c09-efc0-5d16-ac97-0a3e6235b16c}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{7e7007ac-603c-55ef-bb77-3548784b9578}   <- Manufacturer + Family + ProductName + ProductSku
+{566b9ae8-a7fd-5c44-94d6-bac3e4cf38a7}   <- Manufacturer + Family + ProductName
+{6f3bdfb7-f832-5c5f-9777-9e3db35e22a6}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{c4ea686c-c56c-5e8e-a91e-89056683d417}   <- Manufacturer + ProductSku
+{a1a13249-2689-5c6d-a43f-98af040284c4}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{01439aea-e75c-5fbb-8842-18dcd1a7b8b3}   <- Manufacturer + ProductName
+{65ab9f32-bbc8-52d3-87f9-b618fda7c07e}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{41ba2569-88df-57d4-b5e3-350ff985434a}   <- Manufacturer + Family
+{32b7e294-a252-5a72-b3c6-6197f08c64f1}   <- Manufacturer + EnclosureKind
+{71d86d4d-02f8-5566-a7a1-529cef184b7e}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
diff --git a/board/efi/efi-arm_app/hwids/sc8180x-lenovo-flex-5g-82ak.txt b/board/efi/efi-arm_app/hwids/sc8180x-lenovo-flex-5g-82ak.txt
new file mode 100644
index 00000000000..183cfa19a02
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/sc8180x-lenovo-flex-5g-82ak.txt
@@ -0,0 +1,33 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: EACN43WW(V1.15)
+BiosMajorRelease: 1
+BiosMinorRelease: 43
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 2b
+Manufacturer: LENOVO
+Family: Flex 5G 14Q8CX05
+ProductName: 82AK
+ProductSku: LENOVO_MT_82AK_BU_idea_FM_Flex 5G 14Q8CX05
+EnclosureKind: 1f
+BaseboardManufacturer: LENOVO
+BaseboardProduct: LNVNB161216
+Hardware IDs
+------------
+{ad47f2e9-2f8c-5cd1-a44e-82f35a43e44e}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{997c1c76-5595-5300-9f58-94d2c6ffc586}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{b9bf941f-3a32-57da-b609-5fff7fb382cd}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{ea658d2b-f644-555d-9b72-e1642401a795}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{fb5c3077-39d5-5a44-97ce-2d3be5f6bfec}   <- Manufacturer + Family + ProductName + ProductSku
+{16551bd5-37b0-571d-a94c-da61a9cfccf5}   <- Manufacturer + Family + ProductName
+{df3ecc56-b61b-5f8e-896f-801a42b536d6}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{06675172-9a6e-5276-a505-d205688a87f0}   <- Manufacturer + ProductSku
+{23dcfb84-d132-5f60-878e-64fe0b9417d6}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{12c0e5b0-8886-5444-b42b-93692fa736df}   <- Manufacturer + ProductName
+{39fca706-c9a2-54d4-8c7c-d5e292d0a725}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{6e266ee4-0ba4-561c-9758-9fd4876af2e2}   <- Manufacturer + Family
+{32b7e294-a252-5a72-b3c6-6197f08c64f1}   <- Manufacturer + EnclosureKind
+{71d86d4d-02f8-5566-a7a1-529cef184b7e}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
+
diff --git a/board/efi/efi-arm_app/hwids/sc8280xp-huawei-gaokun3.txt b/board/efi/efi-arm_app/hwids/sc8280xp-huawei-gaokun3.txt
new file mode 100644
index 00000000000..5b406a0ba94
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/sc8280xp-huawei-gaokun3.txt
@@ -0,0 +1,38 @@ 
+Computer Information
+--------------------
+BiosVendor: HUAWEI
+BiosVersion: 2.16
+BiosMajorRelease: 2
+BiosMinorRelease: 16
+FirmwareMajorRelease: 02
+FirmwareMinorRelease: 10
+Manufacturer: HUAWEI
+Family: MateBook E
+ProductName: GK-W7X
+ProductSku: C233
+EnclosureKind: 20
+BaseboardManufacturer: HUAWEI
+BaseboardProduct: GK-W7X-PCB
+Hardware IDs
+------------
+{80c86c24-c7a7-5714-abf2-4c48f348cecc}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{1c2effc1-1038-584d-ae8b-7c912c8e9504}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{6eb75906-3a4e-5de4-94c5-374d8f9723e5}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{4f04f31f-17f0-583f-802f-82c3a0b34128}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{e1b94e53-0f20-5d01-abfc-cfb348544a31}   <- Manufacturer + Family + ProductName + ProductSku
+{b866fc5c-261b-56d8-99e8-03ea0646af8f}   <- Manufacturer + Family + ProductName
+{d8846172-f0a0-55ba-bf41-55641f588ea7}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{7ea8b73b-2cbb-562b-aecc-7f0f64c42630}   <- Manufacturer + ProductSku
+{3eb6683b-0153-5365-81c6-cc599783e9c7}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{e5a0ed2b-7fed-5e2d-94ed-43dbaf0b9ccc}   <- Manufacturer + ProductName
+{0c78ef16-4fe0-5e33-908e-b038949ee608}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{8187555f-3681-5463-a0fa-e6b74e49d4c1}   <- Manufacturer + Family
+{39bed59d-bfe0-5938-9a76-b2f4739af786}   <- Manufacturer + EnclosureKind
+{c562b393-1c28-5cc3-a77c-c13c798e5698}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{0df4aa3f-2706-51d4-9296-80119e47f1e1}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{e98c95a8-b50e-5d8b-b2db-c679a39163df}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{13311789-793f-5d95-942c-3b6414a8ad1a}   <- Manufacturer + Family + ProductName + BiosVendor
+{04798471-7c9b-5189-b99b-4d19e1a6fa89}   <- Manufacturer + BiosVendor
+
diff --git a/board/efi/efi-arm_app/hwids/sc8280xp-lenovo-thinkpad-x13s-21bx.txt b/board/efi/efi-arm_app/hwids/sc8280xp-lenovo-thinkpad-x13s-21bx.txt
new file mode 100644
index 00000000000..510e1feda9e
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/sc8280xp-lenovo-thinkpad-x13s-21bx.txt
@@ -0,0 +1,33 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: N3HET88W (1.60 )
+BiosMajorRelease: 1
+BiosMinorRelease: 60
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 17
+Manufacturer: LENOVO
+Family: ThinkPad X13s Gen 1
+ProductName: 21BXCTO1WW
+ProductSku: LENOVO_MT_21BX_BU_Think_FM_ThinkPad X13s Gen 1
+EnclosureKind: a
+BaseboardManufacturer: LENOVO
+BaseboardProduct: 21BXCTO1WW
+Hardware IDs
+------------
+{810e34c6-cc69-5e36-8675-2f6e354272d3}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{f22c935e-2dc8-5949-9486-09bbf10361b2}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{abdbb2cb-ab52-5674-9d0a-2e2cb69bcbb4}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{ddf28a3f-43fc-54a4-a6a7-4cba5ad46b3e}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{4df470e6-7878-5b0f-b2e0-733d5d9fa228}   <- Manufacturer + Family + ProductName + ProductSku
+{3ad863ab-0181-5a2f-9cc1-70eedc446da9}   <- Manufacturer + Family + ProductName
+{69c47e1e-fde2-5062-b777-acbeab73784b}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{3486eccc-d0ac-534a-9e2f-a1c18bc310c6}   <- Manufacturer + ProductSku
+{c869f39e-f205-5ca0-be7b-d90f90ef5556}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{b470d002-ad8e-5d5c-a7bf-bb1333f2ce4b}   <- Manufacturer + ProductName
+{64b71f12-4341-5e5c-b7cd-25b6503799e3}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{f249803d-0d95-54f3-a28f-f26c14a03f3b}   <- Manufacturer + Family
+{e093d715-70f7-51f4-b6c8-b4a7e31def85}   <- Manufacturer + EnclosureKind
+{156c9b34-bedb-5bfd-ae1f-ef5d2a994967}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
+
diff --git a/board/efi/efi-arm_app/hwids/sc8280xp-lenovo-thinkpad-x13s-21by.txt b/board/efi/efi-arm_app/hwids/sc8280xp-lenovo-thinkpad-x13s-21by.txt
new file mode 100644
index 00000000000..889f50b0082
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/sc8280xp-lenovo-thinkpad-x13s-21by.txt
@@ -0,0 +1,32 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: N3HET86W (1.58 )
+BiosMajorRelease: 1
+BiosMinorRelease: 58
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 17
+Manufacturer: LENOVO
+Family: ThinkPad X13s Gen 1
+ProductName: 21BYS03Y00
+ProductSku: LENOVO_MT_21BY_BU_Think_FM_ThinkPad X13s Gen 1
+EnclosureKind: a
+BaseboardManufacturer: LENOVO
+BaseboardProduct: 21BYS03Y00
+Hardware IDs
+------------
+{b265d777-007e-56e5-b0e2-bd666ab867be}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{3f9d2d91-73b2-5316-8c72-a0ecb3f0dae5}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{4b189129-8eb2-585c-a1bb-a4cfc979433a}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{fbf92a11-bb6f-5adb-b5a7-8abf9acbd7d9}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{0909a1c3-3a02-59a0-b1ea-04f1449c104f}   <- Manufacturer + Family + ProductName + ProductSku
+{69acf6bf-ed33-5806-857f-c76971d7061e}   <- Manufacturer + Family + ProductName
+{ddfbdaa2-7c46-5103-be64-84a9f88c485f}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{b41f58ed-7631-561f-9b0c-449a9c293afa}   <- Manufacturer + ProductSku
+{9f47e28f-e1ee-5cb5-b4ce-8f0605752b3d}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{873455fb-b2c5-5c0c-9c2c-90e80d44da57}   <- Manufacturer + ProductName
+{a1dfe209-99e5-5ff2-9922-aa4c11491b49}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{f249803d-0d95-54f3-a28f-f26c14a03f3b}   <- Manufacturer + Family
+{e093d715-70f7-51f4-b6c8-b4a7e31def85}   <- Manufacturer + EnclosureKind
+{920b6e26-11c6-5beb-8643-fcf5cd74033f}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
diff --git a/board/efi/efi-arm_app/hwids/sc8280xp-microsoft-blackrock.txt b/board/efi/efi-arm_app/hwids/sc8280xp-microsoft-blackrock.txt
new file mode 100644
index 00000000000..92aac0c2b3b
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/sc8280xp-microsoft-blackrock.txt
@@ -0,0 +1,32 @@ 
+Computer Information
+--------------------
+BiosVendor: Microsoft Corporation
+BiosVersion: 12.6.235
+BiosMajorRelease: 255
+BiosMinorRelease: 255
+FirmwareMajorRelease: ff
+FirmwareMinorRelease: ff
+Manufacturer: Microsoft Corporation
+Family: Surface
+ProductName: Windows Dev Kit 2023
+ProductSku: 2043
+EnclosureKind: 3
+BaseboardManufacturer: Microsoft Corporation
+BaseboardProduct: Windows Dev Kit 2023
+Hardware IDs
+------------
+{69ba0503-ca94-5fa3-b78c-5fa21a66c620}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{ad2ee931-a048-5253-b350-98c482670765}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{5bd24fc5-5edb-51f6-82e6-31a9ef954c5b}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{d67e799e-2ba7-555a-a874-a0523a8b3b11}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{813677fa-6d11-5756-a44d-dde0f552d3f6}   <- Manufacturer + Family + ProductName + ProductSku
+{ce83144b-b123-59e5-8a9a-0c1a13643fc4}   <- Manufacturer + Family + ProductName
+{53b87f48-fc47-54e9-ade5-f1a95e885681}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{046fefee-341b-5c40-b0a3-1c647d31b500}   <- Manufacturer + ProductSku
+{f59639f4-4970-5706-9a75-519dd059f69e}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{08f06457-aa19-51c5-be4c-0087ce4fa2ed}   <- Manufacturer + ProductName
+{11b80238-dbee-57bc-8b26-83c9e5b4057d}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{ca2e5189-1d32-509f-88a0-d4ebcc721899}   <- Manufacturer + Family
+{7ce6d32b-3711-5701-b31a-cc79f61a5719}   <- Manufacturer + EnclosureKind
+{2c1da402-8915-572d-a493-c966d32f96cb}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{cc0aea32-ad2c-5013-8bed-cede6be8c9f4}   <- Manufacturer
diff --git a/board/efi/efi-arm_app/hwids/sc8280xp-microsoft-surface-pro-9-5G.txt b/board/efi/efi-arm_app/hwids/sc8280xp-microsoft-surface-pro-9-5G.txt
new file mode 100644
index 00000000000..615817ceb8d
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/sc8280xp-microsoft-surface-pro-9-5G.txt
@@ -0,0 +1,32 @@ 
+Computer Information
+--------------------
+BiosVendor: Microsoft Corporation
+BiosVersion: 17.4.235
+BiosMajorRelease: 255
+BiosMinorRelease: 255
+FirmwareMajorRelease: ff
+FirmwareMinorRelease: ff
+Manufacturer: Microsoft Corporation
+Family: Surface
+ProductName: Surface Pro 9
+ProductSku: Surface_Pro_9_With_5G_1996
+EnclosureKind: 9
+BaseboardManufacturer: Microsoft Corporation
+BaseboardProduct: Surface Pro 9
+Hardware IDs
+------------
+{e3d941fa-2bfa-5875-8efd-87ce997f8338}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{a659ee2b-502d-50f7-9921-bdbd34734e0b}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{5caa88bc-ea9b-5d73-a69a-89024bfff854}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{c0cf7078-c325-5cf6-966b-3bbbc155275b}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{6309fbb9-68f4-54f9-bbc9-b3ca9685b48c}   <- Manufacturer + Family + ProductName + ProductSku
+{9d70dcfd-f56b-58bf-b1bd-a1b8f2b0ec7e}   <- Manufacturer + Family + ProductName
+{9bac72c6-83f6-5e21-af8e-bc1f5c2b7cc8}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{94fb24a7-ff7a-5d70-9ac8-518a9e44ea64}   <- Manufacturer + ProductSku
+{009d2337-4f76-514e-b2c1-b2816447b048}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{3a486e6f-3b0a-5603-a483-503381d3d8c3}   <- Manufacturer + ProductName
+{636b6071-7848-50d5-b0b5-6290c49e9306}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{ca2e5189-1d32-509f-88a0-d4ebcc721899}   <- Manufacturer + Family
+{aca387a9-183e-5da9-8f9d-f460c3f50f54}   <- Manufacturer + EnclosureKind
+{7fa0755a-ec45-59cd-a206-bb9a956b030f}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{cc0aea32-ad2c-5013-8bed-cede6be8c9f4}   <- Manufacturer
diff --git a/board/efi/efi-arm_app/hwids/sdm850-lenovo-yoga-c630.txt b/board/efi/efi-arm_app/hwids/sdm850-lenovo-yoga-c630.txt
new file mode 100644
index 00000000000..a8d745389a5
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/sdm850-lenovo-yoga-c630.txt
@@ -0,0 +1,32 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: 9UCN33WW(V2.06)
+BiosMajorRelease: 1
+BiosMinorRelease: 33
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 21
+Manufacturer: LENOVO
+Family: YOGA C630-13Q50
+ProductName: 81JL
+ProductSku: LENOVO_MT_81JL_BU_idea_FM_YOGA C630-13Q50
+EnclosureKind: 20
+BaseboardManufacturer: LENOVO
+BaseboardProduct: LNVNB161216
+Hardware IDs
+------------
+{b8c71349-3669-56f3-99ee-ae473a2edd96}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{d17c132e-f06e-5e38-8084-9cd642dd9b34}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{8f56cf17-7bdd-5414-832d-97cd26837114}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{b323d38a-88c6-5cf6-af0d-0db3f3c2560d}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{43b71948-9c47-5372-a5cb-18db47bb873f}   <- Manufacturer + Family + ProductName + ProductSku
+{67a23be6-42a6-5900-8325-847a318ce252}   <- Manufacturer + Family + ProductName
+{94f73d29-3981-59a8-8f25-214f84d1522a}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{5ca3cf2b-d6e9-5b54-93f7-1cebd7b3704f}   <- Manufacturer + ProductSku
+{81f308c0-db65-50c2-a660-52e06fc0ff9f}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{30b031c0-9de7-5d31-a61c-dee772871b7d}   <- Manufacturer + ProductName
+{382926c0-ce35-53af-8ff9-ca9cc06cfc7b}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{dd3a12ef-e928-519d-83d7-6674a2ae0ffa}   <- Manufacturer + Family
+{6c95fc34-96cc-5c9f-8e78-6baaffde78ce}   <- Manufacturer + EnclosureKind
+{71d86d4d-02f8-5566-a7a1-529cef184b7e}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
diff --git a/board/efi/efi-arm_app/hwids/x1e001de-devkit.txt b/board/efi/efi-arm_app/hwids/x1e001de-devkit.txt
new file mode 100644
index 00000000000..55245415589
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e001de-devkit.txt
@@ -0,0 +1,30 @@ 
+Computer Information
+--------------------
+BiosVendor: Qualcomm Technologies, Inc.
+BiosVersion: 6.0.240901.BOOT.MXF.2.4-00468-HAMOA-1
+Manufacturer: Qualcomm
+Family: SCP_HAMOA
+ProductName: Snapdragon-Devkit
+ProductSku: 6
+Hardware IDs
+------------
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+not available as 'BaseboardManufacturer' unknown
+{baa7a649-12d8-56c7-93c5-a4e10f4852be}   <- Manufacturer + Family + ProductName + ProductSku
+{c8e75ab8-555c-5952-a3e3-5b607bea031d}   <- Manufacturer + Family + ProductName
+not available as 'BaseboardManufacturer' unknown
+{4bb05d50-6c4f-525d-a9ec-8924afd6edea}   <- Manufacturer + ProductSku
+not available as 'BaseboardManufacturer' unknown
+{830bd4a2-2498-55cf-b561-48f7dc5f4820}   <- Manufacturer + ProductName
+not available as 'BaseboardManufacturer' unknown
+{b36a40fa-4640-5b1b-8fa1-6dbde103c80d}   <- Manufacturer + Family
+not available as 'EnclosureKind' unknown
+not available as 'BaseboardManufacturer' unknown
+{0d601876-0ac6-533e-8386-3a58203d8c33}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{f37dc44b-0be4-5a70-86bd-81f3dacff2e9}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{9cba20d0-17ad-559f-94cd-cfcbbf5f71f5}   <- Manufacturer + Family + ProductName + BiosVendor
+{d86bea02-5d71-5ee5-98dc-4f74d5777dde}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1e78100-lenovo-thinkpad-t14s-21n1.txt b/board/efi/efi-arm_app/hwids/x1e78100-lenovo-thinkpad-t14s-21n1.txt
new file mode 100644
index 00000000000..1a92dfbd5f4
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e78100-lenovo-thinkpad-t14s-21n1.txt
@@ -0,0 +1,38 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: N42ET53W (1.27 )
+BiosMajorRelease: 1
+BiosMinorRelease: 27
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 0f
+Manufacturer: LENOVO
+Family: ThinkPad T14s Gen 6
+ProductName: 21N10001US
+ProductSku: LENOVO_MT_21N1_BU_Think_FM_ThinkPad T14s Gen 6
+EnclosureKind: a
+BaseboardManufacturer: LENOVO
+BaseboardProduct: 21N10001US
+Hardware IDs
+------------
+{c81fee2f-cf41-5d5a-8c7b-afd6585b1d81}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{a9b59fea-e841-508a-a245-3a2d8d2802de}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{74593764-b6b9-58e9-bedc-93ebbb1eb057}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{e5d83424-0ecb-5632-b7b1-500f04e82725}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{76032e78-67a8-5dab-8512-157bfcfb8f75}   <- Manufacturer + Family + ProductName + ProductSku
+{dd83478e-e01b-5631-ae74-92ae275a9b4e}   <- Manufacturer + Family + ProductName
+{791ecd9d-1547-58e6-b72a-5ce417b729dd}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{8c602147-5363-5374-859e-8b7fe2d4d3ce}   <- Manufacturer + ProductSku
+{498d60ae-9b1d-5b67-8abd-af571babfa94}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{acbac5af-aa6a-5690-88f3-e910f04a7ead}   <- Manufacturer + ProductName
+{5180bc01-5d18-5870-b955-969da38b2647}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{431ff9e9-cd92-51c1-8917-46b0a0ef147c}   <- Manufacturer + Family
+{e093d715-70f7-51f4-b6c8-b4a7e31def85}   <- Manufacturer + EnclosureKind
+{c124cecf-e6dc-5d35-a320-712980cfb68d}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{19b622ef-27fe-5c2e-bc53-13a79b862c65}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{ac09e50f-9b3b-53c0-9752-377c3a0baaa0}   <- Manufacturer + Family + ProductName + BiosVendor
+{99431f53-09a1-5869-be79-65e2fa3f341d}   <- Manufacturer + BiosVendor
+
diff --git a/board/efi/efi-arm_app/hwids/x1e78100-lenovo-thinkpad-t14s-21n2.txt b/board/efi/efi-arm_app/hwids/x1e78100-lenovo-thinkpad-t14s-21n2.txt
new file mode 100644
index 00000000000..91ced06fbee
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e78100-lenovo-thinkpad-t14s-21n2.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: N42ET88W (2.18 )
+BiosMajorRelease: 2
+BiosMinorRelease: 18
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 1b
+Manufacturer: LENOVO
+Family: ThinkPad T14s Gen 6
+ProductName: 21N2ZC5QUS
+ProductSku: LENOVO_MT_21N2_BU_Think_FM_ThinkPad T14s Gen 6
+EnclosureKind: a
+BaseboardManufacturer: LENOVO
+BaseboardProduct: 21N2ZC5QUS
+Hardware IDs
+------------
+{1d9f3ebb-96de-5dd6-8c88-38308b0c1c44}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{578dd7d5-5871-5bd5-92a9-be07f1067b92}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{ed647f93-3075-598b-9d89-d0f30ec11707}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{f6cd4a9f-9632-516e-b748-65952f7380c5}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{a5a4e3c1-5922-5ed6-b78e-9f0ea873a988}   <- Manufacturer + Family + ProductName + ProductSku
+{a20ae3ec-49a1-5cb5-acb8-5d31c77b105a}   <- Manufacturer + Family + ProductName
+{8cfd85bb-0d77-59df-8546-264239be475e}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{513976f8-3f51-5b42-9ae0-931ce23c5f38}   <- Manufacturer + ProductSku
+{86a0d770-3ca1-57fa-ac05-413481c00a24}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{5c20e964-d530-5dd7-9efd-4aed9e73c3cb}   <- Manufacturer + ProductName
+{d93b21c0-5ed9-5955-911a-5b15f114d786}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{431ff9e9-cd92-51c1-8917-46b0a0ef147c}   <- Manufacturer + Family
+{e093d715-70f7-51f4-b6c8-b4a7e31def85}   <- Manufacturer + EnclosureKind
+{62631c9b-2642-5d4f-b7e2-1b917809d08d}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{82fa4a02-8c3c-55f9-b0c9-e8feb669fd3a}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{34e7fadd-9c7d-5f91-ba7f-cedb04d59b9a}   <- Manufacturer + Family + ProductName + BiosVendor
+{99431f53-09a1-5869-be79-65e2fa3f341d}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-asus-vivobook-s15.txt b/board/efi/efi-arm_app/hwids/x1e80100-asus-vivobook-s15.txt
new file mode 100644
index 00000000000..e3ee52c2896
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-asus-vivobook-s15.txt
@@ -0,0 +1,38 @@ 
+Computer Information
+--------------------
+BiosVendor: Insyde
+BiosVersion: S5507QAD.307
+BiosMajorRelease: 1
+BiosMinorRelease: 27
+FirmwareMajorRelease: 03
+FirmwareMinorRelease: 02
+Manufacturer: ASUSTeK COMPUTER INC.
+Family: ASUS Vivobook S 15
+ProductName: ASUS Vivobook S 15 S5507QA_S5507QAD
+ProductSku: (null)
+EnclosureKind: a
+BaseboardManufacturer: ASUSTeK COMPUTER INC.
+BaseboardProduct: S5507QAD
+Hardware IDs
+------------
+{6d634332-21fc-57c8-bc6b-e0f800f69f95}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{d0fce8d6-a709-5bf0-8be0-6ac6ab44b8e0}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{80430e03-90f0-5355-84b2-28fb17367203}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{fa342b0a-9e22-541f-8e95-93106778f97d}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{137a5f94-8fcf-5581-8ac6-70d50fdba4a6}   <- Manufacturer + Family + ProductName + ProductSku
+{3a3ef092-d5f1-5d4d-acea-70b38ef56e53}   <- Manufacturer + Family + ProductName
+{a6debedb-f954-5aa1-8260-4dc3b567c95f}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{f3a6ca3e-4791-5bb0-915e-0b31856ec19c}   <- Manufacturer + ProductSku
+{4262e277-58d3-5ac4-9858-c0751ad06f5c}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{f54cd4e6-3666-5b56-abd3-a5f2df50c534}   <- Manufacturer + ProductName
+{807fe49f-cfd2-537d-b635-47bec9e36baf}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{51df1ece-cd39-547a-8f9f-8f036fcfe752}   <- Manufacturer + Family
+{665276be-80c5-5e5d-929f-fa85d18e2d50}   <- Manufacturer + EnclosureKind
+{05cd2c3f-53cc-5239-94db-f7a00903ac1d}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{65605ed1-09e2-57aa-bd0f-a26c1d35433f}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{c71e903b-4255-56cb-b961-a8f87b452cbe}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{1b6a0689-3f70-57e0-8bf3-39a8a74213e8}   <- Manufacturer + Family + ProductName + BiosVendor
+{9d1b57fb-8282-5287-bd50-3c93d43921fa}   <- Manufacturer + BiosVendor
+
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-asus-zenbook-a14.txt b/board/efi/efi-arm_app/hwids/x1e80100-asus-zenbook-a14.txt
new file mode 100644
index 00000000000..e9f75d30cca
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-asus-zenbook-a14.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: Insyde
+BiosVersion: UX3407RA.305
+BiosMajorRelease: 3
+BiosMinorRelease: 5
+FirmwareMajorRelease: 03
+FirmwareMinorRelease: 0b
+Manufacturer: ASUSTeK COMPUTER INC.
+Family: ASUS Zenbook A14
+ProductName: ASUS Zenbook A14 UX3407RA_UX3407RA
+ProductSku:
+EnclosureKind: a
+BaseboardManufacturer: ASUSTeK COMPUTER INC.
+BaseboardProduct: UX3407RA
+Hardware IDs
+------------
+{c41d2cda-fda7-522c-b1a7-4a835c15c43d}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{0bfddfaf-e393-5dfe-a805-39b8b1098c81}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{f0bb1cd4-995a-5c90-946b-9bb958f35f42}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{2d610a5e-ef69-5e60-b15e-7786d0ebd79e}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{6f892377-a51e-5f99-a363-b79f28fc55f9}   <- Manufacturer + Family + ProductName + ProductSku
+{0c3f5e9c-eddb-5ba2-88ee-06ae0221a53d}   <- Manufacturer + Family + ProductName
+{20b8b77d-e450-550b-b1ff-55d3317f59a6}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{24652d54-00f4-59ae-96fb-f7adbfa4a939}   <- Manufacturer + ProductSku
+{5c9fc73f-f915-52bf-a82d-9c7fe2274ecc}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{3884ad58-4d63-589a-be98-b8ab1ddf3b93}   <- Manufacturer + ProductName
+{cedbcc19-3a5a-5bae-9973-f8e158188de7}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{c5647aaf-bd0a-5863-bdda-49afd00c5329}   <- Manufacturer + Family
+{665276be-80c5-5e5d-929f-fa85d18e2d50}   <- Manufacturer + EnclosureKind
+{1038788a-2a89-5898-8292-9db114671c04}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{65605ed1-09e2-57aa-bd0f-a26c1d35433f}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{1f2f1045-a811-5e42-b31e-b433e384fc79}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{b307ab54-c79d-58ca-a3b2-d1b1e325bfc3}   <- Manufacturer + Family + ProductName + BiosVendor
+{9d1b57fb-8282-5287-bd50-3c93d43921fa}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-crd.txt b/board/efi/efi-arm_app/hwids/x1e80100-crd.txt
new file mode 100644
index 00000000000..90b7aef7c3f
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-crd.txt
@@ -0,0 +1,34 @@ 
+Computer Information
+--------------------
+BiosVendor: Qualcomm Technologies, Inc.
+BiosVersion: 6.0.240718.BOOT.MXF.2.4-00515-HAMOA-1
+BiosMajorRelease: 255
+BiosMinorRelease: 255
+FirmwareMajorRelease: 00
+FirmwareMinorRelease: 14
+Manufacturer: Qualcomm
+Family: SCP_HAMOA
+ProductName: CRD
+ProductSku: 6
+Hardware IDs
+------------
+{e73870a5-90e8-528d-93fd-3da59f78df18}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{2405af0b-d21d-5196-a228-4acffe7b3a10}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{8fa88c58-23eb-5aea-9ea7-c4a98ded7352}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+not available as 'BaseboardManufacturer' unknown
+{7faef667-9eb2-53f4-9764-26fe0e92fbff}   <- Manufacturer + Family + ProductName + ProductSku
+{b6d4eee8-30f3-564a-8246-e83935cf8dbb}   <- Manufacturer + Family + ProductName
+not available as 'BaseboardManufacturer' unknown
+{4bb05d50-6c4f-525d-a9ec-8924afd6edea}   <- Manufacturer + ProductSku
+not available as 'BaseboardManufacturer' unknown
+{339fc6d2-e0f4-5226-9dd9-62c4dc41881d}   <- Manufacturer + ProductName
+not available as 'BaseboardManufacturer' unknown
+{b36a40fa-4640-5b1b-8fa1-6dbde103c80d}   <- Manufacturer + Family
+not available as 'EnclosureKind' unknown
+not available as 'BaseboardManufacturer' unknown
+{0d601876-0ac6-533e-8386-3a58203d8c33}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{d52e3fb6-202c-5cfa-a27c-e3ffe15339fb}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{361b3d63-be90-52c2-8798-a05fbd68b773}   <- Manufacturer + Family + ProductName + BiosVendor
+{d86bea02-5d71-5ee5-98dc-4f74d5777dde}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-dell-inspiron-14-plus-7441.txt b/board/efi/efi-arm_app/hwids/x1e80100-dell-inspiron-14-plus-7441.txt
new file mode 100644
index 00000000000..a428e313657
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-dell-inspiron-14-plus-7441.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: Dell Inc.
+BiosVersion: 2.9.0
+BiosMajorRelease: 2
+BiosMinorRelease: 9
+FirmwareMajorRelease: ff
+FirmwareMinorRelease: ff
+Manufacturer: Dell Inc.
+Family: Inspiron
+ProductName: Inspiron 14 Plus 7441
+ProductSku: C86
+EnclosureKind: a
+BaseboardManufacturer: Dell Inc.
+BaseboardProduct: YWPR3
+Hardware IDs
+------------
+{4689ccaf-4f31-5146-887f-ca965da0f28a}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{e4c9fe83-73ba-5160-bc18-57d4a98e960d}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{efc06900-f603-5944-88e5-4de722816f91}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{90117b25-1646-515b-bfeb-286e74f2a1e8}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{c1190be1-8ed5-50f1-9097-2a73ad9c4eb1}   <- Manufacturer + Family + ProductName + ProductSku
+{0d9ce3bc-620c-5209-9e82-7382cb6cffcd}   <- Manufacturer + Family + ProductName
+{ff394805-0b5f-52f6-9e1d-afb1d2bee411}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{07c6477a-7ef7-56c7-91d9-73d23295b0c0}   <- Manufacturer + ProductSku
+{a66b1244-0027-5451-a96a-dfcfc42ab892}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{ef84110e-bd09-5f0f-a3dd-7995b4a3a706}   <- Manufacturer + ProductName
+{07c6bbd9-caf8-5025-84d8-4efdb790f663}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{717bca8b-c237-5776-9736-3922a63c6938}   <- Manufacturer + Family
+{5c163113-9296-5c8d-a92d-ae04eb59a0f7}   <- Manufacturer + EnclosureKind
+{f27f8f9a-723c-5e17-933c-bdc4bbce3bce}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{85d38fda-fc0e-5c6f-808f-076984ae7978}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{bea2e67a-b660-5044-8acd-0d28e8c2e974}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{8548ce7c-fdf3-55d0-95ba-606ca8db50da}   <- Manufacturer + Family + ProductName + BiosVendor
+{36cb5c6e-fb91-55e9-8077-e004f2b1ddad}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-dell-latitude-7455.txt b/board/efi/efi-arm_app/hwids/x1e80100-dell-latitude-7455.txt
new file mode 100644
index 00000000000..2708078530a
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-dell-latitude-7455.txt
@@ -0,0 +1,33 @@ 
+Computer Information
+--------------------
+BiosVendor: Dell Inc.
+BiosVersion: 2.8.0
+Manufacturer: Dell Inc.
+Family: Latitude
+ProductName: Latitude 7455
+ProductSku: 0C85
+EnclosureKind: 10
+BaseboardManufacturer: Dell Inc.
+BaseboardProduct: 0FK7MX
+Hardware IDs
+------------
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+{903e3a6f-e14b-5643-9d55-244f917aadb6}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{59e5c810-9e60-5a89-8665-db36c56b34d6}   <- Manufacturer + Family + ProductName + ProductSku
+{2b9277cd-85b1-51ee-9a38-d477632532da}   <- Manufacturer + Family + ProductName
+{6e01222b-b2aa-531e-b95f-0e4b2a063364}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{93055898-8c85-50e7-adde-8115f194579a}   <- Manufacturer + ProductSku
+{b3e5b59d-84ae-597d-9222-8a4d48480bc3}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{4f73f73b-e639-5353-bbf7-d851e48f18fc}   <- Manufacturer + ProductName
+{68822228-a3e0-5b12-942d-9408751405d1}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{41b0b5d7-ad12-5d86-9a3d-826f9b20adcc}   <- Manufacturer + Family
+{a26f8d6d-d9ab-5705-939a-aec8fed37cd4}   <- Manufacturer + EnclosureKind
+{cb846e91-7a9f-564f-8f33-6cf5bc04a5b8}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{85d38fda-fc0e-5c6f-808f-076984ae7978}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{683e4579-8440-5bc1-89ac-dfcd7c25b307}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{fb7493ec-9634-5c5a-9f26-69cbf9b92460}   <- Manufacturer + Family + ProductName + BiosVendor
+{36cb5c6e-fb91-55e9-8077-e004f2b1ddad}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-dell-xps13-9345.txt b/board/efi/efi-arm_app/hwids/x1e80100-dell-xps13-9345.txt
new file mode 100644
index 00000000000..53ce9547f46
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-dell-xps13-9345.txt
@@ -0,0 +1,32 @@ 
+Computer Information
+--------------------
+BiosVendor: Dell Inc.
+BiosVersion: 2.0.0
+BiosMajorRelease: 2
+BiosMinorRelease: 0
+FirmwareMajorRelease: ff
+FirmwareMinorRelease: ff
+Manufacturer: Dell Inc.
+Family: XPS
+ProductName: XPS 13 9345
+ProductSku: C69
+EnclosureKind: a
+BaseboardManufacturer: Dell Inc.
+BaseboardProduct: DXPNM
+Hardware IDs
+------------
+{eedeb5d9-1a0e-56e6-9137-eb6a723e58d1}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{1eb87d70-2f37-5f18-85de-30e46c17d540}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{1d1baf60-e2f3-5821-9d98-19a131bf8d93}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{7c7c2920-cb59-56ad-bc8a-939e803b0192}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{940c6349-f0a5-54ba-8deb-10e709e0b76c}   <- Manufacturer + Family + ProductName + ProductSku
+{3b9a1d76-f2e8-52e8-84de-14c5942b3d41}   <- Manufacturer + Family + ProductName
+{3c2649a7-2275-5130-a0c4-cc5f9809a2c1}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{36e8dd88-512d-5a74-86a4-039333f9e15a}   <- Manufacturer + ProductSku
+{e656b5f2-69c3-55da-bf22-4dd58d5f6d4f}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{bc685cec-e979-5cb9-bf02-e15586c7cb4b}   <- Manufacturer + ProductName
+{81972cb8-6fc7-5e08-b140-b0063ed4fefa}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{61178075-a8fd-563c-9045-44227d8c121f}   <- Manufacturer + Family
+{5c163113-9296-5c8d-a92d-ae04eb59a0f7}   <- Manufacturer + EnclosureKind
+{1302793c-52b1-5354-b1cf-f2cd9206c157}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{85d38fda-fc0e-5c6f-808f-076984ae7978}   <- Manufacturer
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-hp-omnibook-x14.txt b/board/efi/efi-arm_app/hwids/x1e80100-hp-omnibook-x14.txt
new file mode 100644
index 00000000000..0594b0d82f9
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-hp-omnibook-x14.txt
@@ -0,0 +1,33 @@ 
+Computer Information
+--------------------
+BiosVendor: Insyde
+BiosVersion: F.09
+Manufacturer: HP
+Family: 103C_5335M8 HP OmniBook X
+ProductName: HP OmniBook X Laptop 14-fe0xxx
+ProductSku: A3NY2EA#ABD
+EnclosureKind: 10
+BaseboardManufacturer: HP
+BaseboardProduct: 8CBE
+Hardware IDs
+------------
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+{045dfd0f-068b-5e57-86bd-f41b4b906006}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{ca5dab4f-a301-53c6-b753-c2db56172e0a}   <- Manufacturer + Family + ProductName + ProductSku
+{811126e6-4aee-5f9e-827d-d0f12f6a6f00}   <- Manufacturer + Family + ProductName
+{6a4511bc-0a3b-5b10-9c8b-dbcb834ecd83}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{abb2ffec-2acd-5750-8dfd-c3845fd4bf2a}   <- Manufacturer + ProductSku
+{1a192aee-2cfd-5ab5-95f9-8093218a48ef}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{eaab52c6-ed22-5e1b-b788-fc5a0531291d}   <- Manufacturer + ProductName
+{848aeb1d-302b-5b6b-9109-0f4632535915}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{5d43face-6ba8-5d41-8914-12f3410bbcf9}   <- Manufacturer + Family
+{4c84c882-b54c-58d5-b412-26bcdf254c3e}   <- Manufacturer + EnclosureKind
+{2ae478e9-ef65-5485-bb06-a233136e53c7}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{93f84748-c854-5d6b-b78a-13c2361e0758}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{54500b82-f7ae-592d-ae68-8c8e362a1475}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{68d24be5-01b6-5d88-83fb-df2bcfa879aa}   <- Manufacturer + Family + ProductName + BiosVendor
+{ad0b7f58-06f2-50b9-856b-343f54261425}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-lenovo-yoga-slim7x.txt b/board/efi/efi-arm_app/hwids/x1e80100-lenovo-yoga-slim7x.txt
new file mode 100644
index 00000000000..82051643958
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-lenovo-yoga-slim7x.txt
@@ -0,0 +1,32 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: NHCN36WW
+BiosMajorRelease: 1
+BiosMinorRelease: 36
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 35
+Manufacturer: LENOVO
+Family: Yoga Slim 7 14Q8X9
+ProductName: 83ED
+ProductSku: LENOVO_MT_83ED_BU_idea_FM_Yoga Slim 7 14Q8X9
+EnclosureKind: a
+BaseboardManufacturer: LENOVO
+BaseboardProduct: LNVNB161216
+Hardware IDs
+------------
+{3fb1e5ba-05cd-5153-ad64-1d8bc6dc7a1b}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{d99f6cb2-4a96-5e4a-8e29-19d52dfc2870}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{6d53c38f-6adb-578b-a418-2abda4d8485d}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{8073dbed-501f-5f5e-a619-4cdd9c00e865}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{d27cf20e-e185-578e-bd46-f4cc3a718bb2}   <- Manufacturer + Family + ProductName + ProductSku
+{8477f828-512b-56cf-af55-c711a6831551}   <- Manufacturer + Family + ProductName
+{f7f92b85-ff01-5e93-a453-c7f91029aa55}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{0700776d-0de7-5ea7-b9bf-77e0454d35e1}   <- Manufacturer + ProductSku
+{ee39b629-4187-5ff7-84c0-e354555562cd}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{fdb12a4f-1e8b-524e-97b5-feef23a8a8da}   <- Manufacturer + ProductName
+{63429d43-c970-570d-aaa7-54300924e0c5}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{8f143f12-40dc-5801-8e61-08a88cd68c1e}   <- Manufacturer + Family
+{e093d715-70f7-51f4-b6c8-b4a7e31def85}   <- Manufacturer + EnclosureKind
+{71d86d4d-02f8-5566-a7a1-529cef184b7e}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-microsoft-denali.txt b/board/efi/efi-arm_app/hwids/x1e80100-microsoft-denali.txt
new file mode 100644
index 00000000000..b78381d4b8d
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-microsoft-denali.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: Microsoft Corporation
+BiosVersion: 175.77.235
+BiosMajorRelease: 255
+BiosMinorRelease: 255
+FirmwareMajorRelease: ff
+FirmwareMinorRelease: ff
+Manufacturer: Microsoft Corporation
+Family: Surface
+ProductName: Microsoft Surface Pro, 11th Edition
+ProductSku: Surface_Pro_11th_Edition_2076
+EnclosureKind: 9
+BaseboardManufacturer: Microsoft Corporation
+BaseboardProduct: Microsoft Surface Pro, 11th Edition
+Hardware IDs
+------------
+{66f9d954-5c66-5577-b3e4-e3f14f87d2ff}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{5a384f15-464d-5da8-9311-a2c021759afc}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{14b96570-4bc4-541a-9aef-1b7e2b61d7cd}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{aca467c0-5fc2-59ad-8ed5-1b7a0988d11c}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{95971fb3-d478-591f-9ea3-eb0af0d1dfb5}   <- Manufacturer + Family + ProductName + ProductSku
+{c9c14db9-2b61-597a-a4ba-84397fe75f63}   <- Manufacturer + Family + ProductName
+{7cef06f5-e7e6-56d7-b123-a6d640a5d302}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{48b86a5e-1955-5799-9577-150f9e1a69e4}   <- Manufacturer + ProductSku
+{06128fee-87dc-50f6-8a3f-97cd9a6d8bf6}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{84b2e1d1-e695-5f41-8c41-cf1f059c616a}   <- Manufacturer + ProductName
+{16a47337-1f8b-5bd3-b3bd-8e50b31cb1c9}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{ca2e5189-1d32-509f-88a0-d4ebcc721899}   <- Manufacturer + Family
+{aca387a9-183e-5da9-8f9d-f460c3f50f54}   <- Manufacturer + EnclosureKind
+{fdef4ae0-6bfb-5706-8aae-a565639505f5}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{cc0aea32-ad2c-5013-8bed-cede6be8c9f4}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{01bf1e61-d2e0-518b-bb46-eb4d1f2b1af1}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{584a5084-15f2-5d20-917b-57f299e61f7e}   <- Manufacturer + Family + ProductName + BiosVendor
+{9914cecc-aab7-570e-8fce-e86009ea6bbb}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-microsoft-romulus13.txt b/board/efi/efi-arm_app/hwids/x1e80100-microsoft-romulus13.txt
new file mode 100644
index 00000000000..c22e0e97d78
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-microsoft-romulus13.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: Microsoft Corporation
+BiosVersion: 144.18.235
+BiosMajorRelease: 255
+BiosMinorRelease: 255
+FirmwareMajorRelease: ff
+FirmwareMinorRelease: ff
+Manufacturer: Microsoft Corporation
+Family: Surface
+ProductName: Microsoft Surface Laptop, 7th Edition
+ProductSku: Surface_Laptop_7th_Edition_2036
+EnclosureKind: 9
+BaseboardManufacturer: Microsoft Corporation
+BaseboardProduct: Microsoft Surface Laptop, 7th Edition
+Hardware IDs
+------------
+{4ecd5e53-42ea-51a3-9602-aecdfee5c09d}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{53368ca9-12d5-5ee1-820b-ce979fa2cb0b}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{cb196e28-20bc-5e78-93f1-0ac41726bcf8}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{fdfca0f3-41b6-5872-a2ea-53539fd5160c}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{11696377-327d-5ad1-b01d-02a7dbb9b99a}   <- Manufacturer + Family + ProductName + ProductSku
+{892e90c9-31e3-5131-a217-a02632dba5e9}   <- Manufacturer + Family + ProductName
+{786c71b6-f60e-51c7-9ddc-f2999b75a3c5}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{f0d12ad9-f530-5b56-96d8-897dd704059e}   <- Manufacturer + ProductSku
+{3c329240-a447-5ec5-b79b-d1149420ac62}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{224ba2ff-14c1-5b33-ac10-079ccc217be2}   <- Manufacturer + ProductName
+{924900a0-9be2-53ca-90d7-b0e38827f5c5}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{ca2e5189-1d32-509f-88a0-d4ebcc721899}   <- Manufacturer + Family
+{aca387a9-183e-5da9-8f9d-f460c3f50f54}   <- Manufacturer + EnclosureKind
+{1c07beb2-8442-5086-baab-2c44a468e3a3}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{cc0aea32-ad2c-5013-8bed-cede6be8c9f4}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{95c06fde-19b0-55dc-9ca6-55403bae23f5}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{c735618b-d526-5f71-9651-8d149340d620}   <- Manufacturer + Family + ProductName + BiosVendor
+{9914cecc-aab7-570e-8fce-e86009ea6bbb}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1e80100-microsoft-romulus15.txt b/board/efi/efi-arm_app/hwids/x1e80100-microsoft-romulus15.txt
new file mode 100644
index 00000000000..928be521318
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1e80100-microsoft-romulus15.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: Microsoft Corporation
+BiosVersion: 175.126.235
+BiosMajorRelease: 255
+BiosMinorRelease: 255
+FirmwareMajorRelease: ff
+FirmwareMinorRelease: ff
+Manufacturer: Microsoft Corporation
+Family: Surface
+ProductName: Microsoft Surface Laptop, 7th Edition
+ProductSku: Surface_Laptop_7th_Edition_2037
+EnclosureKind: 9
+BaseboardManufacturer: Microsoft Corporation
+BaseboardProduct: Microsoft Surface Laptop, 7th Edition
+Hardware IDs
+------------
+{e56cd9fa-d992-5947-9f80-82345827e8e6}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{e1fbd53f-3738-5fa6-aa7b-5ae319663d6b}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{e4cef54f-d5b2-56b1-8aa0-07b48c3deedf}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{ebce3085-12c1-58f3-9456-ccdf741a1538}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{f91b1a95-926c-5fd7-9826-4a101e142f97}   <- Manufacturer + Family + ProductName + ProductSku
+{892e90c9-31e3-5131-a217-a02632dba5e9}   <- Manufacturer + Family + ProductName
+{27ec66e4-3f81-5c06-997e-e1ea0a98b8a1}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{90482ef5-831d-5069-8d40-92d339a75c77}   <- Manufacturer + ProductSku
+{3c329240-a447-5ec5-b79b-d1149420ac62}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{224ba2ff-14c1-5b33-ac10-079ccc217be2}   <- Manufacturer + ProductName
+{924900a0-9be2-53ca-90d7-b0e38827f5c5}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{ca2e5189-1d32-509f-88a0-d4ebcc721899}   <- Manufacturer + Family
+{aca387a9-183e-5da9-8f9d-f460c3f50f54}   <- Manufacturer + EnclosureKind
+{1c07beb2-8442-5086-baab-2c44a468e3a3}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{cc0aea32-ad2c-5013-8bed-cede6be8c9f4}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{109cd8d8-6086-50b6-9c2d-d0aca0f418da}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{c735618b-d526-5f71-9651-8d149340d620}   <- Manufacturer + Family + ProductName + BiosVendor
+{9914cecc-aab7-570e-8fce-e86009ea6bbb}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1p42100-asus-vivobook-s15.txt b/board/efi/efi-arm_app/hwids/x1p42100-asus-vivobook-s15.txt
new file mode 100644
index 00000000000..c1c484059c3
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1p42100-asus-vivobook-s15.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: Insyde
+BiosVersion: S5507QA.318
+BiosMajorRelease: 3
+BiosMinorRelease: 10
+FirmwareMajorRelease: 03
+FirmwareMinorRelease: 07
+Manufacturer: ASUSTeK COMPUTER INC.
+Family: ASUS Vivobook S 15
+ProductName: ASUS Vivobook S 15 S5507QA_S5507QA
+ProductSku:
+EnclosureKind: a
+BaseboardManufacturer: ASUSTeK COMPUTER INC.
+BaseboardProduct: S5507QA
+Hardware IDs
+------------
+{c4575028-e938-504d-850d-f36fbb6b300d}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{920bc3d2-69f0-5705-83d8-3e0019ab5223}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{ac5b6293-c2ac-5e82-98f2-0475efbc11fc}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{0c926a29-b883-5482-aea7-ddda46084840}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{c5fed9eb-6a7b-5378-b093-484d9322150b}   <- Manufacturer + Family + ProductName + ProductSku
+{c9cd4052-8d61-5a5b-ad16-b9f12a993822}   <- Manufacturer + Family + ProductName
+{be521b64-7759-5835-a0b2-c10300a191fa}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{24652d54-00f4-59ae-96fb-f7adbfa4a939}   <- Manufacturer + ProductSku
+{52499218-2ce9-5d3c-b276-e3cee52f2f7a}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{172515ff-feb1-5f61-bc14-116a23ea70da}   <- Manufacturer + ProductName
+{f6b44a44-c913-572c-8c9c-0ff0f9c010f0}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{51df1ece-cd39-547a-8f9f-8f036fcfe752}   <- Manufacturer + Family
+{665276be-80c5-5e5d-929f-fa85d18e2d50}   <- Manufacturer + EnclosureKind
+{aeb1c925-81b7-5c73-ae9b-49bc5365de8f}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{65605ed1-09e2-57aa-bd0f-a26c1d35433f}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{2ad07794-e07a-55da-b1a1-b9b56ed4cdcd}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{ab36b5d3-4e77-58be-9d55-939c7e6734c6}   <- Manufacturer + Family + ProductName + BiosVendor
+{9d1b57fb-8282-5287-bd50-3c93d43921fa}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1p42100-asus-zenbook-a14.txt b/board/efi/efi-arm_app/hwids/x1p42100-asus-zenbook-a14.txt
new file mode 100644
index 00000000000..2884d6f9377
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1p42100-asus-zenbook-a14.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: Insyde
+BiosVersion: UX3407QA.305
+BiosMajorRelease: 3
+BiosMinorRelease: 5
+FirmwareMajorRelease: 03
+FirmwareMinorRelease: 0b
+Manufacturer: ASUSTeK COMPUTER INC.
+Family: ASUS Zenbook A14
+ProductName: ASUS Zenbook A14 UX3407QA_UX3407QA
+ProductSku:
+EnclosureKind: a
+BaseboardManufacturer: ASUSTeK COMPUTER INC.
+BaseboardProduct: UX3407QA
+Hardware IDs
+------------
+{c6d100b1-9de7-5636-a3cc-f28fa46fb926}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{85f50d27-f4cb-54df-9aae-f6f09700b132}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{8a72a2ea-3971-55e3-b982-cb6b82868f0e}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{a034eff6-2891-5de0-b0db-9c5ff350b968}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{a5b5becc-2a55-5017-b159-087f3846da26}   <- Manufacturer + Family + ProductName + ProductSku
+{59793319-4344-5755-9194-17f29f030d5d}   <- Manufacturer + Family + ProductName
+{14643426-35fa-5a20-bc31-3b6095d2b451}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{24652d54-00f4-59ae-96fb-f7adbfa4a939}   <- Manufacturer + ProductSku
+{a8425d85-573a-56f8-9d9d-98a196d712fa}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{7e6d3df4-bf5f-59ab-ad7b-e00677c0ae5a}   <- Manufacturer + ProductName
+{00bc5418-646d-5bab-b772-4efb06f4e7f1}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{c5647aaf-bd0a-5863-bdda-49afd00c5329}   <- Manufacturer + Family
+{665276be-80c5-5e5d-929f-fa85d18e2d50}   <- Manufacturer + EnclosureKind
+{7c5098e1-fa78-597c-a6ba-8b69ccc1cf75}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{65605ed1-09e2-57aa-bd0f-a26c1d35433f}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{3ca4e2d9-50df-51a5-a87f-4636d425e97d}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{0b8b84da-462b-5620-bdb5-70272e0ddd94}   <- Manufacturer + Family + ProductName + BiosVendor
+{9d1b57fb-8282-5287-bd50-3c93d43921fa}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1p42100-hp-omnibook-x14.txt b/board/efi/efi-arm_app/hwids/x1p42100-hp-omnibook-x14.txt
new file mode 100644
index 00000000000..ec1acb23dda
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1p42100-hp-omnibook-x14.txt
@@ -0,0 +1,33 @@ 
+Computer Information
+--------------------
+BiosVendor: Insyde
+BiosVersion: F.21
+Manufacturer: HP
+Family: 103C_5335M8 HP OmniBook X
+ProductName: HP OmniBook X Laptop 14-fe1xxx
+ProductSku: AP4R1EA#UUW
+EnclosureKind: 10
+BaseboardManufacturer: HP
+BaseboardProduct: 8CCF
+Hardware IDs
+------------
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+not available as 'BiosMajorRelease' unknown
+{3fdb269e-c359-5004-b4e3-8541ef3580c9}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{29a43fda-41e4-5db5-b6d3-012d0674d84f}   <- Manufacturer + Family + ProductName + ProductSku
+{9c3e4a5b-8fa2-5045-9c4f-441307fa3b08}   <- Manufacturer + Family + ProductName
+{271cca67-bd9e-5dd6-8e5f-b5f6b969da97}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{612e268b-1233-5af6-b478-5596d3573d35}   <- Manufacturer + ProductSku
+{1d8361a7-1b3a-5915-8a35-03a3c1cf9c2e}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{6fe7a469-b01a-5530-9a34-2dd089e0e006}   <- Manufacturer + ProductName
+{5120f011-8f7e-5ca5-9143-de545e288712}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{5d43face-6ba8-5d41-8914-12f3410bbcf9}   <- Manufacturer + Family
+{4c84c882-b54c-58d5-b412-26bcdf254c3e}   <- Manufacturer + EnclosureKind
+{8766bc19-d22e-5a07-9c23-f8762c4907fb}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{93f84748-c854-5d6b-b78a-13c2361e0758}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{d4db0558-de1b-562b-bc23-3e0caadd4c94}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{38e7030f-993f-5bda-9ce8-ae13a13d7b5a}   <- Manufacturer + Family + ProductName + BiosVendor
+{ad0b7f58-06f2-50b9-856b-343f54261425}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1p42100-lenovo-ideapad-5-2in1.txt b/board/efi/efi-arm_app/hwids/x1p42100-lenovo-ideapad-5-2in1.txt
new file mode 100644
index 00000000000..1614f92fbbb
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1p42100-lenovo-ideapad-5-2in1.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: LENOVO
+BiosVersion: Q1CN22WW
+BiosMajorRelease: 1
+BiosMinorRelease: 22
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 16
+Manufacturer: LENOVO
+Family: IdeaPad 5 2-in-1 14Q8X9
+ProductName: 83GH
+ProductSku: LENOVO_MT_83GH_BU_idea_FM_IdeaPad 5 2-in-1 14Q8X9
+EnclosureKind: 1f
+BaseboardManufacturer: LENOVO
+BaseboardProduct: LNVNB161216
+Hardware IDs
+------------
+{d51c6a3a-45a7-5a6f-9628-9074f72783d5}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{6e60bb5f-6c91-564d-9d57-ca3b2d9c280f}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{8b55e9a3-c4bf-5418-bd93-2af3e9263694}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{d622845f-0305-5b33-b081-b7519488ed65}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{9b723570-d493-5541-ae58-49087512f816}   <- Manufacturer + Family + ProductName + ProductSku
+{eb458c6d-45b2-5299-95b7-87723235240e}   <- Manufacturer + Family + ProductName
+{920bf110-b027-51fc-97e5-bb9b46e78c75}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{9276913a-a9da-5237-b4e8-c8502197264a}   <- Manufacturer + ProductSku
+{a8a28ecb-200f-59c6-8fe3-62fa670fb80d}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{24248bed-dbd2-5e4f-ba41-4e03a09b904a}   <- Manufacturer + ProductName
+{68320834-1316-5dad-babf-ae31cc3ff58c}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{d15b437b-55bf-5bd8-8a88-eb4b9e54cb97}   <- Manufacturer + Family
+{32b7e294-a252-5a72-b3c6-6197f08c64f1}   <- Manufacturer + EnclosureKind
+{71d86d4d-02f8-5566-a7a1-529cef184b7e}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{6de5d951-d755-576b-bd09-c5cf66b27234}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{63fd3926-001c-5392-9c34-fdd477025bd8}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{4ff87ce0-b6ce-5e37-899b-389129fc099e}   <- Manufacturer + Family + ProductName + BiosVendor
+{99431f53-09a1-5869-be79-65e2fa3f341d}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1p42100-microsoft-surface-pro-12in.txt b/board/efi/efi-arm_app/hwids/x1p42100-microsoft-surface-pro-12in.txt
new file mode 100644
index 00000000000..0fdcd9994bd
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1p42100-microsoft-surface-pro-12in.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: Microsoft Corporation
+BiosVersion: 8.722.235
+BiosMajorRelease: 255
+BiosMinorRelease: 255
+FirmwareMajorRelease: ff
+FirmwareMinorRelease: ff
+Manufacturer: Microsoft Corporation
+Family: Surface
+ProductName: Surface Pro 12in 1st Ed with Snapdragon
+ProductSku: Surface_Pro_12in_1st_Ed_with_Snapdragon_2110
+EnclosureKind: 9
+BaseboardManufacturer: Microsoft Corporation
+BaseboardProduct: Surface Pro 12in 1st Ed with Snapdragon
+Hardware IDs
+------------
+{38f75a5d-c3fc-5306-bb2e-bbb516e1ea91}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{57ba7c1d-8e88-59a9-82c9-044e765788e7}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{10cb324b-df3c-5081-bc7d-b5cc6795eeef}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{7c967d92-123c-5bfc-9fe8-430e6bba5ecb}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{277a48e4-924d-5ab0-81b9-d29c2ff47ad5}   <- Manufacturer + Family + ProductName + ProductSku
+{0a3f15dc-fcde-5159-baf8-1b55f5e1ae57}   <- Manufacturer + Family + ProductName
+{d17ea34a-39dc-5a14-8046-f47f082b4065}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{94996ddd-cdc3-5617-a625-3052726c4654}   <- Manufacturer + ProductSku
+{ef716fc4-b1b0-595c-b66e-1e3df6a0dc1d}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{b3930262-2a19-5f3f-adf0-b34629632fbb}   <- Manufacturer + ProductName
+{2cdac0d6-d408-54ab-bf1e-a124b6c5425b}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{ca2e5189-1d32-509f-88a0-d4ebcc721899}   <- Manufacturer + Family
+{aca387a9-183e-5da9-8f9d-f460c3f50f54}   <- Manufacturer + EnclosureKind
+{fb899afb-72ea-5a6b-ae82-995730f73d6f}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{cc0aea32-ad2c-5013-8bed-cede6be8c9f4}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{abbf3314-7dde-5966-980c-a1be8cf163b8}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{587dab3d-0f40-5962-b043-6fc86e41cba2}   <- Manufacturer + Family + ProductName + BiosVendor
+{9914cecc-aab7-570e-8fce-e86009ea6bbb}   <- Manufacturer + BiosVendor
diff --git a/board/efi/efi-arm_app/hwids/x1p64100-acer-swift-sf14-11.txt b/board/efi/efi-arm_app/hwids/x1p64100-acer-swift-sf14-11.txt
new file mode 100644
index 00000000000..a02a96e7680
--- /dev/null
+++ b/board/efi/efi-arm_app/hwids/x1p64100-acer-swift-sf14-11.txt
@@ -0,0 +1,37 @@ 
+Computer Information
+--------------------
+BiosVendor: Insyde Corp.
+BiosVersion: V1.24
+BiosMajorRelease: 0
+BiosMinorRelease: 0
+FirmwareMajorRelease: 01
+FirmwareMinorRelease: 15
+Manufacturer: Acer
+Family: Swift 14 AI
+ProductName: Swift SF14-11
+ProductSku:
+EnclosureKind: a
+BaseboardManufacturer: SX1
+BaseboardProduct: Bluetang_SX1
+Hardware IDs
+------------
+{27d2dba8-e6f1-5c19-ba1c-c25a4744c161}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{676172cd-d185-53ed-aac6-245d0caa02c4}   <- Manufacturer + Family + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{20c2cf2f-231c-5d02-ae9b-c837ab5653ed}   <- Manufacturer + ProductName + BiosVendor + BiosVersion + BiosMajorRelease + BiosMinorRelease
+{f2ea7095-999d-5e5b-8f2a-4b636a1e399f}   <- Manufacturer + Family + ProductName + ProductSku + BaseboardManufacturer + BaseboardProduct
+{331d7526-8b88-5923-bf98-450cf3ea82a4}   <- Manufacturer + Family + ProductName + ProductSku
+{98ad068a-f812-5f13-920c-3ff3d34d263f}   <- Manufacturer + Family + ProductName
+{3f49141c-d8fb-5a6f-8b4a-074a2397874d}   <- Manufacturer + ProductSku + BaseboardManufacturer + BaseboardProduct
+{7c107a7f-2d77-51aa-aef8-8d777e26ffbc}   <- Manufacturer + ProductSku
+{6a12c9bc-bcfa-5448-9f66-4159dbe8c326}   <- Manufacturer + ProductName + BaseboardManufacturer + BaseboardProduct
+{f55122fb-303f-58bc-b342-6ef653956d1d}   <- Manufacturer + ProductName
+{ee8fa049-e5f4-51e4-89d8-89a0140b8f38}   <- Manufacturer + Family + BaseboardManufacturer + BaseboardProduct
+{4cdff732-fd0c-5bac-b33e-9002788ea557}   <- Manufacturer + Family
+{92dcc94d-48f7-5ee8-b9ec-a6393fb7a484}   <- Manufacturer + EnclosureKind
+{32f83b0f-1fad-5be2-88be-5ab020e7a70e}   <- Manufacturer + BaseboardManufacturer + BaseboardProduct
+{1e301734-5d49-5df4-9ed2-aa1c0a9dddda}   <- Manufacturer
+Extra Hardware IDs
+------------------
+{058c0739-1843-5a10-bab7-fae8aaf30add}   <- Manufacturer + Family + ProductName + ProductSku + BiosVendor
+{100917f4-9c0a-5ac3-a297-794222da9bc9}   <- Manufacturer + Family + ProductName + BiosVendor
+{86654360-65f0-5935-bc87-81102c6a022b}   <- Manufacturer + BiosVendor