From f471cf287fdef515ced7357aca2f3f47f284998f Mon Sep 17 00:00:00 2001 From: Amlal Date: Tue, 18 Feb 2025 11:20:00 +0100 Subject: REFACTOR: ZBAOSLDR to BOOTZ. Signed-off-by: Amlal --- dev/Boot/src/BootloaderRsrc.rsrc | 6 ++--- dev/Boot/src/HEL/64X000/Boot64x0.S | 35 ---------------------------- dev/Boot/src/HEL/64X000/BootCB.S | 35 ++++++++++++++++++++++++++++ dev/Boot/src/HEL/ARM64/BootCB.S | 40 ++++++++++++++++++++++++++++++++ dev/Boot/src/HEL/ARM64/CoreBootStartup.S | 40 -------------------------------- dev/Boot/src/HEL/POWER/BootCB.S | 2 +- 6 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 dev/Boot/src/HEL/64X000/Boot64x0.S create mode 100644 dev/Boot/src/HEL/64X000/BootCB.S create mode 100644 dev/Boot/src/HEL/ARM64/BootCB.S delete mode 100644 dev/Boot/src/HEL/ARM64/CoreBootStartup.S (limited to 'dev/Boot/src') diff --git a/dev/Boot/src/BootloaderRsrc.rsrc b/dev/Boot/src/BootloaderRsrc.rsrc index 47623fbc..8baa8c3d 100644 --- a/dev/Boot/src/BootloaderRsrc.rsrc +++ b/dev/Boot/src/BootloaderRsrc.rsrc @@ -11,10 +11,10 @@ BEGIN VALUE "CompanyName", "Amlal EL Mahrouss" VALUE "FileDescription", "NeKernel OS Loader." VALUE "FileVersion", BOOTLOADER_VERSION - VALUE "InternalName", "zbaosldr" + VALUE "InternalName", "bootz" VALUE "LegalCopyright", "Copyright (C) 2024, Amlal EL Mahrouss all rights reserved." - VALUE "OriginalFilename", "zbaosldr.exe" - VALUE "ProductName", "zbaosldr" + VALUE "OriginalFilename", "bootz.exe" + VALUE "ProductName", "bootz" VALUE "ProductVersion", BOOTLOADER_VERSION END END diff --git a/dev/Boot/src/HEL/64X000/Boot64x0.S b/dev/Boot/src/HEL/64X000/Boot64x0.S deleted file mode 100644 index ff6726ee..00000000 --- a/dev/Boot/src/HEL/64X000/Boot64x0.S +++ /dev/null @@ -1,35 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. - -------------------------------------------- */ - -.section .boot_hdr -.align 4 - -/* BootZ boot header begin for a 64x000 Kernel. */ - -boot_hdr_mag: - .ascii "CB" -boot_hdr_name: - // it has to match ten bytes. - .asciz "zbaosldr\0\0" -boot_hdr_ver: - .word 0x104 -boot_hdr_proc: - .long bootloader_start - -/* BootZ boot header end */ - -.extern bootloader_main -.extern bootloader_stack - -.globl bootloader_start -bootloader_start: - psh 4 /* real address of .Laddr */ - ldi 0,(bootloader_stack-bootloader_start)(4) /* stack address location */ - mv 19,0 /* use user defined stack */ - jrl - - bl bootloader_main - blr diff --git a/dev/Boot/src/HEL/64X000/BootCB.S b/dev/Boot/src/HEL/64X000/BootCB.S new file mode 100644 index 00000000..f286f449 --- /dev/null +++ b/dev/Boot/src/HEL/64X000/BootCB.S @@ -0,0 +1,35 @@ +/* ------------------------------------------- + + Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. + +------------------------------------------- */ + +.section .boot_hdr +.align 4 + +/* BootZ boot header begin for a 64x000 Kernel. */ + +boot_hdr_mag: + .ascii "CB" +boot_hdr_name: + // it has to match ten bytes. + .asciz "bootz\0\0\0" +boot_hdr_ver: + .word 0x104 +boot_hdr_proc: + .long bootloader_start + +/* BootZ boot header end */ + +.extern bootloader_main +.extern bootloader_stack + +.globl bootloader_start +bootloader_start: + psh 4 /* real address of .Laddr */ + ldi 0,(bootloader_stack-bootloader_start)(4) /* stack address location */ + mv 19,0 /* use user defined stack */ + jrl + + bl bootloader_main + blr diff --git a/dev/Boot/src/HEL/ARM64/BootCB.S b/dev/Boot/src/HEL/ARM64/BootCB.S new file mode 100644 index 00000000..2d1ff60c --- /dev/null +++ b/dev/Boot/src/HEL/ARM64/BootCB.S @@ -0,0 +1,40 @@ +/* ------------------------------------------- + + Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. + +------------------------------------------- */ + +#ifdef __NE_COREBOOT__ + +.section .boot_hdr +.align 4 + +/* BootZ boot header begin */ + +boot_hdr_mag: + .ascii "CB" +boot_hdr_name: + // it has to match ten bytes. + .asciz "bootz\0\0" +boot_hdr_ver: + .word 0x104 +boot_hdr_proc: + .long bootloader_start + +/* BootZ boot header end */ + +.extern bootloader_main +.extern bootloader_stack + +.globl bootloader_start +bootloader_start: + adr x0, bootloader_stack + ldr x1, =bootloader_start + sub x0, x0, x1 + ldr x0, [x0] + mov sp, x0 + + bl bootloader_main + ret + +#endif // __NE_COREBOOT__ \ No newline at end of file diff --git a/dev/Boot/src/HEL/ARM64/CoreBootStartup.S b/dev/Boot/src/HEL/ARM64/CoreBootStartup.S deleted file mode 100644 index a62cf434..00000000 --- a/dev/Boot/src/HEL/ARM64/CoreBootStartup.S +++ /dev/null @@ -1,40 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. - -------------------------------------------- */ - -#ifdef __NE_COREBOOT__ - -.section .boot_hdr -.align 4 - -/* BootZ boot header begin */ - -boot_hdr_mag: - .ascii "CB" -boot_hdr_name: - // it has to match ten bytes. - .asciz "zbaosldr\0\0" -boot_hdr_ver: - .word 0x104 -boot_hdr_proc: - .long bootloader_start - -/* BootZ boot header end */ - -.extern bootloader_main -.extern bootloader_stack - -.globl bootloader_start -bootloader_start: - adr x0, bootloader_stack - ldr x1, =bootloader_start - sub x0, x0, x1 - ldr x0, [x0] - mov sp, x0 - - bl bootloader_main - ret - -#endif // __NE_COREBOOT__ \ No newline at end of file diff --git a/dev/Boot/src/HEL/POWER/BootCB.S b/dev/Boot/src/HEL/POWER/BootCB.S index a13b0cb1..2b64f8c1 100644 --- a/dev/Boot/src/HEL/POWER/BootCB.S +++ b/dev/Boot/src/HEL/POWER/BootCB.S @@ -13,7 +13,7 @@ boot_hdr_mag: .ascii "CB" boot_hdr_name: // it has to match ten bytes. - .asciz "zbaosldr\0\0" + .asciz "bootz\0\0\0" boot_hdr_ver: .word 0x104 boot_hdr_proc: -- cgit v1.2.3