Support for Multiple User Configs #38
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* added default os.conf for hardware * added default emulator.conf for emulator * added ZOS_CONFIG env var support to override the default os.conf when calling `make` * updated CI to reference emulator.conf
zoul0813
changed the title
* make menuconfig will now copy over the default os.conf for backwards compatibility and user-defined defaults
Zeal8bit
reviewed
Oct 12, 2024
| @echo "Executing post commands..." | ||
| @echo "Config: $(KCONFIG_CONFIG)" | ||
| @echo "Kernel Physical Address: $(CONFIG_KERNEL_PHYS_ADDRESS)" | ||
| @echo "Host FS: $(CONFIG_ENABLE_EMULATION_HOSTFS)" |
There was a problem hiding this comment.
This looks like a debugging log, this (currently) doesn't exist for other targets
There was a problem hiding this comment.
This was intentional - though it can be removed - it’s meant to serve as a reminder of what was used
| $(CC) $(ASMFLAGS) -o$(FULLBIN) -b -m -s $(LINKERFILE_BUILT) $(BUILTOBJS) | ||
| @mv $(BINDIR)/$(BIN_GENERATED) $(FULLBIN) | ||
| @echo "OS binary: $(FULLBIN)" | ||
| @echo "Executing post commands..." |
There was a problem hiding this comment.
This should be moved right above $(POSTCMD)
There was a problem hiding this comment.
Also intentional, meant to keep the “info print” at the end together
Co-authored-by: Zeal 8-bit <[email protected]>
|
Thanks for your PR, it's merged! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
makeHow configs are loaded:
When the user uses
make menuconfig, if no os.conf exists, the default configs/zeal8bit.default will be copied to os.conf and then loaded - users should always be editing os.conf with menuconfigMenuconfig also supports the
configargument above, if no os.conf exists, menuconfig will copy theconfigargument to os.conf ... example:make menuconfig config=configs/zealemu.defaultwill make the users os.conf a copy of the zealemu.default