From 9aaed0af037ee5735499320e53047204d714542a Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 12 Apr 2024 14:02:32 +0100 Subject: [PATCH] CI: TEST: Add 1023/1024 split Pico build. --- .github/workflows/micropython.yml | 2 + micropython/board/PIMORONI_PICO/board.json | 20 ++ micropython/board/PIMORONI_PICO/manifest.py | 3 + micropython/board/PIMORONI_PICO/memmap_mp.ld | 274 ++++++++++++++++++ .../board/PIMORONI_PICO/mpconfigboard.cmake | 7 + .../board/PIMORONI_PICO/mpconfigboard.h | 3 + micropython/board/PIMORONI_PICO/pins.csv | 28 ++ .../modules/micropython-pimoroni_pico.cmake | 16 + 8 files changed, 353 insertions(+) create mode 100644 micropython/board/PIMORONI_PICO/board.json create mode 100644 micropython/board/PIMORONI_PICO/manifest.py create mode 100644 micropython/board/PIMORONI_PICO/memmap_mp.ld create mode 100644 micropython/board/PIMORONI_PICO/mpconfigboard.cmake create mode 100644 micropython/board/PIMORONI_PICO/mpconfigboard.h create mode 100644 micropython/board/PIMORONI_PICO/pins.csv create mode 100644 micropython/modules/micropython-pimoroni_pico.cmake diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index 9b6c76a12..e8afd9e31 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -21,6 +21,8 @@ jobs: board: RPI_PICO - name: picow board: RPI_PICO_W + - name: pimoroni_pico + board: PIMORONI_PICO - name: tiny2040_8mb board: PIMORONI_TINY2040 - name: picolipo_4mb diff --git a/micropython/board/PIMORONI_PICO/board.json b/micropython/board/PIMORONI_PICO/board.json new file mode 100644 index 000000000..5a67a25e3 --- /dev/null +++ b/micropython/board/PIMORONI_PICO/board.json @@ -0,0 +1,20 @@ +{ + "deploy": [ + "../deploy.md" + ], + "docs": "", + "features": [ + "Breadboard friendly", + "Castellated Pads", + "Micro USB" + ], + "id": "rp2-pico", + "images": [ + "rp2-pico.jpg" + ], + "mcu": "rp2040", + "product": "Pico", + "thumbnail": "", + "url": "https://www.raspberrypi.com/products/raspberry-pi-pico/", + "vendor": "Raspberry Pi" +} \ No newline at end of file diff --git a/micropython/board/PIMORONI_PICO/manifest.py b/micropython/board/PIMORONI_PICO/manifest.py new file mode 100644 index 000000000..30ce0dd26 --- /dev/null +++ b/micropython/board/PIMORONI_PICO/manifest.py @@ -0,0 +1,3 @@ +include("$(PORT_DIR)/boards/manifest.py") + +include("../manifest_pico.py") \ No newline at end of file diff --git a/micropython/board/PIMORONI_PICO/memmap_mp.ld b/micropython/board/PIMORONI_PICO/memmap_mp.ld new file mode 100644 index 000000000..da9eac8a5 --- /dev/null +++ b/micropython/board/PIMORONI_PICO/memmap_mp.ld @@ -0,0 +1,274 @@ +/* Based on GCC ARM embedded samples. + Defines the following symbols for use by code: + __exidx_start + __exidx_end + __etext + __data_start__ + __preinit_array_start + __preinit_array_end + __init_array_start + __init_array_end + __fini_array_start + __fini_array_end + __data_end__ + __bss_start__ + __bss_end__ + __end__ + end + __HeapLimit + __StackLimit + __StackTop + __stack (== StackTop) +*/ + +/* Default RP2 flash size. Assumes no user filesystem. */ +_flash_start = 0x10000000; +_flash_size = 2048k; +_flash_app_size = 1024k; +_flash_fs_size = _flash_size - _flash_app_size; +_flash_fs_start = _flash_start + _flash_app_size; + +MEMORY +{ + FLASH(rx) : ORIGIN = _flash_start, LENGTH = _flash_size + APP(rx) : ORIGIN = _flash_start, LENGTH = _flash_app_size + FILESYSTEM(r) : ORIGIN = _flash_fs_start, LENGTH = _flash_fs_size + RAM(rwx) : ORIGIN = 0x20000000, LENGTH = 256k + SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k + SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k +} + +ENTRY(_entry_point) + +SECTIONS +{ + /* Second stage bootloader is prepended to the image. It must be 256 bytes big + and checksummed. It is usually built by the boot_stage2 target + in the Raspberry Pi Pico SDK + */ + + .flash_begin : { + __flash_binary_start = .; + } > APP + + .boot2 : { + __boot2_start__ = .; + KEEP (*(.boot2)) + __boot2_end__ = .; + } > APP + + ASSERT(__boot2_end__ - __boot2_start__ == 256, + "ERROR: Pico second stage bootloader must be 256 bytes in size") + + /* The second stage will always enter the image at the start of .text. + The debugger will use the ELF entry point, which is the _entry_point + symbol if present, otherwise defaults to start of .text. + This can be used to transfer control back to the bootrom on debugger + launches only, to perform proper flash setup. + */ + + .text : { + __logical_binary_start = .; + KEEP (*(.vectors)) + KEEP (*(.binary_info_header)) + __binary_info_header_end = .; + KEEP (*(.reset)) + /* TODO revisit this now memset/memcpy/float in ROM */ + /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from + * FLASH ... we will include any thing excluded here in .data below by default */ + *(.init) + /* Change for MicroPython... exclude gc.c, parse.c, vm.c from flash */ + *(EXCLUDE_FILE(*libgcc.a: *libc.a: *lib_a-mem*.o *libm.a: *gc.c.obj *vm.c.obj *parse.c.obj) .text*) + *(.fini) + /* Pull all c'tors into .text */ + *crtbegin.o(.ctors) + *crtbegin?.o(.ctors) + *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors) + *(SORT(.ctors.*)) + *(.ctors) + /* Followed by destructors */ + *crtbegin.o(.dtors) + *crtbegin?.o(.dtors) + *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors) + *(SORT(.dtors.*)) + *(.dtors) + + *(.eh_frame*) + . = ALIGN(4); + } > APP + + .rodata : { + *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*) + . = ALIGN(4); + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.flashdata*))) + . = ALIGN(4); + } > APP + + .ARM.extab : + { + *(.ARM.extab* .gnu.linkonce.armextab.*) + } > APP + + __exidx_start = .; + .ARM.exidx : + { + *(.ARM.exidx* .gnu.linkonce.armexidx.*) + } > APP + __exidx_end = .; + + /* Machine inspectable binary information */ + . = ALIGN(4); + __binary_info_start = .; + .binary_info : + { + KEEP(*(.binary_info.keep.*)) + *(.binary_info.*) + } > APP + __binary_info_end = .; + . = ALIGN(4); + + /* End of .text-like segments */ + __etext = .; + + .ram_vector_table (COPY): { + *(.ram_vector_table) + } > RAM + + .data : { + __data_start__ = .; + *(vtable) + + *(.time_critical*) + + /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */ + *(.text*) + . = ALIGN(4); + *(.rodata*) + . = ALIGN(4); + + *(.data*) + + . = ALIGN(4); + *(.after_data.*) + . = ALIGN(4); + /* preinit data */ + PROVIDE_HIDDEN (__mutex_array_start = .); + KEEP(*(SORT(.mutex_array.*))) + KEEP(*(.mutex_array)) + PROVIDE_HIDDEN (__mutex_array_end = .); + + . = ALIGN(4); + /* preinit data */ + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP(*(SORT(.preinit_array.*))) + KEEP(*(.preinit_array)) + PROVIDE_HIDDEN (__preinit_array_end = .); + + . = ALIGN(4); + /* init data */ + PROVIDE_HIDDEN (__init_array_start = .); + KEEP(*(SORT(.init_array.*))) + KEEP(*(.init_array)) + PROVIDE_HIDDEN (__init_array_end = .); + + . = ALIGN(4); + /* finit data */ + PROVIDE_HIDDEN (__fini_array_start = .); + *(SORT(.fini_array.*)) + *(.fini_array) + PROVIDE_HIDDEN (__fini_array_end = .); + + *(.jcr) + . = ALIGN(4); + /* All data end */ + __data_end__ = .; + } > RAM AT> APP + + .uninitialized_data (COPY): { + . = ALIGN(4); + *(.uninitialized_data*) + } > RAM + + /* bss without zero init on startup */ + .uninitialized_bss (NOLOAD): { + . = ALIGN(4); + *(.uninitialized_bss*) + } > RAM + + /* Start and end symbols must be word-aligned */ + .scratch_x : { + __scratch_x_start__ = .; + *(.scratch_x.*) + . = ALIGN(4); + __scratch_x_end__ = .; + } > SCRATCH_X AT > APP + __scratch_x_source__ = LOADADDR(.scratch_x); + + .scratch_y : { + __scratch_y_start__ = .; + *(.scratch_y.*) + . = ALIGN(4); + __scratch_y_end__ = .; + } > SCRATCH_Y AT > APP + __scratch_y_source__ = LOADADDR(.scratch_y); + + .bss : { + . = ALIGN(4); + __bss_start__ = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*))) + *(COMMON) + . = ALIGN(4); + __bss_end__ = .; + } > RAM + + .heap (COPY): + { + __end__ = .; + end = __end__; + *(.heap*) + __HeapLimit = .; + } > RAM + + /* .stack*_dummy section doesn't contains any symbols. It is only + * used for linker to calculate size of stack sections, and assign + * values to stack symbols later + * + * stack1 section may be empty/missing if platform_launch_core1 is not used */ + + /* by default we put core 0 stack at the end of scratch Y, so that if core 1 + * stack is not used then all of SCRATCH_X is free. + */ + .stack1_dummy (COPY): + { + *(.stack1*) + } > SCRATCH_X + .stack_dummy (COPY): + { + *(.stack*) + } > SCRATCH_Y + + .flash_end : { + __flash_binary_end = .; + } > APP + + /* stack limit is poorly named, but historically is maximum heap ptr */ + __StackLimit = __bss_end__ + __micropy_c_heap_size__; + + /* Define start and end of GC heap */ + __GcHeapStart = __StackLimit; /* after the C heap (sbrk limit) */ + __GcHeapEnd = ORIGIN(RAM) + LENGTH(RAM); + + /* Define memory for the C stack */ + __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X); + __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y); + __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy); + __StackBottom = __StackTop - SIZEOF(.stack_dummy); + PROVIDE(__stack = __StackTop); + + /* Check GC heap is at least 128 KB */ + /* On a RP2040 using all SRAM this should always be the case. */ + ASSERT((__GcHeapEnd - __GcHeapStart) > 128*1024, "GcHeap is too small") + + ASSERT( __binary_info_header_end - __logical_binary_start <= 256, "Binary info must be in first 256 bytes of the binary") + /* todo assert on extra code */ +} diff --git a/micropython/board/PIMORONI_PICO/mpconfigboard.cmake b/micropython/board/PIMORONI_PICO/mpconfigboard.cmake new file mode 100644 index 000000000..c89ff7803 --- /dev/null +++ b/micropython/board/PIMORONI_PICO/mpconfigboard.cmake @@ -0,0 +1,7 @@ +# cmake file for Raspberry Pi Pico +set(PICO_BOARD "pico") + +# Board specific version of the frozen manifest +set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py) + +set(MICROPY_C_HEAP_SIZE 4096) \ No newline at end of file diff --git a/micropython/board/PIMORONI_PICO/mpconfigboard.h b/micropython/board/PIMORONI_PICO/mpconfigboard.h new file mode 100644 index 000000000..280986bee --- /dev/null +++ b/micropython/board/PIMORONI_PICO/mpconfigboard.h @@ -0,0 +1,3 @@ +// Board and hardware specific configuration +#define MICROPY_HW_BOARD_NAME "Raspberry Pi Pico 1024" +#define MICROPY_HW_FLASH_STORAGE_BYTES (1024 * 1024) diff --git a/micropython/board/PIMORONI_PICO/pins.csv b/micropython/board/PIMORONI_PICO/pins.csv new file mode 100644 index 000000000..9c40b41c9 --- /dev/null +++ b/micropython/board/PIMORONI_PICO/pins.csv @@ -0,0 +1,28 @@ +GP0,GPIO0 +GP1,GPIO1 +GP2,GPIO2 +GP3,GPIO3 +GP4,GPIO4 +GP5,GPIO5 +GP6,GPIO6 +GP7,GPIO7 +GP8,GPIO8 +GP9,GPIO9 +GP10,GPIO10 +GP11,GPIO11 +GP12,GPIO12 +GP13,GPIO13 +GP14,GPIO14 +GP15,GPIO15 +GP16,GPIO16 +GP17,GPIO17 +GP18,GPIO18 +GP19,GPIO19 +GP20,GPIO20 +GP21,GPIO21 +GP22,GPIO22 +GP25,GPIO25 +GP26,GPIO26 +GP27,GPIO27 +GP28,GPIO28 +LED,GPIO25 \ No newline at end of file diff --git a/micropython/modules/micropython-pimoroni_pico.cmake b/micropython/modules/micropython-pimoroni_pico.cmake new file mode 100644 index 000000000..94ed6a2bb --- /dev/null +++ b/micropython/modules/micropython-pimoroni_pico.cmake @@ -0,0 +1,16 @@ +include_directories(${CMAKE_CURRENT_LIST_DIR}/../../) + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../") + +set(CMAKE_C_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) + +include(micropython-common) +include(pico_wireless/micropython) + +enable_ulab() + +# C++ Magic Memory +include(cppmem/micropython)