performance: RPi CONFIG_PACKAGE code tidy-up