Merge in a number of upstream changes from Bouffalo, resolving
conflicts. Most conflicts came from warring whitespace fixes, which is
better than no whitespace fixes in either repo. I generally took the
upstream version in such cases to make future merges easier.
I have left out all upstream docs changes from this merge, since those
will have to be separately merged into our bl602-docs submodule.
image_conf, make_scripts_riscv - Delete trailing spaces. Change tabs to 4 space multiples.
.c and .h get tabs expanded to four spaces for consistency, traliing whitespace whacked.
Makefiles do NOT get tabs changed.