From 3d97995b8ea1f4a3edb781405129406bcff561e1 Mon Sep 17 00:00:00 2001 From: Michal Gorecki Date: Mon, 1 Jul 2024 14:24:36 +0200 Subject: [PATCH] hw/mcu/nordic: Restricted PIN 0 workaround (nRF52) Selecting PIN 0 for some special function, which is included in the restrictions, was causing an error. This is a quick workaround of the issue, but we probably should think about fixing it in some better way. This problem applies to all mcus that have similar restrictions. --- hw/mcu/nordic/nrf52xxx/syscfg.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/mcu/nordic/nrf52xxx/syscfg.yml b/hw/mcu/nordic/nrf52xxx/syscfg.yml index d28e2d8d7b..1f15b43d63 100644 --- a/hw/mcu/nordic/nrf52xxx/syscfg.yml +++ b/hw/mcu/nordic/nrf52xxx/syscfg.yml @@ -495,16 +495,16 @@ syscfg.vals.XTAL_32768_SYNTH: MCU_LFCLK_SOURCE: LFSYNTH syscfg.restrictions: - - "!I2C_0 || (I2C_0_PIN_SCL && I2C_0_PIN_SDA)" - - "!I2C_1 || (I2C_1_PIN_SCL && I2C_1_PIN_SDA)" - - "!SPI_0_MASTER || (SPI_0_MASTER_PIN_SCK && SPI_0_MASTER_PIN_MOSI && SPI_0_MASTER_PIN_MISO)" - - "!SPI_1_MASTER || (SPI_1_MASTER_PIN_SCK && SPI_1_MASTER_PIN_MOSI && SPI_1_MASTER_PIN_MISO)" - - "!SPI_2_MASTER || (SPI_2_MASTER_PIN_SCK && SPI_2_MASTER_PIN_MOSI && SPI_2_MASTER_PIN_MISO)" - - "!SPI_3_MASTER || (SPI_3_MASTER_PIN_SCK && SPI_3_MASTER_PIN_MOSI && SPI_3_MASTER_PIN_MISO)" - - "!SPI_0_SLAVE || (SPI_0_SLAVE_PIN_SCK && SPI_0_SLAVE_PIN_MOSI && SPI_0_SLAVE_PIN_MISO && SPI_0_SLAVE_PIN_SS)" - - "!SPI_1_SLAVE || (SPI_1_SLAVE_PIN_SCK && SPI_1_SLAVE_PIN_MOSI && SPI_1_SLAVE_PIN_MISO && SPI_1_SLAVE_PIN_SS)" - - "!SPI_2_SLAVE || (SPI_2_SLAVE_PIN_SCK && SPI_2_SLAVE_PIN_MOSI && SPI_2_SLAVE_PIN_MISO && SPI_2_SLAVE_PIN_SS)" - - "!UART_0 || (UART_0_PIN_TX && UART_0_PIN_RX)" - - "!UART_1 || (UART_1_PIN_TX && UART_1_PIN_RX)" + - "!I2C_0 || (I2C_0_PIN_SCL != \"\" && I2C_0_PIN_SDA != \"\")" + - "!I2C_1 || (I2C_1_PIN_SCL != \"\" && I2C_1_PIN_SDA != \"\")" + - "!SPI_0_MASTER || (SPI_0_MASTER_PIN_SCK != \"\" && SPI_0_MASTER_PIN_MOSI != \"\" && SPI_0_MASTER_PIN_MISO != \"\")" + - "!SPI_1_MASTER || (SPI_1_MASTER_PIN_SCK != \"\" && SPI_1_MASTER_PIN_MOSI != \"\" && SPI_1_MASTER_PIN_MISO != \"\")" + - "!SPI_2_MASTER || (SPI_2_MASTER_PIN_SCK != \"\" && SPI_2_MASTER_PIN_MOSI != \"\" && SPI_2_MASTER_PIN_MISO != \"\")" + - "!SPI_3_MASTER || (SPI_3_MASTER_PIN_SCK != \"\" && SPI_3_MASTER_PIN_MOSI != \"\" && SPI_3_MASTER_PIN_MISO != \"\")" + - "!SPI_0_SLAVE || (SPI_0_SLAVE_PIN_SCK != \"\" && SPI_0_SLAVE_PIN_MOSI != \"\" && SPI_0_SLAVE_PIN_MISO != \"\" && SPI_0_SLAVE_PIN_SS != \"\")" + - "!SPI_1_SLAVE || (SPI_1_SLAVE_PIN_SCK != \"\" && SPI_1_SLAVE_PIN_MOSI != \"\" && SPI_1_SLAVE_PIN_MISO != \"\" && SPI_1_SLAVE_PIN_SS != \"\")" + - "!SPI_2_SLAVE || (SPI_2_SLAVE_PIN_SCK != \"\" && SPI_2_SLAVE_PIN_MOSI != \"\" && SPI_2_SLAVE_PIN_MISO != \"\" && SPI_2_SLAVE_PIN_SS != \"\")" + - "!UART_0 || (UART_0_PIN_TX != \"\" && UART_0_PIN_RX != \"\")" + - "!UART_1 || (UART_1_PIN_TX != \"\" && UART_1_PIN_RX != \"\")" - "(OS_TICKS_PER_SEC == 128 || OS_TICKS_PER_SEC == 256 || OS_TICKS_PER_SEC == 512 || OS_TICKS_PER_SEC == 1024)"