beaglebone-uboot: merge alarm changes to our uboot version.

Allows booting from eMMC and uSD easily, as well as some other
useful random changes.