Skip to content

Sync with pebble main branch #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 66 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
df810e0
Add SF32LB support.
gangheivt Mar 14, 2025
8ca4082
Merge branch 'main' of github.com:gangheivt/pebble-firmware
gangheivt Mar 15, 2025
39b4d25
Add SifliSDK
gangheivt Mar 15, 2025
4fd1a1b
Add missing repo
gangheivt Mar 16, 2025
3a864dc
Add missing repo
gangheivt Mar 16, 2025
ccf0205
Merge branch 'main' of github.com:gangheivt/pebble-firmware
gangheivt Mar 16, 2025
9c45699
Update siflisdk submodule URL
rabbitsaviola Mar 17, 2025
77fd82f
Merge remote-tracking branch 'pebble-dev/main'
HalfSweet Mar 24, 2025
79feff9
feat: add uart interface
HalfSweet Mar 26, 2025
ae16881
feat: impl flash
HalfSweet Mar 26, 2025
ca3851d
fix: add DBG uart define
HalfSweet Mar 26, 2025
d2df064
Merge pull request #2 from HalfSweet/main
rabbitsaviola Mar 31, 2025
c4912de
Update ld file and add some stubs
rabbitsaviola Mar 31, 2025
056e231
Add flag to make NMI_Handler overrided
rabbitsaviola Mar 31, 2025
bbad477
fix: startup
HalfSweet Apr 1, 2025
a2d3552
fix: sf32lb52 not use accessory
HalfSweet Apr 3, 2025
db65f56
Add Bluetooth init code for SF32LB
gangheivt Apr 7, 2025
6a5bddf
Merge branch 'main' into main
gangheivt Apr 7, 2025
cd7e83b
Merge branch 'main' of github.com:gangheivt/pebble-firmware
gangheivt Apr 7, 2025
8b5bb18
Fix compile issue after merging.
gangheivt Apr 7, 2025
479a240
fix: flash stub
HalfSweet Apr 7, 2025
2c0bc5b
Rename platform name to obelix
gangheivt Apr 7, 2025
2cea1eb
Add pebble Bluetooth HCI driver for Sf32lb。
gangheivt Apr 9, 2025
7e9f7f8
Update SiFli SDK submodule
gangheivt Apr 9, 2025
137eb19
Merge branch 'pebble-dev:main' into main
gangheivt Apr 9, 2025
c4cf17e
update: freertos
HalfSweet Apr 9, 2025
f450a9a
update: sifli-sdk
HalfSweet Apr 9, 2025
fa56dab
feat: flash driver
HalfSweet Apr 9, 2025
e26f7ce
fix: flash clock div
HalfSweet Apr 9, 2025
f83a5a9
fix: no log error
HalfSweet Apr 9, 2025
9c678af
fix: flash region
HalfSweet Apr 9, 2025
731aacf
feat: sf32lb int flash region
HalfSweet Apr 11, 2025
ff03dca
bluetooth-fw/nimble: add support for store gen key callback
gmarull Apr 9, 2025
aaaaf6d
fw/services/bluetooth: drop ble root key generation support
gmarull Apr 9, 2025
751404b
fw/services/bluetooth: format bluetooth_ctl.c
gmarull Apr 9, 2025
a71ea95
fw/drivers: de-hack asterix driver build
gmarull Apr 9, 2025
dfbda6f
fw/drivers/nrf5/qspi: delete dead code
gmarull Apr 10, 2025
ac1df70
fw/drivers: fix asterix flash driver
gmarull Apr 10, 2025
bcdbfc9
fw/drivers/flash/qspi: drop dead code
gmarull Apr 10, 2025
5ff1daa
fw/drivers/flash: allow specifying quad mode parameters
gmarull Apr 10, 2025
e813326
fw/drivers/flash/gd25lq255e: add quad mode parameters
gmarull Apr 10, 2025
a2de141
fw/drivers/flash: allow specifying all read/write op codes
gmarull Apr 10, 2025
6354c48
fw/drivers/flash/gd25lq255e: add additional read/write op codes
gmarull Apr 10, 2025
c3fe291
fw/drivers/flash: allow specifying read/write 'mode'
gmarull Apr 10, 2025
b976ce0
fw/drivers/nrf5/qspi: respect device read/write 'mode'
gmarull Apr 10, 2025
131dd34
fw/drivers/flash: use rdsr1/2 naming for status registers
gmarull Apr 10, 2025
d39b636
fw/drivers/flash: add support for wrsr op code
gmarull Apr 10, 2025
c274473
fw/drivers/flash/gd25lq255e: specify wrsr
gmarull Apr 10, 2025
fb46bf3
fw/drivers/flash: add support for wrsr2 op code
gmarull Apr 10, 2025
88b12ea
fw/drivers/nrf5/qspi: format file
gmarull Apr 10, 2025
48ec07a
fw/drivers/nrf5/qspi: add support for QE bit setting
gmarull Apr 10, 2025
b22bdad
boards/asterix: add missing QSPI pins
gmarull Apr 10, 2025
13c691f
fw/boards/asterix: use READ4IO/PP4O for QSPI flash
gmarull Apr 10, 2025
52d6b5f
fw/drivers/flash: format a few files
gmarull Apr 10, 2025
c256d03
boards/asterix: format file
gmarull Apr 10, 2025
fbb298b
third_party/hal_sifli: Fix build error caused by typo in wscript
rabbitsaviola Apr 16, 2025
4bd0f70
chore: DBG_UART use USART1
HalfSweet Apr 16, 2025
b04d450
Update display setting.
gangheivt Apr 17, 2025
a97cf83
Add LCPU image
gangheivt Apr 18, 2025
cb780e5
Disable bt hci for booting.
gangheivt Apr 19, 2025
1096130
add i2c and jdi driver
w200024212 Apr 23, 2025
c0f209a
feat: add rtc drivers
HalfSweet Apr 24, 2025
3b9ec1e
Fix HCI transport issue.
gangheivt Apr 25, 2025
35d76fa
Add Sifli download tool
gangheivt Apr 25, 2025
426eb6f
fix: RTC init
Apr 27, 2025
81d1fba
Fix LCPU init issue
gangheivt Apr 27, 2025
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
Prev Previous commit
Next Next commit
fw/drivers/nrf5/qspi: respect device read/write 'mode'
Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
gmarull authored and gangheivt committed Apr 15, 2025
commit b976ce0c6bd9603523e78ad1f0863ba0d0c6eb94
36 changes: 34 additions & 2 deletions src/fw/drivers/nrf5/qspi.c
Original file line number Diff line number Diff line change
@@ -149,8 +149,40 @@ void qspi_flash_init(QSPIFlash *dev, QSPIFlashPart *part, bool coredump_mode) {
dev->qspi->clk_gpio, dev->qspi->cs_gpio, dev->qspi->data_gpio[0],
dev->qspi->data_gpio[1], dev->qspi->data_gpio[2], dev->qspi->data_gpio[3]);
config.phy_if.sck_freq = NRF_QSPI_FREQ_32MDIV1;
config.prot_if.readoc = NRF_QSPI_READOC_FASTREAD; /* XXX: later: use QSPI mode */
config.prot_if.writeoc = NRF_QSPI_WRITEOC_PP;

