Remove some unused entries, add some new ones. ok art@ itojun@
Remove some unused entries, add some new ones. ok art@ itojun@

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars