Forget about efi32 and efi64 (I just got permission from mlarkin to remove those). The efiboot and stand/libsa bits are ok kettenis@
> Op 30-06-2022 15:14 schreef Anton Lindqvist <[email protected]>: > > > On Thu, Jun 30, 2022 at 01:07:46PM +0200, Mark Kettenis wrote: > > Ah right. Please commit! > > Here's the complete diff, ok? > > diff --git sys/arch/amd64/stand/efi32/exec_i386.c > sys/arch/amd64/stand/efi32/exec_i386.c > index 8349d97fefb..21f13cd273b 100644 > --- sys/arch/amd64/stand/efi32/exec_i386.c > +++ sys/arch/amd64/stand/efi32/exec_i386.c > @@ -66,7 +66,7 @@ run_loadfile(uint64_t *marks, int howto) > dev_t bootdev = bootdev_dip->bootdev; > size_t ac = BOOTARG_LEN; > caddr_t av = (caddr_t)BOOTARG_OFF; > - bios_consdev_t cd; > + bios_oconsdev_t cd; > extern int com_speed; /* from bioscons.c */ > extern int com_addr; > bios_ddb_t ddb; > diff --git sys/arch/amd64/stand/efi64/exec_i386.c > sys/arch/amd64/stand/efi64/exec_i386.c > index 48e460cb040..043193f93be 100644 > --- sys/arch/amd64/stand/efi64/exec_i386.c > +++ sys/arch/amd64/stand/efi64/exec_i386.c > @@ -66,7 +66,7 @@ run_loadfile(uint64_t *marks, int howto) > dev_t bootdev = bootdev_dip->bootdev; > size_t ac = BOOTARG_LEN; > caddr_t av = (caddr_t)BOOTARG_OFF; > - bios_consdev_t cd; > + bios_oconsdev_t cd; > extern int com_speed; /* from bioscons.c */ > extern int com_addr; > bios_ddb_t ddb; > diff --git sys/arch/amd64/stand/efiboot/exec_i386.c > sys/arch/amd64/stand/efiboot/exec_i386.c > index ea8fa67820b..70ff23c9d32 100644 > --- sys/arch/amd64/stand/efiboot/exec_i386.c > +++ sys/arch/amd64/stand/efiboot/exec_i386.c > @@ -72,7 +72,7 @@ run_loadfile(uint64_t *marks, int howto) > dev_t bootdev = bootdev_dip->bootdev; > size_t ac = BOOTARG_LEN; > caddr_t av = (caddr_t)BOOTARG_OFF; > - bios_consdev_t cd; > + bios_oconsdev_t cd; > extern int com_speed; /* from bioscons.c */ > extern int com_addr; > bios_ddb_t ddb; > diff --git sys/arch/amd64/stand/libsa/exec_i386.c > sys/arch/amd64/stand/libsa/exec_i386.c > index 22067931829..25d20d359c0 100644 > --- sys/arch/amd64/stand/libsa/exec_i386.c > +++ sys/arch/amd64/stand/libsa/exec_i386.c > @@ -91,7 +91,7 @@ run_loadfile(uint64_t *marks, int howto) > dev_t bootdev = bootdev_dip->bootdev; > size_t ac = BOOTARG_LEN; > caddr_t av = (caddr_t)BOOTARG_OFF; > - bios_consdev_t cd; > + bios_oconsdev_t cd; > extern int com_speed; /* from bioscons.c */ > extern int com_addr; > bios_ddb_t ddb;