switch (dev->read_mode) {
case QSPI_FLASH_READ_READ2O:
config.prot_if.readoc = NRF_QSPI_READOC_READ2O;
break;
case QSPI_FLASH_READ_READ2IO:
config.prot_if.readoc = NRF_QSPI_READOC_READ2IO;
break;
case QSPI_FLASH_READ_READ4O:
config.prot_if.readoc = NRF_QSPI_READOC_READ4O;
break;
case QSPI_FLASH_READ_READ4IO:
config.prot_if.readoc = NRF_QSPI_READOC_READ4IO;
break;
default:
config.prot_if.readoc = NRF_QSPI_READOC_FASTREAD;
break;
}

switch (dev->write_mode) {
case QSPI_FLASH_WRITE_PP2O:
config.prot_if.writeoc = NRF_QSPI_WRITEOC_PP2O;
break;
case QSPI_FLASH_WRITE_PP4O:
config.prot_if.writeoc = NRF_QSPI_WRITEOC_PP4O;
break;
case QSPI_FLASH_WRITE_PP4IO:
config.prot_if.writeoc = NRF_QSPI_WRITEOC_PP4IO;
break;
default:
config.prot_if.writeoc = NRF_QSPI_WRITEOC_PP;
break;
}

config.prot_if.addrmode = NRF_QSPI_ADDRMODE_24BIT;

nrfx_err_t err;