From 6f7cd6df1de1320dcd7a8b7f37661b4c9e961066 Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Thu, 12 Sep 2024 15:54:48 +0200 Subject: updated board def --- fw/fe310/eos/board.h | 20 ++++++++++---------- fw/fe310/eos/dev/Makefile | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fw/fe310/eos/board.h b/fw/fe310/eos/board.h index ad79a17..21732dc 100644 --- a/fw/fe310/eos/board.h +++ b/fw/fe310/eos/board.h @@ -4,25 +4,23 @@ #define SPI_DIV_CAM 24 #define SPI_CSID_NET 0 -#define SPI_CSID_EVE 3 +#define SPI_CSID_EVE 2 #define SPI_CSID_SDC -1 -#define SPI_CSID_CAM 2 +#define SPI_CSID_CAM 3 + +#define SPI_IOF_MASK ((1 << IOF_SPI1_SCK) | (1 << IOF_SPI1_MOSI) | (1 << IOF_SPI1_MISO) | (1 << IOF_SPI1_SS0) | (1 << IOF_SPI1_SS2) | (1 << IOF_SPI1_SS3)) #define SPI_CSPIN_NET -1 #define SPI_CSPIN_EVE -1 #define SPI_CSPIN_SDC 0 #define SPI_CSPIN_CAM -1 - +/* only when i2s is off */ #define SPI_CSPIN_LCD 21 -// SS2 used as I2S_PIN_INT -// #define SPI_IOF_MASK ((1 << IOF_SPI1_SCK) | (1 << IOF_SPI1_MOSI) | (1 << IOF_SPI1_MISO) | (1 << IOF_SPI1_SS0) | (1 << IOF_SPI1_SS2) | (1 << IOF_SPI1_SS3)) -#define SPI_IOF_MASK ((1 << IOF_SPI1_SCK) | (1 << IOF_SPI1_MOSI) | (1 << IOF_SPI1_MISO) | (1 << IOF_SPI1_SS0) | (1 << IOF_SPI1_SS3)) - #define NET_PIN_RTS 20 #define NET_PIN_CTS 22 -#define EVE_PIN_INTR 1 +#define EGPIO_PIN_INT 23 #define I2S_PIN_CK 1 /* PWM 0.1 */ #define I2S_PIN_SR_CK 18 @@ -31,7 +29,9 @@ #define I2S_PIN_WS_SPK 21 /* PWM 1.2 */ #define I2S_PIN_SD_IN 17 #define I2S_PIN_SD_OUT 16 -#define I2S_PIN_INT 9 +#define I2S_PIN_INT 16 -#define CTP_PIN_INT 23 +/* only when i2s is off */ +#define EVE_PIN_INTR 1 /* only when EGPIO_PIN_CTP_SEL is off */ +#define CTP_PIN_INT 1 /* only when EGPIO_PIN_CTP_SEL is on */ #define CTP_PIN_RST 19 diff --git a/fw/fe310/eos/dev/Makefile b/fw/fe310/eos/dev/Makefile index 611b24f..75f36ab 100644 --- a/fw/fe310/eos/dev/Makefile +++ b/fw/fe310/eos/dev/Makefile @@ -1,7 +1,7 @@ include ../../common.mk CFLAGS += -I$(bsp_dir)/include -I$(ext_dir)/crypto -obj = flash.o spi.o net.o bq25895.o sdcard.o sdc_crypto.o lcd.o gt911.o ili9806e.o eve.o ov2640.o cam.o +obj = flash.o spi.o net.o bq25895.o sdcard.o sdc_crypto.o lcd.o gt911.o ili9806e.o eve.o ov2640.o cam.o egpio.o fxl6408.o apds9151.o tps61052.o lib = ../../libeos-dev.a -- cgit v1.2.3