diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-08-28 09:26:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-28 09:26:22 +0200 |
| commit | f24e3cd5212e533f9dc0125c62f4d36fb9882cee (patch) | |
| tree | e051f262440357b4f4a89603b68b473ee68aad87 /src | |
| parent | 7802a79f34c6f96f1c1ead72098c449b1a8826d8 (diff) | |
| parent | 93baf62a3d02ad107a92c429fc528c26a9f7b664 (diff) | |
Merge pull request #7 from nekernel-org/dev
v0.0.1e1 — New York
Diffstat (limited to 'src')
| -rw-r--r-- | src/arm64/makefile | 2 | ||||
| -rw-r--r-- | src/neboot-start.c | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/arm64/makefile b/src/arm64/makefile index a85553b..c4e7083 100644 --- a/src/arm64/makefile +++ b/src/arm64/makefile @@ -28,7 +28,7 @@ FLAGS_LD= --script=script.lds -o core-boot.elf -nostdlib OBJCOPY=aarch64-elf-objcopy EMU=qemu-system-aarch64 -EMU_FLAGS=-M virt -cpu cortex-a57 -bios $(FIRMWARE) -m 256M -d int -smp 2 +EMU_FLAGS=-M virt -cpu cortex-a57 -bios $(FIRMWARE) -device loader,file=$(STAGE2),addr=0x60000000 -m 4G -d int -d guest_errors WAIT=sleep 1 diff --git a/src/neboot-start.c b/src/neboot-start.c index 8384791..b72793e 100644 --- a/src/neboot-start.c +++ b/src/neboot-start.c @@ -113,7 +113,7 @@ void cb_start_exec(void) { } else { cb_put_string("CB> Trying EPM partition...\r\n"); - part_block_t* blk = cb_parse_partition_block_at((voidptr_t) NB_BOOT_ADDR, EPM_PART_BLK_SZ, 0); + part_block_t* blk = cb_parse_partition_block_at((voidptr_t) NB_FLASH_BASE_ADDR, EPM_PART_BLK_SZ, 0); if (blk) { cb_pci_append_tree("@stage2-epm", (cb_pci_num_t) blk, sizeof(part_block_t) * blk->num_blocks); @@ -144,12 +144,10 @@ void cb_start_exec(void) { } /// end of TODO - - if (hart > 1) { - while (yes) { - if (__cb_hart_counter == 0) { - cb_restart_machine(); - } + + while (yes) { + if (__cb_hart_counter == 0) { + cb_restart_machine(); } } } |