diff options
-rw-r--r-- | Documentation/mboxd.md | 2 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | control.c | 2 | ||||
-rw-r--r-- | lpc.c (renamed from mboxd_lpc.c) | 2 | ||||
-rw-r--r-- | lpc.h (renamed from mboxd_lpc.h) | 0 | ||||
-rw-r--r-- | lpc_reset.c (renamed from mboxd_lpc_reset.c) | 2 | ||||
-rw-r--r-- | mboxd.c | 2 | ||||
-rw-r--r-- | mboxd_msg.c | 2 | ||||
-rw-r--r-- | test/Makefile.am.include | 4 | ||||
-rw-r--r-- | test/mbox.c | 2 | ||||
-rw-r--r-- | vpnor/Makefile.am.include | 2 | ||||
-rw-r--r-- | vpnor/lpc_reset.cpp (renamed from vpnor/mboxd_lpc_reset.cpp) | 2 | ||||
-rw-r--r-- | vpnor/test/Makefile.am.include | 4 |
13 files changed, 15 insertions, 15 deletions
diff --git a/Documentation/mboxd.md b/Documentation/mboxd.md index c91b7d6..407ada6 100644 --- a/Documentation/mboxd.md +++ b/Documentation/mboxd.md @@ -27,7 +27,7 @@ dbus.c - Contains the handlers for the D-Bus commands which the daemon can receive. flash.c - Contains the functions for performing flash access including read, write and erase. -mboxd_lpc.c - Contains the functions for controlling the LPC bus mapping +lpc.c - Contains the functions for controlling the LPC bus mapping including pointing the bus so it maps flash and memory. mboxd_msg.c - Contains the handlers for the mbox commands which the daemon can receive. diff --git a/Makefile.am b/Makefile.am index 5df4b95..dd3fcc1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ mboxd_SOURCES = \ control.c \ control_legacy.c \ control_dbus.c \ - mboxd_lpc.c \ + lpc.c \ mboxd_msg.c \ mboxd_windows.c \ mtd.c @@ -18,7 +18,7 @@ if VIRTUAL_PNOR_ENABLED include vpnor/Makefile.am.include else mboxd_SOURCES += flash.c \ - mboxd_lpc_reset.c + lpc_reset.c endif mboxctl_SOURCES = mboxctl.c @@ -6,7 +6,7 @@ #include "dbus.h" #include "mbox.h" #include "flash.h" -#include "mboxd_lpc.h" +#include "lpc.h" #include "mboxd_msg.h" #include "mboxd_windows.h" @@ -26,7 +26,7 @@ #include "mbox.h" #include "common.h" -#include "mboxd_lpc.h" +#include "lpc.h" #include "flash.h" #include <linux/aspeed-lpc-ctrl.h> diff --git a/mboxd_lpc_reset.c b/lpc_reset.c index 1b4551c..e422ad6 100644 --- a/mboxd_lpc_reset.c +++ b/lpc_reset.c @@ -4,7 +4,7 @@ #define _GNU_SOURCE #include "mbox.h" -#include "mboxd_lpc.h" +#include "lpc.h" /* * reset_lpc() - Reset the lpc bus mapping @@ -32,7 +32,7 @@ #include "dbus.h" #include "control_dbus.h" #include "flash.h" -#include "mboxd_lpc.h" +#include "lpc.h" #include "mboxd_msg.h" #include "mboxd_windows.h" #include "vpnor/mboxd_pnor_partition_table.h" diff --git a/mboxd_msg.c b/mboxd_msg.c index e267425..1254e8a 100644 --- a/mboxd_msg.c +++ b/mboxd_msg.c @@ -28,7 +28,7 @@ #include "common.h" #include "mboxd_msg.h" #include "mboxd_windows.h" -#include "mboxd_lpc.h" +#include "lpc.h" /* * write_bmc_event_reg() - Write to the BMC controlled status register (reg 15) diff --git a/test/Makefile.am.include b/test/Makefile.am.include index 7f8f6d7..3af58e5 100644 --- a/test/Makefile.am.include +++ b/test/Makefile.am.include @@ -21,8 +21,8 @@ test_flash_write_SOURCES = \ TEST_MBOX_SRCS = \ mboxd_msg.c \ mboxd_windows.c \ - mboxd_lpc.c \ - mboxd_lpc_reset.c \ + lpc.c \ + lpc_reset.c \ common.c \ flash.c diff --git a/test/mbox.c b/test/mbox.c index b45f42f..991a7b9 100644 --- a/test/mbox.c +++ b/test/mbox.c @@ -15,7 +15,7 @@ #include "mbox.h" #include "flash.h" -#include "mboxd_lpc.h" +#include "lpc.h" #include "mboxd_msg.h" #include "mboxd_windows.h" diff --git a/vpnor/Makefile.am.include b/vpnor/Makefile.am.include index e4379d2..703cfa3 100644 --- a/vpnor/Makefile.am.include +++ b/vpnor/Makefile.am.include @@ -2,7 +2,7 @@ mboxd_SOURCES += %reldir%/pnor_partition_table.cpp \ %reldir%/mboxd_pnor_partition_table.cpp \ %reldir%/flash.cpp \ %reldir%/pnor_partition.cpp \ - %reldir%/mboxd_lpc_reset.cpp \ + %reldir%/lpc_reset.cpp \ %reldir%/mboxd_msg.cpp mboxd_LDFLAGS += -lstdc++fs \ diff --git a/vpnor/mboxd_lpc_reset.cpp b/vpnor/lpc_reset.cpp index 9bcbb89..6c5a5d6 100644 --- a/vpnor/mboxd_lpc_reset.cpp +++ b/vpnor/lpc_reset.cpp @@ -18,7 +18,7 @@ */ #include "mbox.h" -#include "mboxd_lpc.h" +#include "lpc.h" #include "mboxd_pnor_partition_table.h" /* diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include index e2d5427..d1c37c1 100644 --- a/vpnor/test/Makefile.am.include +++ b/vpnor/test/Makefile.am.include @@ -7,8 +7,8 @@ TEST_MBOX_VPNOR_INTEG_SRCS = \ common.c \ mboxd_msg.c \ mboxd_windows.c \ - mboxd_lpc.c \ - vpnor/mboxd_lpc_reset.cpp \ + lpc.c \ + vpnor/lpc_reset.cpp \ vpnor/mboxd_pnor_partition_table.cpp \ vpnor/flash.cpp \ vpnor/mboxd_msg.cpp \ |