Update from nRF Connect SDK 1.7 to nRF Connect SDK 1.9.1

I am attempting to upgrade from nRF Connect SDK version 1.7 to version 1.9.1

My application is using the nrf52840 on a custom board.

I'm using Zephyr and created a board file based on the nrf52840-nrf52840-dk board (and an overlay file).

Everything seems to work using version 1.7 (Solution builds, etc.)

When I try to compile using version 1.9.1, I get two errors I haven't been able to resolve:

1.  I'm using LittleFS and the following error occurs when compiling littlefs_fs.c:

2> Compiling ‘littlefs_fs.c’
2> In file included from E:/N/S/v1.9.1/zephyr/include/sys/util_macro.h:34,
2>                  from E:/N/S/v1.9.1/zephyr/include/sys/atomic.h:16,
2>                  from E:/N/S/v1.9.1/zephyr/include/kernel_includes.h:21,
2>                  from E:/N/S/v1.9.1/zephyr/include/kernel.h:17,
2>                  from E:/N/S/v1.9.1/zephyr/subsys/fs/littlefs_fs.c:10:
2> E:/N/S/v1.9.1/zephyr/include/devicetree/fixed-partitions.h:53:9: error: 'DT_COMPAT_fixed_partitions_LABEL_storage_PARTITION_ID' undeclared here (not in a function); did you mean 'DT_COMPAT_fixed_partitions_LABEL_image_1_EXISTS'?

I'm using the same prj.conf and board files (and overlay files) as used with version 1.7 (and I didn't see any documentation identifying needed changes to move beyond version 1.7)

2.  I also use IRQ_CONNECT to capture interrupts from one of the TWIM devices.  The line of code is:

IRQ_CONNECT(SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1_IRQn,6,nrfx_isr,nrfx_twim_1_irq_handler,0);

and produces an error:

1> ../src/main.c:436:7: warning: unused variable 'err' [-Wunused-variable]
1> In file included from E:/N/S/v1.9.1/zephyr/include/toolchain.h:50,
1>                  from E:/N/S/v1.9.1/zephyr/lib/libc/minimal/include/string.h:13,
1>                  from ../src/include/Telemetry.h:7,
1>                  from ../src/main.c:9:
1> ../src/main.c: In function 'main':
1> E:/N/S/v1.9.1/zephyr/include/arch/arm/aarch32/irq.h:97:2: error: static assertion failed: "Invalid interrupt priority. Values must not exceed IRQ_PRIO_LOWEST"
1> E:/N/S/v1.9.1/zephyr/include/arch/arm/aarch32/irq.h:118:2: note: in expansion of macro '_CHECK_PRIO'
1> E:/N/S/v1.9.1/zephyr/include/irq.h:49:2: note: in expansion of macro 'ARCH_IRQ_CONNECT'
1> ../src/main.c:644:3: note: in expansion of macro 'IRQ_CONNECT'

Again, this works fine with version 1.7, but fails with version 1.9.1

Is there some new configuration setting needed?

Thanks!

P.S. Sorry for the weird formatting of the error messages from the copy/paste from the SES window...