merge with mainline and add wandboards

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>