build: drop --enable-pci-bridge option
Now if you enable aspeed-p2a it'll enable that for you.
Tested: Only build verified, did not perform testing.
Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I5d9bbd3ac62a9260efaec8035aaed9fd747e9f99
diff --git a/README.md b/README.md
index fadc4ca..83cc67e 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,6 @@
Option | Meaning
--------------------- | -------
-`--enable-pci-bridge` | Enable the PCI-to-AHB transport option.
`--enable-lpc-bridge` | Enable the LPC-to-AHB transport option.
If a platform enables p2a as the transport mechanism, a specific vendor must be
diff --git a/bmc/Makefile.am b/bmc/Makefile.am
index be3346c..8c4ff44 100644
--- a/bmc/Makefile.am
+++ b/bmc/Makefile.am
@@ -18,11 +18,9 @@
endif
endif
-if ENABLE_PCI_BRIDGE
if ENABLE_ASPEED_P2A
libfirmwareblob_common_la_SOURCES += pci_handler.cpp
endif
-endif
libfirmwareblob_common_la_CXXFLAGS = \
-I$(top_srcdir) \
diff --git a/configure.ac b/configure.ac
index a704053..6afe973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,6 @@
AS_IF([test "x$enable_tests" = "xyes"], [enable_static_layout=yes])
AS_IF([test "x$enable_tests" = "xyes"], [enable_tarball_ubi=yes])
-AS_IF([test "x$enable_tests" = "xyes"], [enable_pci_bridge=yes])
AS_IF([test "x$enable_tests" = "xyes"], [enable_aspeed_p2a=yes])
# You can only build main.o with one of the lpc implementations, however, specify both.
@@ -131,13 +130,6 @@
])
# Enable P2A, and or LPC (block-transfer is always enabled).
-AC_ARG_ENABLE([pci-bridge],
- AS_HELP_STRING([--enable-pci-bridge],
- [Enable pci-bridge transport mechanism]))
-AM_CONDITIONAL(ENABLE_PCI_BRIDGE, [test "x$enable_pci_bridge" = "xyes"])
-AS_IF([test "x$enable_pci_bridge" = "xyes"], [
- AX_APPEND_COMPILE_FLAGS([-DENABLE_PCI_BRIDGE], [CXXFLAGS])
-])
AC_ARG_ENABLE([lpc-bridge],
AS_HELP_STRING([--enable-lpc-bridge],
[Enable lpc-bridge transport mechanism]))
@@ -199,6 +191,7 @@
[`mkdir -p linux;wget https://raw.githubusercontent.com/openbmc/linux/dev-5.0/include/uapi/linux/aspeed-p2a-ctrl.h -O linux/aspeed-p2a-ctrl.h`])
)
AX_APPEND_COMPILE_FLAGS([-DASPEED_P2A], [CXXFLAGS])
+ AX_APPEND_COMPILE_FLAGS([-DENABLE_PCI_BRIDGE], [CXXFLAGS])
])
AS_IF([test "x$enable_aspeed_p2a" = "xyes"], [