2003-06-18 20:36:02

by David Mosberger

Subject: re-enable the building of 8250_hcdp and 8250_acpi

This adds back the ability to configure and build the HCDP and ACPI
support for the 8250 driver (there was some confusion in the earlier
patch due to renaming of files and options).

Thanks,

--david

diff -Nru a/drivers/serial/Kconfig b/drivers/serial/Kconfig
--- a/drivers/serial/Kconfig Wed Jun 18 13:32:51 2003
+++ b/drivers/serial/Kconfig Wed Jun 18 13:32:51 2003
@@ -77,7 +77,7 @@
a module, say M here and read <file:Documentation/modules.txt>.
If unsure, say N.

-config SERIAL_HCDP
+config SERIAL_8250_HCDP
bool "8250/16550 device discovery support via EFI HCDP table"
depends on IA64
---help---
diff -Nru a/drivers/serial/Makefile b/drivers/serial/Makefile
--- a/drivers/serial/Makefile Wed Jun 18 13:32:49 2003
+++ b/drivers/serial/Makefile Wed Jun 18 13:32:49 2003
@@ -8,7 +8,8 @@
serial-8250-$(CONFIG_GSC) += 8250_gsc.o
serial-8250-$(CONFIG_PCI) += 8250_pci.o
serial-8250-$(CONFIG_PNP) += 8250_pnp.o
-serial-8250-$(CONFIG_SERIAL_HCDP) += 8250_hcdp.o
+serial-8250-$(CONFIG_SERIAL_8250_HCDP) += 8250_hcdp.o
+serial-8250-$(CONFIG_ACPI) += 8250_acpi.o

obj-$(CONFIG_SERIAL_CORE) += core.o
obj-$(CONFIG_SERIAL_21285) += 21285.o

2003-06-19 00:14:29

by David Mosberger

Subject: re-enable the building of 8250_hcdp and 8250_acpi (v2)

Linus,

Here is a better version of the previous patch. As per your
suggestion, it adds a separate SERIAL_8250_ACPI config option and
makes the 8250_acpi.c code dependent on ACPI_BUS (since
acpi_bus_register_driver() is a prerequisite).

Thanks,

--david

diff -Nru a/drivers/serial/Kconfig b/drivers/serial/Kconfig
--- a/drivers/serial/Kconfig Wed Jun 18 17:23:47 2003
+++ b/drivers/serial/Kconfig Wed Jun 18 17:23:47 2003
@@ -77,7 +77,15 @@
a module, say M here and read <file:Documentation/modules.txt>.
If unsure, say N.

-config SERIAL_HCDP
+config SERIAL_8250_ACPI
+ bool "8250/16550 device discovery via ACPI namespace"
+ default y if IA64
+ depends on ACPI_BUS
+ ---help---
+ If you wish to enable serial port discovery via the ACPI
+ namespace, say Y here. If unsure, say N.
+
+config SERIAL_8250_HCDP
bool "8250/16550 device discovery support via EFI HCDP table"
depends on IA64
---help---
diff -Nru a/drivers/serial/Makefile b/drivers/serial/Makefile
--- a/drivers/serial/Makefile Wed Jun 18 17:23:46 2003
+++ b/drivers/serial/Makefile Wed Jun 18 17:23:46 2003
@@ -8,7 +8,8 @@
serial-8250-$(CONFIG_GSC) += 8250_gsc.o
serial-8250-$(CONFIG_PCI) += 8250_pci.o
serial-8250-$(CONFIG_PNP) += 8250_pnp.o
-serial-8250-$(CONFIG_SERIAL_HCDP) += 8250_hcdp.o
+serial-8250-$(CONFIG_SERIAL_8250_HCDP) += 8250_hcdp.o
+serial-8250-$(CONFIG_SERIAL_8250_ACPI) += 8250_acpi.o

obj-$(CONFIG_SERIAL_CORE) += core.o
obj-$(CONFIG_SERIAL_21285) += 21285.o