bic-utils : add bic-utils for wedge400 (#9)

Summary: 1. move bic-util from minipack to common 2. add gpiolib of minipack and wedge400 to bic-util Pull Request resolved: facebookexternal/openbmc.celestica#9 Test Plan: able to use bic-utils Reviewed By: mikechoifb fbshipit-source-id: d941e7cc05
facebook · Apr 16, 2019 · f773125 · f773125
1 parent 5e7d665
commit f773125
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/...ck/recipes-utils/bic-util/bic-util_0.1.bb → ...on/recipes-utils/bic-util/bic-util_0.1.bb b/...ck/recipes-utils/bic-util/bic-util_0.1.bb → ...on/recipes-utils/bic-util/bic-util_0.1.bb
@@ -1,7 +1,7 @@
 # Copyright 2018-present Facebook. All Rights Reserved.
 
 SUMMARY = "Bridge IC Utility"
-DESCRIPTION = "Util for checking with Bridge IC on Minipack"
+DESCRIPTION = "Util for checking with Bridge IC"
 SECTION = "base"
 PR = "r1"
 LICENSE = "GPLv2"
@@ -12,15 +12,15 @@ SRC_URI = "file://bic-util \
 
 S = "${WORKDIR}/bic-util"
 
-CFLAGS += " -lbic -lipmi -lipmb -lminipack_gpio -lfruid"
+CFLAGS += " -lbic -lipmi -lipmb -lfruid"
 
 
 do_install() {
-	  install -d ${D}${bindir}
+    install -d ${D}${bindir}
     install -m 0755 bic-util ${D}${bindir}/bic-util
 }
 
-DEPENDS += "libbic libipmi libipmb libminipack-gpio libfruid"
-RDEPENDS_${PN} += "libbic libipmi libipmb libminipack-gpio libfruid"
+DEPENDS += "libbic libipmi libipmb libfruid"
+RDEPENDS_${PN} += "libbic libipmi libipmb libfruid"
 
 FILES_${PN} = "${bindir}"
diff --git a/...es-utils/bic-util/files/bic-util/Makefile → ...es-utils/bic-util/files/bic-util/Makefile b/...es-utils/bic-util/files/bic-util/Makefile → ...es-utils/bic-util/files/bic-util/Makefile
diff --git a/...-utils/bic-util/files/bic-util/bic-util.c → ...-utils/bic-util/files/bic-util/bic-util.c b/...-utils/bic-util/files/bic-util/bic-util.c → ...-utils/bic-util/files/bic-util/bic-util.c
@@ -27,11 +27,20 @@
 #include <stdint.h>
 #include <pthread.h>
 #include <facebook/bic.h>
-#include <facebook/minipack_gpio.h>
 #include <openbmc/ipmi.h>
 #include <openbmc/fruid.h>
 #include <fcntl.h>
 
+#ifdef PLATFORM_MINIPACK
+#include <facebook/minipack_gpio.h>
+#define platform_gpio_type_to_name minipack_gpio_type_to_name
+#endif
+
+#ifdef PLATFORM_WEDGE400
+#include <facebook/wedge400_gpio.h>
+#define platform_gpio_type_to_name wedge400_gpio_type_to_name
+#endif
+
 #define LAST_RECORD_ID 0xFFFF
 #define MAX_SENSOR_NUM 0xFF
 #define BYTES_ENTIRE_RECORD 0xFF
@@ -231,7 +240,7 @@ util_get_gpio_config(uint8_t slot_id) {
     }
 
     printf("gpio_config for pin#%d (%s):\n",
-           i, minipack_gpio_type_to_name(i));
+           i, platform_gpio_type_to_name(i));
     printf("Direction: %s", t->bits.dir?"Output,":"Input, ");
     printf(" Interrupt: %s", t->bits.ie?"Enabled, ":"Disabled,");
     printf(" Trigger: %s", t->bits.edge?"Level ":"Edge ");

diff --git a/meta-facebook/meta-minipack/recipes-utils/bic-util/bic-util_%.bbappend b/meta-facebook/meta-minipack/recipes-utils/bic-util/bic-util_%.bbappend
@@ -0,0 +1,5 @@
+DESCRIPTION = "Util for checking with Bridge IC on Minipack"
+
+CFLAGS += "-DPLATFORM_MINIPACK -lminipack_gpio"
+DEPENDS += "libminipack-gpio"
+RDEPENDS_${PN} += "libminipack-gpio"
diff --git a/meta-facebook/meta-wedge400/recipes-utils/bic-util/bic-util_%.bbappend b/meta-facebook/meta-wedge400/recipes-utils/bic-util/bic-util_%.bbappend
@@ -0,0 +1,5 @@
+DESCRIPTION = "Util for checking with Bridge IC on Wedge400"
+
+CFLAGS += "-DPLATFORM_WEDGE400 -lwedge400_gpio"
+DEPENDS += "libwedge400-gpio"
+RDEPENDS_${PN} += "libwedge400-gpio"