wip: fix issues after merge

quad/xsdk_workspace/real_quad/src/hw_impl_zybo_uart.c

quad/xsdk_workspace/real_quad/src/main.c

quad/xsdk_workspace/system_bsp/.cproject

quad/xsdk_workspace/system_bsp/system.mss

quad/xsdk_workspace/zybo_fsbl/.cproject

quad/xsdk_workspace/zybo_fsbl/Release/makefile

quad/xsdk_workspace/zybo_fsbl/Release/objects.mk

quad/xsdk_workspace/zybo_fsbl/Release/sources.mk

quad/xsdk_workspace/zybo_fsbl/Release/src/subdir.mk

quad/xsdk_workspace/zybo_fsbl_bsp/.cproject