Merge af142b9b42 into 33c15ba8e8

This change adds a new firmware type device entry for the .hwids section.
It also adds compile time validations for them.

Since currently there is only one device type (devicetree), chid_match()
compares the descriptor value of this device type directly and errors out for
other descriptors. Fix chid_match() to support the new device type.

Ukify has also been adjusted to accomodate the new device type.

src/boot/chid.h

@@ -59,17 +59,11 @@ assert_cc(offsetof(Device, fw.name_offset) == 20);
 assert_cc(offsetof(Device, fw.compatible_offset) == 24);
 assert_cc(sizeof(Device) == 28);
 
-static inline const char* device_get_devicetree_name(const void *base, const Device *device) {
-        if (device->descriptor != DEVICE_DESCRIPTOR_DEVICETREE)
-                return NULL;
-
+static inline const char* device_get_name(const void *base, const Device *device) {
         return device->devicetree.name_offset == 0 ? NULL : (const char *) ((const uint8_t *) base + device->devicetree.name_offset);
 }
 
-static inline const char* device_get_devicetree_compatible(const void *base, const Device *device) {
-        if (device->descriptor != DEVICE_DESCRIPTOR_DEVICETREE)
-                return NULL;
-
+static inline const char* device_get_compatible(const void *base, const Device *device) {
         return device->devicetree.compatible_offset == 0 ? NULL : (const char *) ((const uint8_t *) base + device->devicetree.compatible_offset);
 }
 

src/boot/hwids/device1.json

@@ -1,4 +1,5 @@
 {
+    "type": "devicetree",
     "name": "Device 1",
     "compatible": "test,device-1",
     "hwids": [

src/boot/hwids/device2.json

@@ -1,4 +1,5 @@
 {
+    "type": "firmware",
     "name": "Device 2",
     "compatible": "test,device-2",
     "hwids": [

src/boot/hwids/device3.json

@@ -1,4 +1,5 @@
 {
+    "type": "devicetree",
     "name": "Device 3",
     "compatible": "test,device-3",
     "hwids": [

src/boot/pe.c

@@ -185,7 +185,7 @@ static bool pe_use_this_dtb(
         if (!device || !base)
                 return false;
 
-        const char *compatible = device_get_devicetree_compatible(base, device);
+        const char *compatible = device_get_compatible(base, device);
         if (!compatible)
                 return false;