Skip to content

Commit

Permalink
wenyi0421GH-22 GH-42 WIP
Browse files Browse the repository at this point in the history
this commit contains the following changes:
* tpi_common is moved out of the buildroot folder. we intend on keeping
  this folder clean
* renamed tpi_common to tpi_rust, so its more clear that from here the
  rust development grows. Later when this component matures it probably
  its a good time to revise the name
* removed the dependency of the usbboot buildroot package as it seems
  that rust already have a crate which does this for us
* added an "app app_persistency". For now is chosen to use sqlite as
  backend. We might choose something lighter in the future as its used
  as key/value store for now
* WIP pin_controller
* WIP evdev_controller
  • Loading branch information
svenrademakers authored and ruslashev committed Jun 7, 2023
1 parent aec965e commit 75b52bd
Show file tree
Hide file tree
Showing 27 changed files with 2,144 additions and 62 deletions.
4 changes: 2 additions & 2 deletions app/bmc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CPPFLAGS +=
LDLIBS += -L./lib/ -lpthread -lgo -lcjson -ltpi_common
CPPFLAGS +=
LDLIBS += -L./lib/ -lpthread -lgo -lcjson -ltpi_rs -ldl -lm

all: bmc

Expand Down
2 changes: 0 additions & 2 deletions app/bmc/bmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

#include "comm_device_serial.h"

#include <tpi_common.h>

#define RTL_RESET GPIO_PIN_PG(13)
#define SYS_LED GPIO_PIN_PG(8)
#define RESET_LED GPIO_PIN_PG(9)
Expand Down
7 changes: 0 additions & 7 deletions app/tpi_common/Cargo.lock

This file was deleted.

8 changes: 0 additions & 8 deletions app/tpi_common/Cargo.toml

This file was deleted.

8 changes: 0 additions & 8 deletions app/tpi_common/src/lib.rs

This file was deleted.

5 changes: 0 additions & 5 deletions app/tpi_common/tpi_common.h

This file was deleted.

7 changes: 0 additions & 7 deletions buildroot/package/tpi_common/Config.in

This file was deleted.

18 changes: 0 additions & 18 deletions buildroot/package/tpi_common/tpi_common.mk

This file was deleted.

6 changes: 3 additions & 3 deletions tp2bmc/configs/tp2bmc_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
BR2_PACKAGE_HOST_MTOOLS=y

# wy modify
BR2_PACKAGE_CJSON=y
BR2_TARGET_GENERIC_ROOT_PASSWD="turing"
BR2_PACKAGE_MTD=y
Expand All @@ -91,9 +90,9 @@ BR2_PACKAGE_LIBTIRPC=y
BR2_PACKAGE_LIBEVENT=y
BR2_PACKAGE_COLLECTD=y
BR2_PACKAGE_COLLECTD_CURL=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_KEYUTILS=y

BR2_PACKAGE_LIBGPIOD=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_BMC=y
BR2_PACKAGE_TPI=y

Expand All @@ -105,3 +104,4 @@ BR2_PACKAGE_TPI_COMMON=y

BR2_PACKAGE_RASPBERRYPI_USBBOOT=y

BR2_PACKAGE_TPI_RS=y
2 changes: 1 addition & 1 deletion tp2bmc/package/bmc/Config.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
config BR2_PACKAGE_BMC
bool "bmc"
depends on BR2_PACKAGE_TPI_COMMON || BR2_PACKAGE_RASPBERRYPI_USBBOOT
depends on BR2_PACKAGE_TPI_RS
help
This is a bmc
2 changes: 1 addition & 1 deletion tp2bmc/package/bmc/bmc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ BMC_VERSION:= 1.0.0
BMC_SITE:= $(TOPDIR)/../app/bmc
BMC_SITE_METHOD:=local
BMC_INSTALL_TARGET:=YES
BMC_DEPENDENCIES = cjson tpi_common raspberrypi-usbboot
BMC_DEPENDENCIES = cjson tpi_rs

define BMC_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all
Expand Down
Loading

0 comments on commit 75b52bd

Please sign in to comment.