Meh. One raspberrypi directory is enough.

Deleted rpi_cross directory for cross-compilation. I just realized that it isn't necessary to have two directories with the same code in it. I edited the Makefile in the raspberrypi directory to be able to handle whether you build on the Pi or on another platform. I am not testing the build on the Pi though. I have only done so for x86. I also added a .gitignore for the directory to ignore 'makefile'. It has higher precedence than Makefile when make looks for it, so just copy Makefile to makefile and edit it to your needs.