Fixing the build after cubieboard merge