Updated diff below now that the first bits got committed.
gopi can be used safely instead of an extra info struct, so munge it.
Declaring the gop and gopi strucutures globally makes things easier in
preparation for the next commit.
Both changes also improve consistency with regard to other stru
gopi is only used for filling ei after info's last usage. info is more
descriptive imho and reusing it gets rid of the extra variable.
Feedback?
diff --git a/sys/arch/amd64/stand/efiboot/efiboot.c
b/sys/arch/amd64/stand/efiboot/efiboot.c
index 42e79fbea6b..1ed2968bffa 100644
--- a/sys/arch/amd6
