[coreboot-gerrit] Change in coreboot[master]: nb,sb/intel: Clean up some __BOOTBLOCK__ and __SIMPLE_DEVICE__ use