Skip to content

Commit 0f34d57

Browse files
author
Diego Ferrari
committed
make all works with virt default again, github reflects it
1 parent ef01018 commit 0f34d57

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Build
4545
run: |
4646
mkdir -pv fs/redos/user
47-
make all LOAD_ADDR=0x41000000
47+
make all
4848
4949
- name: Upload artifacts
5050
uses: actions/upload-artifact@v4

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
MODE ?= virt
2+
LOAD_ADDR ?= 0x41000000
23

34
.PHONY: all kernel user shared clean raspi virt run debug
45

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ In addition to the code located in the system's 3 main folders, a few other file
5353
- debug: attaches gdb to an instance of QEMU running REDACTED OS. The instance must be run with the `debug` argument as `./run debug` in order for gdb to attach and control its execution. It can support automatically running a command inside gdb such as adding a breakpoint by passing it as an argument as `./debug b kernel_main`
5454
- rundebug: a shortcut for running both the `run` and `debug` commands. It can pass arguments for the debug command, which in turn will pass them to gdb
5555
- createfs: creates a filesystem image for the system to read. The image does not contain kernel code and is not used to boot the system, but is still required to boot the system, and contains user processes. The script is written specifically for macOS, as it relies on the diskutil commands to create the image. There isn't a linux or windows version for it, but a filesystem image can be created manually and placed in the root directory with the name disk.img
56-
- Makefile: can compile and run the system. `make run` compiles the system, creates the filesystem image and executes the `./run` command. `make debug` compiles the system, creates the filesystem and executes the OS and gdb, through the `./rundebug` command. `make all` simply compiles and creates the filesystem image. `make clean` cleans compiled files.
56+
- Makefile: can compile and run the system. `make run` compiles the system for the virt board, passing MODE=virt/raspi specifies which board to compile for. It creates the filesystem image and executes the correct `./run` command. `make debug` compiles the system, creates the filesystem and executes the OS and gdb, through the `./rundebug` command. `make all` simply compiles and creates the filesystem image. `make clean` cleans compiled files.
5757

5858
## Compiling
5959

0 commit comments

Comments
 (0)