Refactor Common plat_class Functions for Expansion Boards

Summary:
The expansion cards shared some code that should be extracted out into
common libraries.

In order to facilitate building the expansion board library and not
including extra logic for boards that don't use it; The library
directory was expanded in the CMakeLists.txt files so we can choose to
not include specific libraries.

In general globbing in cmake isn't great...

Reviewed By: garnermic

Differential Revision: D38228112

fbshipit-source-id: 1364addeffa06eb4a0487b9b74c3c5490eb7be77

Author: GoldenBug

…cebook/yv35-rf/src/platform/plat_class.c common/lib/expansion_board.cmeta-facebook/yv35-rf/src/platform/plat_class.c renamed to common/lib/expansion_board.c meta-facebook/yv35-rf/src/platform/plat_class.c renamed to common/lib/expansion_board.c

@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include "hal_gpio.h"
-#include "plat_class.h"
+#include "expansion_board.h"
 
 static uint8_t system_board_id = 0;
 
@@ -26,8 +26,11 @@ void init_sys_board_id(uint8_t board_id)
 void init_platform_config()
 {
 	uint8_t board_id = 0;
-	board_id = ((gpio_get(BOARD_ID_BIT_3) << 3) | (gpio_get(BOARD_ID_BIT_2) << 2) |
-		    (gpio_get(BOARD_ID_BIT_1) << 1) | (gpio_get(BOARD_ID_BIT_0) << 0));
+
+	board_id = (gpio_get(BOARD_ID3) << 3);
+	board_id |= (gpio_get(BOARD_ID2) << 2);
+	board_id |= (gpio_get(BOARD_ID1) << 1);
+	board_id |= (gpio_get(BOARD_ID0) << 0);
 
 	init_sys_board_id(board_id);
 	printf("[%s] board id 0x%x\n", __func__, system_board_id);

…cebook/yv35-rf/src/platform/plat_class.h common/lib/expansion_board.hmeta-facebook/yv35-rf/src/platform/plat_class.h renamed to common/lib/expansion_board.h meta-facebook/yv35-rf/src/platform/plat_class.h renamed to common/lib/expansion_board.h

@@ -1,5 +1,5 @@
-#ifndef PLAT_CLASS_H
-#define PLAT_CLASS_H
+#ifndef EXPANSION_BOARD_H
+#define EXPANSION_BOARD_H
 
 #include "hal_gpio.h"
 #include "plat_gpio.h"
@@ -11,13 +11,6 @@ enum BOARD_ID {
 	UNKNOWN_BOARD = 0xFF,
 };
 
-enum BOARD_ID_BIT_MAPPING {
-	BOARD_ID_BIT_0 = BOARD_ID0,
-	BOARD_ID_BIT_1 = BOARD_ID1,
-	BOARD_ID_BIT_2 = BOARD_ID2,
-	BOARD_ID_BIT_3 = BOARD_ID3,
-};
-
 void init_platform_config();
 void init_sys_board_id(uint8_t board_id);
 uint8_t get_board_id();

meta-facebook/gt-cc/CMakeLists.txt

@@ -7,13 +7,23 @@ project(gt-cc)
 
 set(common_path ../../common)
 FILE(GLOB app_sources src/ipmi/*.c src/platform/*.c src/lib/*.c src/shell/*.c)
-FILE(GLOB common_sources ${common_path}/service/*.c ${common_path}/service/*/*.c ${common_path}/hal/*.c ${common_path}/dev/*.c ${common_path}/lib/*.c ${common_path}/shell/*.c)
+FILE(GLOB common_sources ${common_path}/service/*.c ${common_path}/service/*/*.c ${common_path}/hal/*.c ${common_path}/dev/*.c ${common_path}/shell/*.c)
 
 target_sources(app PRIVATE ${app_sources})
 target_sources(app PRIVATE ${common_sources})
+
+# Common Lib
+target_sources(app PRIVATE ${common_path}/lib/libutil.c)
+target_sources(app PRIVATE ${common_path}/lib/power_status.c)
+target_sources(app PRIVATE ${common_path}/lib/timer.c)
+target_sources(app PRIVATE ${common_path}/lib/util_pmbus.c)
+target_sources(app PRIVATE ${common_path}/lib/util_spi.c)
+target_sources(app PRIVATE ${common_path}/lib/util_sys.c)
+target_sources(app PRIVATE ${common_path}/lib/util_worker.c)
+
 target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
 target_include_directories(app PRIVATE ${common_path} ${common_path}/service/ipmi/include ${common_path}/service/host ${common_path}/service/sensor ${common_path}/service/usb ${common_path}/service/ipmb ${common_path}/service/mctp ${common_path}/service/pldm ${common_path}/hal ${common_path}/dev/include ${common_path}/lib ${common_path}/shell)
 target_include_directories(app PRIVATE src/ipmi/include src/lib src/platform src/shell)
 
 # Fail build if there are any warnings 
-target_compile_options(app PRIVATE -Werror)
+target_compile_options(app PRIVATE -Werror)

meta-facebook/gt-cc/src/platform/plat_class.c

@@ -2,7 +2,6 @@
 #include "hal_peci.h"
 #include "power_status.h"
 #include "util_sys.h"
-#include "plat_class.h"
 #include "plat_gpio.h"
 #include "plat_i2c_target.h"
 #include "pldm.h"

meta-facebook/gt-cc/src/platform/plat_class.h

@@ -4,7 +4,6 @@
 #include "plat_i2c.h"
 #include "plat_ipmb.h"
 #include "plat_ipmi.h"
-#include "plat_class.h"
 
 IPMB_config pal_IPMB_config_table[] = {
 	// index, interface, channel, bus, channel_target_address, enable_status, self_address,

meta-facebook/gt-cc/src/platform/plat_init.c

@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "sdr.h"
-#include "plat_class.h"
 #include "plat_ipmb.h"
 #include "plat_sensor_table.h"
 

meta-facebook/gt-cc/src/platform/plat_ipmb.c

@@ -8,7 +8,6 @@
 #include "ast_adc.h"
 #include "intel_peci.h"
 #include "hal_gpio.h"
-#include "plat_class.h"
 #include "plat_gpio.h"
 #include "plat_hook.h"
 #include "plat_i2c.h"

meta-facebook/gt-cc/src/platform/plat_sdr_table.c

@@ -7,10 +7,20 @@ project(wc-mb)
 
 set(common_path ../../common)
 FILE(GLOB app_sources src/ipmi/*.c src/platform/*.c src/lib/*.c)
-FILE(GLOB common_sources ${common_path}/service/*.c ${common_path}/service/*/*.c ${common_path}/hal/*.c ${common_path}/dev/*.c ${common_path}/lib/*.c ${common_path}/shell/*.c)
+FILE(GLOB common_sources ${common_path}/service/*.c ${common_path}/service/*/*.c ${common_path}/hal/*.c ${common_path}/dev/*.c ${common_path}/shell/*.c)
 
 target_sources(app PRIVATE ${app_sources})
 target_sources(app PRIVATE ${common_sources})
+
+# Common Lib
+target_sources(app PRIVATE ${common_path}/lib/libutil.c)
+target_sources(app PRIVATE ${common_path}/lib/power_status.c)
+target_sources(app PRIVATE ${common_path}/lib/timer.c)
+target_sources(app PRIVATE ${common_path}/lib/util_pmbus.c)
+target_sources(app PRIVATE ${common_path}/lib/util_spi.c)
+target_sources(app PRIVATE ${common_path}/lib/util_sys.c)
+target_sources(app PRIVATE ${common_path}/lib/util_worker.c)
+
 target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
 target_include_directories(app PRIVATE ${common_path} ${common_path}/service/ipmi/include ${common_path}/service/host ${common_path}/service/sensor ${common_path}/service/usb ${common_path}/service/ipmb ${common_path}/service/mctp ${common_path}/service/pldm ${common_path}/hal ${common_path}/dev/include ${common_path}/lib ${common_path}/shell)
 target_include_directories(app PRIVATE src/ipmi/include src/lib src/platform)