Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanout libsel4/include/config.h configurations #449

Merged
merged 4 commits into from
Sep 5, 2021

Conversation

kent-mcleod
Copy link
Member

Originally libsel4/include/config.h was an internal kernel config file and had default option definitions to allow older build systems to compile the kernel, ie for L4V. The original commit (1ce721b#diff-75acece24054e5d68d207058b0b3d8305249d0a4bfbfb1d753f93a84d2eb402e) that moved this header file to libsel4 indicated that it wasn't supposed to be depended on outside of code testing and benchmarking. This PR cleans up the config definitions so that they can be more consistently depended on (seL4/seL4_tools#96).

These changes are binary compatible but source incompatible because the old config names, ENABLE_SMP_SUPPORT and AARCH64_VSPACE_S2_START_L1 no longer exist and must be renamed to CONFIG_ENABLE_SMP_SUPPORT and CONFIG_AARCH64_VSPACE_S2_START_L1.

autoconf.h is expected to contain all defined config options for an seL4
build configuration. Having these redefinitions were leftover from when
the verification build system didn't produce an autoconf.h file and set
the config separately.  Its more likely that these defaults would
incorrectly hide an include path misconfiguration and produce settings
that are inconsistent with the kernel's configuration.

Signed-off-by: Kent McLeod <kent@kry10.com>
CONFIG_ENABLE_SMP_SUPPORT has the correct namespace for a kernel config
option.

Signed-off-by: Kent McLeod <kent@kry10.com>
CONFIG_AARCH64_VSPACE_S2_START_L1 has the correct namespace for a kernel
config option.

Signed-off-by: Kent McLeod <kent@kry10.com>
Define CONFIG_KERNEL_LOG_BUFFER in the same way as all other kernel
config options so that it is present in autoconf.h

Signed-off-by: Kent McLeod <kent@kry10.com>
@kent-mcleod kent-mcleod merged commit 87f5992 into seL4:master Sep 5, 2021
@kent-mcleod kent-mcleod deleted the kent/config branch September 5, 2021 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants