Page MenuHomeFreeBSD
Differential D37766

efi loader: allocate space for the kernel as code rather than data
AbandonedPublicDraft
Actions

Authored by allanjude on Dec 20 2022, 9:38 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 18, 1:33 AM
Unknown Object (File)
Feb 25 2025, 10:56 PM
Unknown Object (File)
Feb 20 2025, 10:35 PM
Unknown Object (File)
Feb 8 2025, 8:40 AM
Unknown Object (File)
Jan 21 2025, 3:29 AM
Unknown Object (File)
Jan 14 2025, 2:52 PM
Unknown Object (File)
Dec 26 2024, 9:19 PM
Unknown Object (File)
Dec 5 2024, 11:34 AM
View All 58 Files
Subscribers
bcran
dab
emaste
imp

Details

Reviewers
manu
Summary

This allows the boot loader to start on the Microsoft ARM dev kit 2023

Obtained from: OpenBSD (2c32ef33f5b1573564f64f1fbf0393c80a7eb0e8)
Sponsored by: Klara, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Passed
Unit
No Test Coverage

Event Timeline

allanjude created this revision.Dec 20 2022, 9:38 PM
Herald added a reviewer: manu. · View Herald TranscriptDec 20 2022, 9:38 PM
Herald added subscribers: dab, bcran, imp. · View Herald Transcript
Harbormaster returned this revision to the author for changes because remote builds failed.Dec 20 2022, 9:39 PM
Harbormaster failed remote builds in B48780: Diff 114341!
imp added inline comments.Dec 25 2022, 4:07 AM
stand/efi/boot1/boot1.c
171

This is for the heap which isn't where we put the kernel...
I'm not sure how this would help.

stand/efi/loader/efi_main.c
100

Same. I think you'd need to change copy.c which is where we allocate pages for the kernel, metadata and loadable modules.

fuz mentioned this in D37931: stand/efi/loader/copy.c: make sure kernel image is executable.Jan 2 2023, 9:27 PM
imp added a comment.Jan 4 2023, 9:30 PM

Can you see if you can drop this change and still have things working? I'd be very keen to know either way.

emaste added a subscriber: emaste.Jan 24 2023, 8:43 PM
allanjude abandoned this revision.Mar 20 2023, 5:21 PM

This is not needed

Revision Contents
Changeset List

PathSize
stand/
efi/
boot1/
2 lines
loader/
2 lines

Diff 114341

View Options

stand/efi/boot1/boot1.c

