Changes to rootdir
Fix BOARD_KERNEL_BASE
Merge upstream changes