diff --git a/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index afbf08643e14..75bbb1dface2 100644 --- a/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -53,48 +53,6 @@ }; }; -/* Legacy exmif driver overlay - currently needed for DFU from extmem */ - -/delete-node/ &exmif; - -&global_peripherals { - exmif: spi@95000 { - compatible = "nordic,nrf-exmif-spi", "snps,designware-spi"; - pinctrl-0 = <&exmif_default>; - pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x95000 0x500 0x95500 0xb00>; - reg-names = "wrapper", "core"; - interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>; - power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>; - clock-frequency = ; - fifo-depth = <32>; - max-xfer-size = <16>; - cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>; - }; -}; - -&exmif { - mx25uw63: mx25uw6345g@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = ; - jedec-id = [c2 84 37]; - sfdp-bfp = [ - e5 20 8a ff ff ff ff 03 00 ff 00 ff 00 ff 00 ff - ee ff ff ff ff ff 00 ff ff ff 00 ff 0c 20 10 d8 - 00 ff 00 ff 87 79 01 00 84 12 00 c4 cc 04 67 46 - 30 b0 30 b0 f4 bd d5 5c 00 00 00 ff 10 10 00 20 - 00 00 00 00 00 00 7c 23 48 00 00 00 00 00 88 88 - ]; - size = <67108864>; - has-dpd; - t-enter-dpd = <10000>; - t-exit-dpd = <30000>; - }; -}; - &mx25uw63 { status = "okay"; }; diff --git a/samples/suit/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf index 02c6f19412f3..0ca362bcf78b 100644 --- a/samples/suit/flash_companion/prj.conf +++ b/samples/suit/flash_companion/prj.conf @@ -11,6 +11,8 @@ CONFIG_NUM_COOP_PRIORITIES=16 CONFIG_NUM_METAIRQ_PRIORITIES=0 CONFIG_SCHED_DUMB=y CONFIG_WAITQ_DUMB=y +CONFIG_TICKLESS_KERNEL=n +CONFIG_SSF_DEVICE_INFO_SERVICE_ENABLED=n # Enable peripherals needed by the flash companion firmware CONFIG_GPIO=y @@ -45,6 +47,7 @@ CONFIG_NCS_BOOT_BANNER=n CONFIG_BOOT_DELAY=0 # Disable serial communication +CONFIG_SERIAL=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_STDOUT_CONSOLE=n @@ -78,3 +81,7 @@ CONFIG_CLOCK_CONTROL=n # Set flash base address to zero to ensure that the executable # code is placed in CPUAPP RAM by the linker. CONFIG_FLASH_BASE_ADDRESS=0x0 +CONFIG_COMMON_LIBC_MALLOC=n +CONFIG_COMMON_LIBC_CALLOC=n +CONFIG_COMMON_LIBC_REALLOCARRAY=n +CONFIG_PICOLIBC_IO_LONG_LONG=n diff --git a/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay b/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay index c172887b1649..7943b54c48e9 100644 --- a/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay +++ b/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay @@ -10,57 +10,6 @@ }; }; -/* Legacy exmif driver overlay - currently needed for DFU from extmem */ - -&exmif_default { - group1 { - psels = , - , - ; - nordic,drive-mode = ; - }; -}; - -/delete-node/ &exmif; - -&global_peripherals { - exmif: spi@95000 { - compatible = "nordic,nrf-exmif-spi", "snps,designware-spi"; - pinctrl-0 = <&exmif_default>; - pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x95000 0x500 0x95500 0xb00>; - reg-names = "wrapper", "core"; - interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>; - power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>; - clock-frequency = ; - fifo-depth = <32>; - max-xfer-size = <16>; - cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>; - }; -}; - -&exmif { - mx25uw63: mx25uw6345g@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = ; - jedec-id = [c2 84 37]; - sfdp-bfp = [ - e5 20 8a ff ff ff ff 03 00 ff 00 ff 00 ff 00 ff - ee ff ff ff ff ff 00 ff ff ff 00 ff 0c 20 10 d8 - 00 ff 00 ff 87 79 01 00 84 12 00 c4 cc 04 67 46 - 30 b0 30 b0 f4 bd d5 5c 00 00 00 ff 10 10 00 20 - 00 00 00 00 00 00 7c 23 48 00 00 00 00 00 88 88 - ]; - size = <67108864>; - has-dpd; - t-enter-dpd = <10000>; - t-exit-dpd = <30000>; - }; -}; - &mx25uw63 { status = "okay"; partitions { diff --git a/west.yml b/west.yml index bfe2070224bd..e069cce33011 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 9018ae510c046e98478cfc74ddcea21bd56e3cd9 + revision: 1d7723ad7b3e70b9b5ab1fb85d955c527cc0fa33 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above