Bump Zephyr to commit a4de2eb3d1756c

TODO: the include fixes can be probably refactored by including the
correct zephyr directories, as include/zephyr/posix/pthread.h should
already bringing in those header files.

TG-553
This commit is contained in:
Niccolò Izzo 2023-09-18 10:41:10 +02:00 committed by Silvano Seva
parent 6f567cc38d
commit e11c529807
4 changed files with 5 additions and 7 deletions

View File

@ -16,7 +16,6 @@
***************************************************************************/ ***************************************************************************/
#include "chan.h" #include "chan.h"
#include <pthread.h>
void chan_init(chan_t *c) void chan_init(chan_t *c)
{ {

View File

@ -20,7 +20,6 @@
#include <hwconfig.h> #include <hwconfig.h>
#include <pthread.h> #include <pthread.h>
#include <sched.h>
#include <ui.h> #include <ui.h>
#include <state.h> #include <state.h>
#include <threads.h> #include <threads.h>

View File

@ -32,7 +32,7 @@
zephyr,console = &usb_serial; zephyr,console = &usb_serial;
zephyr,shell-uart = &usb_serial; zephyr,shell-uart = &usb_serial;
zephyr,flash = &flash0; zephyr,flash = &flash0;
zephyr,display = &ssd1306; zephyr,display = &sh1106;
}; };
leds: leds { leds: leds {
@ -114,8 +114,8 @@
pinctrl-0 = <&i2c0_default>; pinctrl-0 = <&i2c0_default>;
pinctrl-names = "default"; pinctrl-names = "default";
ssd1306: ssd1306@3c { sh1106: sh1106@3c {
compatible = "solomon,ssd1306fb"; compatible = "sinowealth,sh1106";
reg = <0x3c>; reg = <0x3c>;
width = <128>; width = <128>;

View File

@ -2,7 +2,6 @@ CONFIG_SOC_SERIES_ESP32S3=y
CONFIG_BOOTLOADER_MCUBOOT=y CONFIG_BOOTLOADER_MCUBOOT=y
CONFIG_DISPLAY=y CONFIG_DISPLAY=y
CONFIG_SSD1306=y CONFIG_SSD1306=y
CONFIG_SSD1306_SH1106_COMPATIBLE=y
CONFIG_THREAD_STACK_INFO=y CONFIG_THREAD_STACK_INFO=y
CONFIG_DYNAMIC_THREAD=y CONFIG_DYNAMIC_THREAD=y
CONFIG_DYNAMIC_THREAD_STACK_SIZE=4096 CONFIG_DYNAMIC_THREAD_STACK_SIZE=4096
@ -10,7 +9,6 @@ CONFIG_DYNAMIC_THREAD_PREFER_POOL=y
CONFIG_DYNAMIC_THREAD_POOL_SIZE=4 CONFIG_DYNAMIC_THREAD_POOL_SIZE=4
CONFIG_COMMON_LIBC_MALLOC=y CONFIG_COMMON_LIBC_MALLOC=y
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=131072 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=131072
CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=0
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_GPIO_KEYS=y CONFIG_INPUT_GPIO_KEYS=y
CONFIG_SENSOR=y CONFIG_SENSOR=y
@ -22,3 +20,5 @@ CONFIG_SPI=y
CONFIG_LED_STRIP=y CONFIG_LED_STRIP=y
CONFIG_WS2812_STRIP=y CONFIG_WS2812_STRIP=y
CONFIG_WS2812_STRIP_SPI=y CONFIG_WS2812_STRIP_SPI=y
CONFIG_PICOLIBC_IO_FLOAT=y
CONFIG_POSIX_API=y