Re-organize source
After removing i2c support, we can reduce the depth of the source
code and remove the power-control-x86 folder.
We can also simplify the CMake files.
Tested:
Confirmed that ipmi power control commands all still work correctly.
Change-Id: I67104e40555d4d84c2b946fad000e3a541828272
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9089d3..edcccad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,60 @@
cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR)
+project(power-control CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-add_subdirectory(power-control-x86)
+option (
+ CHASSIS_SYSTEM_RESET
+ "Enable chassis system power reset to allow removing
+ power and restoring back"
+ OFF
+)
+option (
+ USE_PLT_RST
+ "Use the PLT_RST eSPI signal to detect warm reset
+ instead of POST Complete"
+ OFF
+)
+
+add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
+add_definitions(-DBOOST_SYSTEM_NO_DEPRECATED)
+add_definitions(-DBOOST_ALL_NO_LIB)
+add_definitions(-DBOOST_NO_RTTI)
+add_definitions(-DBOOST_NO_TYPEID)
+add_definitions(-DBOOST_ASIO_DISABLE_THREADS)
+
+set(SRC_FILES src/power_control.cpp)
+
+add_executable(${PROJECT_NAME} ${SRC_FILES})
+target_link_libraries(${PROJECT_NAME} gpiodcxx)
+target_link_libraries(${PROJECT_NAME} systemd)
+target_link_libraries(${PROJECT_NAME} sdbusplus)
+
+target_compile_definitions (
+ ${PROJECT_NAME} PRIVATE $<$<BOOL:${CHASSIS_SYSTEM_RESET}>:
+ -DCHASSIS_SYSTEM_RESET>
+ ${PROJECT_NAME} PRIVATE $<$<BOOL:${USE_PLT_RST}>:
+ -DUSE_PLT_RST>
+)
+
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+# Temporarily disable rtti
+# See https://github.com/chriskohlhoff/asio/issues/533
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-rtti")
+
+set(
+ SERVICE_FILES
+ ${PROJECT_SOURCE_DIR}/service_files/chassis-system-reset.service
+ ${PROJECT_SOURCE_DIR}/service_files/chassis-system-reset.target
+ ${PROJECT_SOURCE_DIR}/service_files/xyz.openbmc_project.Chassis.Control.Power@.service
+ )
+
+set(
+ CONFIG_FILE
+ ${PROJECT_SOURCE_DIR}/config/power-config-host0.json
+ )
+
+install(FILES ${SERVICE_FILES} DESTINATION /lib/systemd/system/)
+install(FILES ${CONFIG_FILE} DESTINATION /usr/share/x86-power-control/)
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
deleted file mode 100644
index cf41347..0000000
--- a/cmake/Config.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# - Config file for '@PROJECT_NAME@' package
-# It defines the following variables
-# @PROJECT_NAME_UPPERCASE@_INCLUDE_DIRS - include directories
-# @PROJECT_NAME_UPPERCASE@_LIBRARIES - libraries to link against
-
-# Include directory
-set(@PROJECT_NAME_UPPERCASE@_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR@")
-
-# Import the exported targets
-include("@INSTALL_CMAKE_DIR@/@PROJECT_NAME@Targets.cmake")
-
-# Set the expected library variable
-set(@PROJECT_NAME_UPPERCASE@_LIBRARIES @LIBRARY_NAME@)
diff --git a/power-control-x86/config/power-config-host0.json b/config/power-config-host0.json
similarity index 100%
rename from power-control-x86/config/power-config-host0.json
rename to config/power-config-host0.json
diff --git a/power-control-x86/CMakeLists.txt b/power-control-x86/CMakeLists.txt
deleted file mode 100644
index edcccad..0000000
--- a/power-control-x86/CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR)
-project(power-control CXX)
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-option (
- CHASSIS_SYSTEM_RESET
- "Enable chassis system power reset to allow removing
- power and restoring back"
- OFF
-)
-option (
- USE_PLT_RST
- "Use the PLT_RST eSPI signal to detect warm reset
- instead of POST Complete"
- OFF
-)
-
-add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
-add_definitions(-DBOOST_SYSTEM_NO_DEPRECATED)
-add_definitions(-DBOOST_ALL_NO_LIB)
-add_definitions(-DBOOST_NO_RTTI)
-add_definitions(-DBOOST_NO_TYPEID)
-add_definitions(-DBOOST_ASIO_DISABLE_THREADS)
-
-set(SRC_FILES src/power_control.cpp)
-
-add_executable(${PROJECT_NAME} ${SRC_FILES})
-target_link_libraries(${PROJECT_NAME} gpiodcxx)
-target_link_libraries(${PROJECT_NAME} systemd)
-target_link_libraries(${PROJECT_NAME} sdbusplus)
-
-target_compile_definitions (
- ${PROJECT_NAME} PRIVATE $<$<BOOL:${CHASSIS_SYSTEM_RESET}>:
- -DCHASSIS_SYSTEM_RESET>
- ${PROJECT_NAME} PRIVATE $<$<BOOL:${USE_PLT_RST}>:
- -DUSE_PLT_RST>
-)
-
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-# Temporarily disable rtti
-# See https://github.com/chriskohlhoff/asio/issues/533
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-rtti")
-
-set(
- SERVICE_FILES
- ${PROJECT_SOURCE_DIR}/service_files/chassis-system-reset.service
- ${PROJECT_SOURCE_DIR}/service_files/chassis-system-reset.target
- ${PROJECT_SOURCE_DIR}/service_files/xyz.openbmc_project.Chassis.Control.Power@.service
- )
-
-set(
- CONFIG_FILE
- ${PROJECT_SOURCE_DIR}/config/power-config-host0.json
- )
-
-install(FILES ${SERVICE_FILES} DESTINATION /lib/systemd/system/)
-install(FILES ${CONFIG_FILE} DESTINATION /usr/share/x86-power-control/)
diff --git a/power-control-x86/service_files/chassis-system-reset.service b/service_files/chassis-system-reset.service
similarity index 100%
rename from power-control-x86/service_files/chassis-system-reset.service
rename to service_files/chassis-system-reset.service
diff --git a/power-control-x86/service_files/chassis-system-reset.target b/service_files/chassis-system-reset.target
similarity index 100%
rename from power-control-x86/service_files/chassis-system-reset.target
rename to service_files/chassis-system-reset.target
diff --git a/power-control-x86/service_files/xyz.openbmc_project.Chassis.Control.Power@.service b/service_files/xyz.openbmc_project.Chassis.Control.Power@.service
similarity index 100%
rename from power-control-x86/service_files/xyz.openbmc_project.Chassis.Control.Power@.service
rename to service_files/xyz.openbmc_project.Chassis.Control.Power@.service
diff --git a/power-control-x86/src/power_control.cpp b/src/power_control.cpp
similarity index 100%
rename from power-control-x86/src/power_control.cpp
rename to src/power_control.cpp