djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix doc build and address feedback

This commit is contained in:
Scott Shawcroft 2021-03-22 15:24:27 -07:00
parent 4aea7f8f52
commit f200e6a21e
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf.py
View File

@ -154,6 +154,7 @@ exclude_patterns = ["**/build*",
".env", ".env",
".venv", ".venv",
".direnv", ".direnv",
"data",
"docs/autoapi", "docs/autoapi",
"docs/README.md", "docs/README.md",
"drivers", "drivers",

1
ports/raspberrypi/Makefile
View File

@ -233,7 +233,6 @@ SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE))
SRC_COMMON_HAL_SHARED_MODULE_EXPANDED = $(sort $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED)) SRC_COMMON_HAL_SHARED_MODULE_EXPANDED = $(sort $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED))
SRC_S = supervisor/$(CHIP_FAMILY)_cpu.s SRC_S = supervisor/$(CHIP_FAMILY)_cpu.s
BOOT2_S_UPPER ?= sdk/src/rp2_common/boot_stage2/boot2_generic_03h.S
BOOT2_S_CFLAGS ?= -DPICO_FLASH_SPI_CLKDIV=4 BOOT2_S_CFLAGS ?= -DPICO_FLASH_SPI_CLKDIV=4
SRC_S_UPPER = sdk/src/rp2_common/hardware_divider/divider.S \ SRC_S_UPPER = sdk/src/rp2_common/hardware_divider/divider.S \
sdk/src/rp2_common/hardware_irq/irq_handler_chain.S \ sdk/src/rp2_common/hardware_irq/irq_handler_chain.S \

6
ports/raspberrypi/gen_stage2.py
View File

@ -6,11 +6,11 @@ from jinja2 import Template
def main(input_template: pathlib.Path, output_path: pathlib.Path, skus: str = typer.Argument("")): def main(input_template: pathlib.Path, output_path: pathlib.Path, skus: str = typer.Argument("")):
if ", " in skus: if "," in skus:
skus = skus.split(", ") skus = skus.split(",")
else: else:
skus = [skus] skus = [skus]
skus = ['sku="{}"'.format(f) for f in skus] skus = ['sku="{}"'.format(f.strip()) for f in skus]
flashes = cascadetoml.filter_toml(pathlib.Path("../../data/nvm.toml"), skus) flashes = cascadetoml.filter_toml(pathlib.Path("../../data/nvm.toml"), skus)
if len(skus) == 0: if len(skus) == 0:

1
ports/raspberrypi/stage2.c.jinja
View File

@ -1,6 +1,5 @@
#include "sdk/src/rp2040/hardware_structs/include/hardware/structs/ssi.h" #include "sdk/src/rp2040/hardware_structs/include/hardware/structs/ssi.h"
#include "sdk/src/rp2040/hardware_structs/include/hardware/structs/pads_qspi.h" #include "sdk/src/rp2040/hardware_structs/include/hardware/structs/pads_qspi.h"
#include "sdk/src/rp2040/hardware_structs/include/hardware/structs/watchdog.h"
#include "sdk/src/rp2040/hardware_regs/include/hardware/regs/addressmap.h" #include "sdk/src/rp2040/hardware_regs/include/hardware/regs/addressmap.h"
#include "sdk/src/rp2040/hardware_regs/include/hardware/regs/m0plus.h" #include "sdk/src/rp2040/hardware_regs/include/hardware/regs/m0plus.h"

6
ports/raspberrypi/supervisor/internal_flash.c
View File

@ -69,7 +69,11 @@ void supervisor_flash_init(void) {
uint8_t data[4]; uint8_t data[4];
flash_do_cmd(cmd, data, 4); flash_do_cmd(cmd, data, 4);
uint8_t power_of_two = 21; uint8_t power_of_two = 21;
if (data[3] >= 20 && data[3] < 30) { // Flash must be at least 2MB (1 << 21) because we use the first 1MB for the
// CircuitPython core. We validate the range because Adesto Tech flash chips
// don't return the correct value. So, we default to 2MB which will work for
// larger chips, it just won't use all of the space.
if (data[3] >= 21 && data[3] < 30) {
power_of_two = data[3]; power_of_two = data[3];
} }
_flash_size = 1 << power_of_two; _flash_size = 1 << power_of_two;

2
ports/raspberrypi/supervisor/port.c
View File

@ -88,7 +88,7 @@ safe_mode_t port_init(void) {
// Set brown out. // Set brown out.
// Copy all of the "tightly coupled memory" code and data to run from RAM. // Copy all of the "tightly coupled memory" code and data to run from RAM.
// This let's us use the 16k cache for dynamically used data and code. // This lets us use the 16k cache for dynamically used data and code.
// We must do this before we try and call any of its code or load the data. // We must do this before we try and call any of its code or load the data.
for (uint32_t i = 0; i < ((size_t)&_ld_itcm_size) / 4; i++) { for (uint32_t i = 0; i < ((size_t)&_ld_itcm_size) / 4; i++) {
(&_ld_itcm_destination)[i] = (&_ld_itcm_flash_copy)[i]; (&_ld_itcm_destination)[i] = (&_ld_itcm_flash_copy)[i];