Merge branch 'master' into radar

diff --cc carlfw/Kconfig
Simple merge

diff --cc carlfw/include/carl9170.h
Simple merge

diff --cc carlfw/include/timer.h
Simple merge

diff --cc carlfw/src/fw.c
Simple merge

diff --cc carlfw/src/main.c
Simple merge