Show First 20 Lines • Show All 190 Lines • ▼ Show 20 Lines_OPTIONS_TARGETS= fetch:300:pre fetch:500:do fetch:700:post \
patch:300:pre patch:500:do patch:700:post \ patch:300:pre patch:500:do patch:700:post \
configure:300:pre configure:500:do configure:700:post \ configure:300:pre configure:500:do configure:700:post \
build:300:pre build:500:do build:700:post \ build:300:pre build:500:do build:700:post \
install:300:pre install:500:do install:700:post \ install:300:pre install:500:do install:700:post \
test:300:pre test:500:do test:700:post \ test:300:pre test:500:do test:700:post \
package:300:pre package:500:do package:700:post \ package:300:pre package:500:do package:700:post \
stage:800:post stage:800:post
# Set the default values for the global options, as defined by portmgr PORT_OPTIONS+= DOCS NLS EXAMPLES IPV6
.if !defined(NOPORTDOCS)
PORT_OPTIONS+= DOCS
.else
OPTIONS_WARNINGS+= "NOPORTDOCS"
WITHOUT+= DOCS
OPTIONS_WARNINGS_UNSET+= DOCS
.endif
.if !defined(WITHOUT_NLS)
PORT_OPTIONS+= NLS
.else
WITHOUT+= NLS
.endif
.if !defined(NOPORTEXAMPLES)
PORT_OPTIONS+= EXAMPLES
.else
OPTIONS_WARNINGS+= "NOPORTEXAMPLES"
WITHOUT+= EXAMPLES
OPTIONS_WARNINGS_UNSET+= EXAMPLES
.endif
PORT_OPTIONS+= IPV6
# Add per arch options # Add per arch options
.for opt in ${OPTIONS_DEFINE_${ARCH}} .for opt in ${OPTIONS_DEFINE_${ARCH}}
.if empty(OPTIONS_DEFINE:M${opt}) .if empty(OPTIONS_DEFINE:M${opt})
OPTIONS_DEFINE+= ${opt} OPTIONS_DEFINE+= ${opt}
.endif .endif
.endfor .endfor
# Add per arch defaults # Add per arch defaults
▲ Show 20 Lines • Show All 88 Lines • ▼ Show 20 Lines
. endfor . endfor
## options files (from dialog) ## options files (from dialog)
. if exists(${OPTIONS_FILE}) && !make(rmconfig) . if exists(${OPTIONS_FILE}) && !make(rmconfig)
. include "${OPTIONS_FILE}" . include "${OPTIONS_FILE}"
. endif . endif
. sinclude "${OPTIONS_FILE}.local" . sinclude "${OPTIONS_FILE}.local"
### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
# XXX once WITH_DEBUG is not magic any more, do remove the :NDEBUG from here.
.for opt in ${ALL_OPTIONS:NDEBUG}
.if defined(WITH_${opt})
OPTIONS_WARNINGS+= "WITH_${opt}"
OPTIONS_WARNINGS_SET+= ${opt}
PORT_OPTIONS+= ${opt}
.endif
.if defined(WITHOUT_${opt})
OPTIONS_WARNINGS+= "WITHOUT_${opt}"
OPTIONS_WARNINGS_UNSET+= ${opt}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
.endif
.endfor
_OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME} _OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}
.for _k in SET UNSET SET_FORCE UNSET_FORCE .for _k in SET UNSET SET_FORCE UNSET_FORCE
.if defined(${_OPTIONS_UNIQUENAME}_${_k}) .if defined(${_OPTIONS_UNIQUENAME}_${_k})
WARNING+= "You are using ${_OPTIONS_UNIQUENAME}_${_k} which is not supported any more, use:" WARNING+= "You are using ${_OPTIONS_UNIQUENAME}_${_k} which is not supported any more, use:"
WARNING+= "${OPTIONS_NAME}_${_k}= ${${_OPTIONS_UNIQUENAME}_${_k}}" WARNING+= "${OPTIONS_NAME}_${_k}= ${${_OPTIONS_UNIQUENAME}_${_k}}"
.endif .endif
.endfor .endfor
.if defined(OPTIONS_WARNINGS)
WARNING+= "You are using the following deprecated options: ${OPTIONS_WARNINGS}"
WARNING+= "If you added them on the command line, you should replace them by"
WARNING+= "WITH=\"${OPTIONS_WARNINGS_SET}\" WITHOUT=\"${OPTIONS_WARNINGS_UNSET}\""
WARNING+= ""
WARNING+= "If they are global options set in your make.conf, you should replace them with:"
.if defined(OPTIONS_WARNINGS_SET)
WARNING+= "OPTIONS_SET=${OPTIONS_WARNINGS_SET}"
.endif
.if defined(OPTIONS_WARNINGS_UNSET)
WARNING+= "OPTIONS_UNSET=${OPTIONS_WARNINGS_UNSET}"
.endif
WARNING+= ""
WARNING+= "If they are local to this port, you should use:"
.if defined(OPTIONS_WARNINGS_SET)
WARNING+= "${OPTIONS_NAME}_SET=${OPTIONS_WARNINGS_SET}"
.endif
.if defined(OPTIONS_WARNINGS_UNSET)
WARNING+= "${OPTIONS_NAME}_UNSET=${OPTIONS_WARNINGS_UNSET}"
.endif
.endif
## Finish by using the options set by the port config dialog, if any ## Finish by using the options set by the port config dialog, if any
. for opt in ${OPTIONS_FILE_SET} . for opt in ${OPTIONS_FILE_SET}
. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) . if !empty(COMPLETE_OPTIONS_LIST:M${opt})
PORT_OPTIONS+= ${opt} PORT_OPTIONS+= ${opt}
NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}
. endif . endif
. endfor . endfor
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines
# Finally, add options required by slave ports # Finally, add options required by slave ports
PORT_OPTIONS+= ${OPTIONS_SLAVE} PORT_OPTIONS+= ${OPTIONS_SLAVE}
# Sort options and eliminate duplicates # Sort options and eliminate duplicates
PORT_OPTIONS:= ${PORT_OPTIONS:O:u} PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
## Now some compatibility ## Now some compatibility
.if empty(PORT_OPTIONS:MDOCS) .if empty(PORT_OPTIONS:MDOCS)
NOPORTDOCS= yes PLIST_SUB+= PORTDOCS="@comment "
.else
PLIST_SUB+= PORTDOCS=""
.endif .endif
.if empty(PORT_OPTIONS:MEXAMPLES) .if empty(PORT_OPTIONS:MEXAMPLES)
NOPORTEXAMPLES= yes PLIST_SUB+= PORTEXAMPLES="@comment "
.else
PLIST_SUB+= PORTEXAMPLES=""
.endif .endif
.if ${PORT_OPTIONS:MDEBUG} .if ${PORT_OPTIONS:MDEBUG}
WITH_DEBUG= yes WITH_DEBUG= yes
.endif .endif
.if defined(NO_OPTIONS_SORT) .if defined(NO_OPTIONS_SORT)
ALL_OPTIONS= ${OPTIONS_DEFINE} ALL_OPTIONS= ${OPTIONS_DEFINE}
▲ Show 20 Lines • Show All 171 Lines • Show Last 20 Lines
View Options

