From 3281c10e721867196da46f7852fafbbb7c6a086f Mon Sep 17 00:00:00 2001 From: Romain Dolbeau Date: Thu, 6 Oct 2022 23:34:54 +0200 Subject: [PATCH] simplify --- nubus-to-ztex-gateware/DeclROM/NuBusFPGAPrimaryInit.s | 5 ----- .../DeclROM/NuBusFPGASecondaryInit.s | 5 ----- nubus-to-ztex-gateware/DeclROM/vid_decl_rom.s | 11 ++++++++--- 3 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 nubus-to-ztex-gateware/DeclROM/NuBusFPGAPrimaryInit.s delete mode 100644 nubus-to-ztex-gateware/DeclROM/NuBusFPGASecondaryInit.s diff --git a/nubus-to-ztex-gateware/DeclROM/NuBusFPGAPrimaryInit.s b/nubus-to-ztex-gateware/DeclROM/NuBusFPGAPrimaryInit.s deleted file mode 100644 index 42f3628..0000000 --- a/nubus-to-ztex-gateware/DeclROM/NuBusFPGAPrimaryInit.s +++ /dev/null @@ -1,5 +0,0 @@ - - .byte sExec2 /* Code revision (Primary init) */ - .byte sCPU68020 /* CPU type is 68020 */ - .short 0 /* Reserved */ - .long Primary-. /* Offset to code. */ diff --git a/nubus-to-ztex-gateware/DeclROM/NuBusFPGASecondaryInit.s b/nubus-to-ztex-gateware/DeclROM/NuBusFPGASecondaryInit.s deleted file mode 100644 index 6199cbc..0000000 --- a/nubus-to-ztex-gateware/DeclROM/NuBusFPGASecondaryInit.s +++ /dev/null @@ -1,5 +0,0 @@ - - .byte sExec2 /* Code revision (Primary init) */ - .byte sCPU68020 /* CPU type is 68020 */ - .short 0 /* Reserved */ - .long Secondary-. /* Offset to code. */ diff --git a/nubus-to-ztex-gateware/DeclROM/vid_decl_rom.s b/nubus-to-ztex-gateware/DeclROM/vid_decl_rom.s index 166e03a..24bab64 100644 --- a/nubus-to-ztex-gateware/DeclROM/vid_decl_rom.s +++ b/nubus-to-ztex-gateware/DeclROM/vid_decl_rom.s @@ -46,7 +46,10 @@ _BoardName: /* _sPInitRec: */ /* .long _EndsPInitRec-_sPInitRec */ /* physical block size */ .long size_sPInitRec - .include "NuBusFPGAPrimaryInit.s" /* the header/code */ + .byte sExec2 /* Code revision (Primary init) */ + .byte sCPU68020 /* CPU type is 68020 */ + .short 0 /* Reserved */ + .long Primary-. /* Offset to C code. */ ALIGN 2 /* _EndsPInitRec: */ @@ -54,11 +57,13 @@ _BoardName: /* _sSInitRec: */ /* .long _EndsSInitRec-_sSInitRec */ /* physical block size */ .long size_sSInitRec - .include "NuBusFPGASecondaryInit.s" /* the header/code */ + .byte sExec2 /* Code revision (Primary init) */ + .byte sCPU68020 /* CPU type is 68020 */ + .short 0 /* Reserved */ + .long Secondary-. /* Offset to C code. */ ALIGN 2 /* _EndsSInitRec: */ - .section .text.begin ALIGN 2 _VendorInfo: