I've patched-in a new option for CONFIG_PACKAGE="RPi" which will adjust the default settings if the specific constant isn't set in local. Carpe Diem.