diff --git a/README.md b/README.md
index 83cc67e..9620e2b 100644
--- a/README.md
+++ b/README.md
@@ -140,10 +140,6 @@
 --------------------- | ------- | -------
 `MAPPED_ADDRESS`      | 0       | The address used for mapping P2A or LPC into the BMC's memory-space.
 
-Option                | Meaning
---------------------- | -------
-`--enable-lpc-bridge` | Enable the LPC-to-AHB transport option.
-
 If a platform enables p2a as the transport mechanism, a specific vendor must be
 selected via the following configuration option.  Currently, only one is
 supported.
diff --git a/bmc/Makefile.am b/bmc/Makefile.am
index 8c4ff44..7e03384 100644
--- a/bmc/Makefile.am
+++ b/bmc/Makefile.am
@@ -6,17 +6,16 @@
 	file_handler.cpp \
 	prepare_systemd.cpp \
 	verify_systemd.cpp \
-	update_systemd.cpp
+	update_systemd.cpp \
+	lpc_handler.cpp
 
-if ENABLE_LPC_BRIDGE
-libfirmwareblob_common_la_SOURCES += lpc_handler.cpp
 if ENABLE_ASPEED_LPC
 libfirmwareblob_common_la_SOURCES += lpc_aspeed.cpp
 endif
+
 if ENABLE_NUVOTON_LPC
 libfirmwareblob_common_la_SOURCES += lpc_nuvoton.cpp
 endif
-endif
 
 if ENABLE_ASPEED_P2A
 libfirmwareblob_common_la_SOURCES += pci_handler.cpp
diff --git a/configure.ac b/configure.ac
index 6afe973..fb2a9b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,6 @@
 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.
-AS_IF([test "x$enable_tests" = "xyes"], [enable_lpc_bridge=yes])
 AS_IF([test "x$enable_tests" = "xyes"], [enable_aspeed_lpc=yes])
 AS_IF([test "x$enable_tests" = "xyes"], [enable_nuvoton_lpc=yes])
 
@@ -129,15 +128,6 @@
     AX_APPEND_COMPILE_FLAGS([-DENABLE_TARBALL_UBI], [CXXFLAGS])
 ])
 
-# Enable P2A, and or LPC (block-transfer is always enabled).
-AC_ARG_ENABLE([lpc-bridge],
-    AS_HELP_STRING([--enable-lpc-bridge],
-                   [Enable lpc-bridge transport mechanism]))
-AM_CONDITIONAL(ENABLE_LPC_BRIDGE, [test "x$enable_lpc_bridge" = "xyes"])
-AS_IF([test "x$enable_lpc_bridge" = "xyes"], [
-    AX_APPEND_COMPILE_FLAGS([-DENABLE_LPC_BRIDGE], [CXXFLAGS])
-])
-
 # The address used for mapping P2A or LPC into the BMC's memory-space:
 # e.g. https://github.com/openbmc/linux/blob/1da2ce51886a3b2f5db2087f26c661e13ee13b84/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts#L26
 # or https://github.com/openbmc/linux/blob/1da2ce51886a3b2f5db2087f26c661e13ee13b84/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts#L166
@@ -160,6 +150,7 @@
     )
 
     AX_APPEND_COMPILE_FLAGS([-DASPEED_LPC], [CXXFLAGS])
+    AX_APPEND_COMPILE_FLAGS([-DENABLE_LPC_BRIDGE], [CXXFLAGS])
 ])
 AC_ARG_ENABLE([nuvoton-lpc],
     AS_HELP_STRING([--enable-nuvoton-lpc],
@@ -167,6 +158,7 @@
 AM_CONDITIONAL(ENABLE_NUVOTON_LPC, [test "x$enable_nuvoton_lpc" = "xyes"])
 AS_IF([test "x$enable_nuvoton_lpc" = "xyes"], [
     AX_APPEND_COMPILE_FLAGS([-DNUVOTON_LPC], [CXXFLAGS])
+    AX_APPEND_COMPILE_FLAGS([-DENABLE_LPC_BRIDGE], [CXXFLAGS])
 ])
 
 AS_IF([test "x$enable_aspeed_lpc" = "xyes"], [