95b4c5ecfd
Earlier we over-included workspace patches. After closer inspection:
- Upstream Cargo.toml ALREADY has `exclude = ["bootstrap"]` at the end
of the workspace members list (line 72). No need to add another.
- Upstream bootstrap/Cargo.toml ALREADY has `[workspace]` declaration.
No need to add another.
The only real gap was the missing driver members (i2c, gpio, intel-thc-hidd,
acpi-resource, amlserde, thermald, ucsid). The P0-add-missing-driver-members.patch
fixes that alone.
Removed the redundant P0-bootstrap-workspace-{fix,exclude,standalone} patches.
35 lines
862 B
Diff
35 lines
862 B
Diff
diff --git a/Cargo.toml b/Cargo.toml
|
|
index 9e776232..69b0f147 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -44,6 +44,21 @@ members = [
|
|
|
|
"drivers/input/ps2d",
|
|
"drivers/input/usbhidd",
|
|
+ "drivers/input/i2c-hidd",
|
|
+ "drivers/input/intel-thc-hidd",
|
|
+
|
|
+ "drivers/i2c/i2c-interface",
|
|
+ "drivers/i2c/i2cd",
|
|
+ "drivers/i2c/amd-mp2-i2cd",
|
|
+ "drivers/i2c/dw-acpi-i2cd",
|
|
+ "drivers/i2c/intel-lpss-i2cd",
|
|
+ "drivers/gpio/gpiod",
|
|
+ "drivers/gpio/intel-gpiod",
|
|
+ "drivers/gpio/i2c-gpio-expanderd",
|
|
+
|
|
+ "drivers/acpi-resource",
|
|
+ "drivers/amlserde",
|
|
+ "drivers/thermald",
|
|
|
|
"drivers/net/driver-network",
|
|
"drivers/net/e1000d",
|
|
@@ -66,6 +81,7 @@ members = [
|
|
"drivers/usb/xhcid",
|
|
"drivers/usb/usbctl",
|
|
"drivers/usb/usbhubd",
|
|
+ "drivers/usb/ucsid",
|
|
]
|
|
|
|
# Bootstrap needs it's own profile configuration
|