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