CVS commit: src/sys/arch/i386/stand

["Paul Goyette" <pgoyette%netbsd.org@localhost>]

Module Name:    src
Committed By:   pgoyette
Date:           Wed Apr 30 06:24:47 UTC 2025

Modified Files:
        src/sys/arch/i386/stand/boot: boot2.c
        src/sys/arch/i386/stand/efiboot: boot.c

Log Message:
Remove conditionals on KERNEL_DIR, and reorder the potential boot
locations to put the legacy ones first.  This allows us to use a
single version of the bootstrap code regardless of the use of the
KERNEL_DIR build option, and should avoid spurious error messages
disrupting the automated testbeds.

Tested on i386 (non-KERNEL_DIR) and amd64 (both with and without
KERNEL_DIR).  In all cases the anita installations succeeded and
the atf tests were initiated.  Any remaining issues are most likely
due to subtle changes in text interaction and will probably need
updates to "expect" processing in anita.

If necessary this commit can be reverted, but please try to avoid
more churn, and update the testbed drivers as appropriate.
cvs: ----------------------------------------------------------------------


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/i386/stand/boot/boot2.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/i386/stand/efiboot/boot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.