stand/efi/loader/efi_main.c

Show First 20 Lines • Show All 190 Lines • ▼ Show 20 Lines_OPTIONS_TARGETS= fetch:300:pre fetch:500:do fetch:700:post \
patch:300:pre patch:500:do patch:700:post \ patch:300:pre patch:500:do patch:700:post \
configure:300:pre configure:500:do configure:700:post \ configure:300:pre configure:500:do configure:700:post \
build:300:pre build:500:do build:700:post \ build:300:pre build:500:do build:700:post \
install:300:pre install:500:do install:700:post \ install:300:pre install:500:do install:700:post \
test:300:pre test:500:do test:700:post \ test:300:pre test:500:do test:700:post \
package:300:pre package:500:do package:700:post \ package:300:pre package:500:do package:700:post \
stage:800:post stage:800:post
# Set the default values for the global options, as defined by portmgr PORT_OPTIONS+= DOCS NLS EXAMPLES IPV6
.if !defined(NOPORTDOCS)
PORT_OPTIONS+= DOCS
.else
OPTIONS_WARNINGS+= "NOPORTDOCS"
WITHOUT+= DOCS
OPTIONS_WARNINGS_UNSET+= DOCS
.endif
.if !defined(WITHOUT_NLS)
PORT_OPTIONS+= NLS
.else
WITHOUT+= NLS
.endif
.if !defined(NOPORTEXAMPLES)
PORT_OPTIONS+= EXAMPLES
.else
OPTIONS_WARNINGS+= "NOPORTEXAMPLES"
WITHOUT+= EXAMPLES
OPTIONS_WARNINGS_UNSET+= EXAMPLES
.endif
PORT_OPTIONS+= IPV6
# Add per arch options # Add per arch options
.for opt in ${OPTIONS_DEFINE_${ARCH}} .for opt in ${OPTIONS_DEFINE_${ARCH}}
.if empty(OPTIONS_DEFINE:M${opt}) .if empty(OPTIONS_DEFINE:M${opt})
OPTIONS_DEFINE+= ${opt} OPTIONS_DEFINE+= ${opt}
.endif .endif
.endfor .endfor
# Add per arch defaults # Add per arch defaults
▲ Show 20 Lines • Show All 88 Lines • ▼ Show 20 Lines
. endfor . endfor
## options files (from dialog) ## options files (from dialog)
. if exists(${OPTIONS_FILE}) && !make(rmconfig) . if exists(${OPTIONS_FILE}) && !make(rmconfig)
. include "${OPTIONS_FILE}" . include "${OPTIONS_FILE}"
. endif . endif
. sinclude "${OPTIONS_FILE}.local" . sinclude "${OPTIONS_FILE}.local"
### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
# XXX once WITH_DEBUG is not magic any more, do remove the :NDEBUG from here.
.for opt in ${ALL_OPTIONS:NDEBUG}
.if defined(WITH_${opt})
OPTIONS_WARNINGS+= "WITH_${opt}"
OPTIONS_WARNINGS_SET+= ${opt}
PORT_OPTIONS+= ${opt}
.endif
.if defined(WITHOUT_${opt})
OPTIONS_WARNINGS+= "WITHOUT_${opt}"
OPTIONS_WARNINGS_UNSET+= ${opt}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
.endif
.endfor
_OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME} _OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}
.for _k in SET UNSET SET_FORCE UNSET_FORCE .for _k in SET UNSET SET_FORCE UNSET_FORCE
.if defined(${_OPTIONS_UNIQUENAME}_${_k}) .if defined(${_OPTIONS_UNIQUENAME}_${_k})
WARNING+= "You are using ${_OPTIONS_UNIQUENAME}_${_k} which is not supported any more, use:" WARNING+= "You are using ${_OPTIONS_UNIQUENAME}_${_k} which is not supported any more, use:"
WARNING+= "${OPTIONS_NAME}_${_k}= ${${_OPTIONS_UNIQUENAME}_${_k}}" WARNING+= "${OPTIONS_NAME}_${_k}= ${${_OPTIONS_UNIQUENAME}_${_k}}"
.endif .endif
.endfor .endfor
.if defined(OPTIONS_WARNINGS)
WARNING+= "You are using the following deprecated options: ${OPTIONS_WARNINGS}"
WARNING+= "If you added them on the command line, you should replace them by"
WARNING+= "WITH=\"${OPTIONS_WARNINGS_SET}\" WITHOUT=\"${OPTIONS_WARNINGS_UNSET}\""
WARNING+= ""
WARNING+= "If they are global options set in your make.conf, you should replace them with:"
.if defined(OPTIONS_WARNINGS_SET)
WARNING+= "OPTIONS_SET=${OPTIONS_WARNINGS_SET}"
.endif
.if defined(OPTIONS_WARNINGS_UNSET)
WARNING+= "OPTIONS_UNSET=${OPTIONS_WARNINGS_UNSET}"
.endif
WARNING+= ""
WARNING+= "If they are local to this port, you should use:"
.if defined(OPTIONS_WARNINGS_SET)
WARNING+= "${OPTIONS_NAME}_SET=${OPTIONS_WARNINGS_SET}"
.endif
.if defined(OPTIONS_WARNINGS_UNSET)
WARNING+= "${OPTIONS_NAME}_UNSET=${OPTIONS_WARNINGS_UNSET}"
.endif
.endif
## Finish by using the options set by the port config dialog, if any ## Finish by using the options set by the port config dialog, if any
. for opt in ${OPTIONS_FILE_SET} . for opt in ${OPTIONS_FILE_SET}
. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) . if !empty(COMPLETE_OPTIONS_LIST:M${opt})
PORT_OPTIONS+= ${opt} PORT_OPTIONS+= ${opt}
NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}
. endif . endif
. endfor . endfor
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines
# Finally, add options required by slave ports # Finally, add options required by slave ports
PORT_OPTIONS+= ${OPTIONS_SLAVE} PORT_OPTIONS+= ${OPTIONS_SLAVE}
# Sort options and eliminate duplicates # Sort options and eliminate duplicates
PORT_OPTIONS:= ${PORT_OPTIONS:O:u} PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
## Now some compatibility ## Now some compatibility
.if empty(PORT_OPTIONS:MDOCS) .if empty(PORT_OPTIONS:MDOCS)
NOPORTDOCS= yes PLIST_SUB+= PORTDOCS="@comment "
.else
PLIST_SUB+= PORTDOCS=""
.endif .endif
.if empty(PORT_OPTIONS:MEXAMPLES) .if empty(PORT_OPTIONS:MEXAMPLES)
NOPORTEXAMPLES= yes PLIST_SUB+= PORTEXAMPLES="@comment "
.else
PLIST_SUB+= PORTEXAMPLES=""
.endif .endif
.if ${PORT_OPTIONS:MDEBUG} .if ${PORT_OPTIONS:MDEBUG}
WITH_DEBUG= yes WITH_DEBUG= yes
.endif .endif
.if defined(NO_OPTIONS_SORT) .if defined(NO_OPTIONS_SORT)
ALL_OPTIONS= ${OPTIONS_DEFINE} ALL_OPTIONS= ${OPTIONS_DEFINE}
▲ Show 20 Lines • Show All 171 Lines • Show Last 20 Lines