diff options
Diffstat (limited to 'lib/acpi')
| -rw-r--r-- | lib/acpi/Makefile | 10 | ||||
| -rw-r--r-- | lib/acpi/acpi_device.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/acpi/Makefile b/lib/acpi/Makefile index cc2868488a0..dcca0c67268 100644 --- a/lib/acpi/Makefile +++ b/lib/acpi/Makefile @@ -3,12 +3,12 @@ obj-y += acpi.o -ifdef CONFIG_$(SPL_TPL_)GENERATE_ACPI_TABLE +ifdef CONFIG_$(PHASE_)GENERATE_ACPI_TABLE -obj-$(CONFIG_$(SPL_)ACPIGEN) += acpigen.o -obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi_device.o -obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi_dp.o -obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi_table.o +obj-$(CONFIG_$(XPL_)ACPIGEN) += acpigen.o +obj-$(CONFIG_$(XPL_)ACPIGEN) += acpi_device.o +obj-$(CONFIG_$(XPL_)ACPIGEN) += acpi_dp.o +obj-$(CONFIG_$(XPL_)ACPIGEN) += acpi_table.o obj-y += acpi_writer.o # With QEMU the ACPI tables come from there, not from U-Boot diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c index ed94194346d..0f3044bca79 100644 --- a/lib/acpi/acpi_device.c +++ b/lib/acpi/acpi_device.c @@ -728,7 +728,7 @@ static int acpi_device_set_spi(const struct udevice *dev, struct acpi_spi *spi, plat = dev_get_parent_plat(slave->dev); memset(spi, '\0', sizeof(*spi)); - spi->device_select = plat->cs; + spi->device_select = plat->cs[0]; spi->device_select_polarity = SPI_POLARITY_LOW; spi->wire_mode = SPI_4_WIRE_MODE; spi->speed = plat->max_hz; |