<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22558">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy: Add variant support for camera asl<br><br>This change adds infrastructure to allow variants to define their own<br>camera.asl file.<br>- Poppy and soraka use the one provided by baseboard.<br>- Dummy file is added for nautilus since it does not have camera<br>support enabled yet.<br><br>Change-Id: I0f0b489e74739aa4708283d58d8b7626b77a89a3<br>Signed-off-by: Furquan Shaikh <furquan@chromium.org><br>---<br>M src/mainboard/google/poppy/dsdt.asl<br>A src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera.asl<br>R src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/ipu_mainboard.asl<br>R src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/mipi_camera.asl<br>A src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl<br>A src/mainboard/google/poppy/variants/poppy/include/variant/acpi/camera.asl<br>A src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl<br>7 files changed, 66 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/22558/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl<br>index b7a8c94..3d05a1c 100644<br>--- a/src/mainboard/google/poppy/dsdt.asl<br>+++ b/src/mainboard/google/poppy/dsdt.asl<br>@@ -50,8 +50,7 @@<br>  }<br> <br>  /* MIPI camera */<br>-    #include "acpi/ipu_mainboard.asl"<br>-  #include "acpi/mipi_camera.asl"<br>+    #include <variant/acpi/camera.asl><br> <br>   /* Chrome OS specific */<br>      #include <vendorcode/google/chromeos/acpi/chromeos.asl><br>diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera.asl<br>new file mode 100644<br>index 0000000..78f9108<br>--- /dev/null<br>+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera.asl<br>@@ -0,0 +1,17 @@<br>+/*<br>+ * This file is part of the coreboot project.<br>+ *<br>+ * Copyright (C) 2017 Google Inc.<br>+ *<br>+ * This program is free software; you can redistribute it and/or modify<br>+ * it under the terms of the GNU General Public License as published by<br>+ * the Free Software Foundation; version 2 of the License.<br>+ *<br>+ * This program is distributed in the hope that it will be useful,<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the<br>+ * GNU General Public License for more details.<br>+ */<br>+<br>+#include "ipu_mainboard.asl"<br>+#include "mipi_camera.asl"<br>diff --git a/src/mainboard/google/poppy/acpi/ipu_mainboard.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/ipu_mainboard.asl<br>similarity index 100%<br>rename from src/mainboard/google/poppy/acpi/ipu_mainboard.asl<br>rename to src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/ipu_mainboard.asl<br>diff --git a/src/mainboard/google/poppy/acpi/mipi_camera.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/mipi_camera.asl<br>similarity index 100%<br>rename from src/mainboard/google/poppy/acpi/mipi_camera.asl<br>rename to src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/mipi_camera.asl<br>diff --git a/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl b/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl<br>new file mode 100644<br>index 0000000..ed06742<br>--- /dev/null<br>+++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl<br>@@ -0,0 +1,16 @@<br>+/*<br>+ * This file is part of the coreboot project.<br>+ *<br>+ * Copyright 2017 Google Inc.<br>+ *<br>+ * This program is free software; you can redistribute it and/or modify<br>+ * it under the terms of the GNU General Public License as published by<br>+ * the Free Software Foundation; version 2 of the License.<br>+ *<br>+ * This program is distributed in the hope that it will be useful,<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>+ * GNU General Public License for more details.<br>+ */<br>+<br>+/* Dummy file until camera support is added. */<br>\ No newline at end of file<br>diff --git a/src/mainboard/google/poppy/variants/poppy/include/variant/acpi/camera.asl b/src/mainboard/google/poppy/variants/poppy/include/variant/acpi/camera.asl<br>new file mode 100644<br>index 0000000..45522f9<br>--- /dev/null<br>+++ b/src/mainboard/google/poppy/variants/poppy/include/variant/acpi/camera.asl<br>@@ -0,0 +1,16 @@<br>+/*<br>+ * This file is part of the coreboot project.<br>+ *<br>+ * Copyright 2017 Google Inc.<br>+ *<br>+ * This program is free software; you can redistribute it and/or modify<br>+ * it under the terms of the GNU General Public License as published by<br>+ * the Free Software Foundation; version 2 of the License.<br>+ *<br>+ * This program is distributed in the hope that it will be useful,<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>+ * GNU General Public License for more details.<br>+ */<br>+<br>+#include <baseboard/acpi/camera.asl><br>diff --git a/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl b/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl<br>new file mode 100644<br>index 0000000..45522f9<br>--- /dev/null<br>+++ b/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl<br>@@ -0,0 +1,16 @@<br>+/*<br>+ * This file is part of the coreboot project.<br>+ *<br>+ * Copyright 2017 Google Inc.<br>+ *<br>+ * This program is free software; you can redistribute it and/or modify<br>+ * it under the terms of the GNU General Public License as published by<br>+ * the Free Software Foundation; version 2 of the License.<br>+ *<br>+ * This program is distributed in the hope that it will be useful,<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>+ * GNU General Public License for more details.<br>+ */<br>+<br>+#include <baseboard/acpi/camera.asl><br></pre><p>To view, visit <a href="https://review.coreboot.org/22558">change 22558</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22558"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0f0b489e74739aa4708283d58d8b7626b77a89a3 </div>
<div style="display:none"> Gerrit-Change-Number: 22558 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>