How to use upstream zephyrproject-rtos/zephyr instead of nrf-zephyr fork

Question

Hi I need the upstream Zephyr project for direction finding functionality and bug fixes. Those are not present in nrf-zephyr fork. 
 How do I get that to work? Just replacing nrf-zephyr with upstream zephyr does not build (Target "partition_manager" not found etc...). 
 I have searched around both nRFConnect and Zephyr documentation for how to set up the environment but cannot find something that works. 
 I found this https://devzone.nordicsemi.com/f/nordic-q-a/77257/relationship-sdk-zephyr-and-zephyhrproject-zephyr/319141#319141 where you suggest cherry-picking, but that's not going to work as it's so many commits spread out and I don't see that solution scale. 
 I can see lot's of development in Zephyr project main branch from nordic developers, what is their environment and how can I set up the same environment? 
 
 Thank you alot, 
 
 Jakob

Piotr · Accepted Answer

Hi Jakob, 
 Thank you for answering for questions. Now I've got better view on the situations. 
 1. Referring to Zephyr. 
 Use of upstream Zephyr within nRF SDK would be complicated, as you have already spotted. Recent version of sdk-zephyr in NCS playground hasn't got number of commits related with DF. Unfortunately cherry-picking of all changes done from last downmerge from upstream would be a bit time consuming. There are two options I can propose: 
 - wait for next NCS release, then you will most of the stuff done for connectionless DF there. 
 - switch temporarily from NCS environment to Zephyr only environment, but then you may miss some features that are provided by NCS and in regards of support you are depending on community. 
 2. About bugs: 
 - max_cte_count issue, I've created a PR for that: https://github.com/zephyrproject-rtos/zephyr/pull/39214 . Thank you for reporting the issue. 
 - antenna switchng pattern, it is limited to 12 (by default) but can be changes. Please take a look on thic Kconfig option: BT_CTLR_DF_MAX_ANT_SW_PATTERN_LEN. nRF SOC support antenna switch pattern length up to 39. Values that are used for antenna switching are dependent on the GPIOs count. To get more information about it please look here: https://github.com/nrfconnect/sdk-nrf/blob/master/samples/bluetooth/direction_finding_connectionless_rx/README.rst#id44 . 
 
 BR, 
 Piotr

How to use upstream zephyrproject-rtos/zephyr instead of nrf-zephyr fork

Top Replies