Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bricks/_common/arm_none_eabi.mk
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,9 @@ NXOS_SRC_S = $(addprefix lib/pbio/platform/nxt/nxos/,\
irq.s \
)

ifneq ($(PB_MCU_FAMILY),TIAM1808)
SRC_S += lib/pbio/platform/$(PBIO_PLATFORM)/startup.s
endif

OBJ = $(PY_O)
OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
Expand Down
4 changes: 2 additions & 2 deletions lib/pbio/drv/display/display_ev3.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ PROCESS(pbdrv_display_ev3_init_process, "st7586s");
*
* Non-atomic updated by the application are allowed.
*/
static uint8_t pbdrv_display_user_frame[PBDRV_CONFIG_DISPLAY_NUM_ROWS][PBDRV_CONFIG_DISPLAY_NUM_COLS] __attribute__((section(".pbdrv_display_user_frame"), used));
static uint8_t pbdrv_display_user_frame[PBDRV_CONFIG_DISPLAY_NUM_ROWS][PBDRV_CONFIG_DISPLAY_NUM_COLS] __attribute__((section(".noinit"), used));

/**
* Flag to indicate that the user frame has been updated and needs to be
Expand Down Expand Up @@ -164,7 +164,7 @@ static bool pbdrv_display_user_frame_update_requested = false;
* Even in monochrome mode, you can only have 3 pixels per byte, so there is no
* savings in using it. We might as well support gray scale.
*/
static uint8_t st7586s_send_buf[ST7586S_NUM_COL_TRIPLETS * ST7586S_NUM_ROWS] __attribute__((section(".st7586s_send_buf"), used));
static uint8_t st7586s_send_buf[ST7586S_NUM_COL_TRIPLETS * ST7586S_NUM_ROWS] __attribute__((section(".noinit"), used));

/**
* Encode a triplet of pixels into a single byte in the format descrived above.
Expand Down
16 changes: 1 addition & 15 deletions lib/pbio/platform/ev3/platform.ld
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,11 @@ MEMORY
DDR (rwx) : ORIGIN = 0xC0008000, LENGTH = (64M - 0x8000)
}

_minimal_stack_size = 64K;
_minimal_stack_size = 4M;
pbdrv_stack_end = ORIGIN(DDR) + LENGTH(DDR) - 4;

SECTIONS
{
.startcode :
{
. = ALIGN(4);
*startup.o (.text)
} > DDR

.text :
{
. = ALIGN(4);
Expand Down Expand Up @@ -51,14 +45,6 @@ SECTIONS
_pru0_end = .;
} >DDR

.display_frames (NOLOAD) :
{
. = ALIGN(4);
*(.pbdrv_display_user_frame)
. = ALIGN(4);
*(.st7586s_send_buf)
} > DDR

/* Uninitialized (not zeroed at startup) data section */

.noinit (NOLOAD) :
Expand Down
1 change: 0 additions & 1 deletion lib/pbio/platform/ev3/startup.s

This file was deleted.