Merge branch 'master' into radar

Conflicts:
	tools/src/CMakeLists.txt

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

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

diff --cc tools/src/CMakeLists.txt
index 4605aa4b8ba93f92e567fb4365d7f9708488faed,d141521e9652ea231984c12637f34d1fbf43acdf..19ec5082a2cb58e4d397b5cd25c64ee478a1c8c9
--- 1/tools/src/CMakeLists.txt
--- 2/tools/src/CMakeLists.txt
+++ b/tools/src/CMakeLists.txt
@@@ -4,7 -4,7 +4,7 @@@ project(tools
  
  add_custom_target(wol ALL COMMAND gcc wol.c -o wol)
  
- set(tools fwinfo miniboot checksum fwprepare eeprom_fix)
 -set(tools fwinfo miniboot checksum)
++set(tools fwinfo miniboot checksum fwprepare)
  
  foreach(tool ${tools})
        add_executable( ${tool} ${tool}.c )