Changeset 182 for trunk/bootcode

Timestamp:

Nov 7, 2017, 7:12:46 AM (8 years ago)

Author:

Ben Rietbroek

Message:

Get Vendor and BuildMachine from the environment [v1.1.1-testing]

If 'BLDLVL_VENDOR' and BLDLVL_MCHINE' are not in the environment,
their values will be set to '*UNKNOWN*'. Currently these *must* be
environment variables, passing them on the (w)make cli might not work.
Also, no spaces are allowed in the values.

CAUTION:
This is a testbuild !
AirBoot uses the BIOS to access disks and a small coding error can trash
partition tables or other vital disk structures. You are advised to make
backups of TRACK0 and EBRs before using this testbuild. More info at:
​https://rousseaux.github.io/netlabs.air-boot/pdf/AirBoot-v1.1.0-manual.pdf

Location:

trunk/bootcode

Files:

• Makefile (modified) (2 diffs)
• airboot.md5 (modified) (1 diff)
• bldlevel.inc (modified) (2 diffs)
• fc.mnu (modified) (1 diff)

trunk/bootcode/Makefile

@@ -160 +160 @@
 # -Zd   = line number debug info
 # -Zi   = symbolic debug info
-ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -W0 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
-ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -W4 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
-ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -WX -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM $(%JWASM_DEFINES) -q -W0 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM $(%JWASM_DEFINES) -q -W4 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM $(%JWASM_DEFINES) -q -WX -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
 # Workaround for JWasm list-file generation.
 # Generate the list-file on a local drive so JWasm doen't take forever.
@@ -211 +211 @@
 # 16-bits C Compiler.
 CC16=wcc
-CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -w4 -e25 -zq -od -fo=$^.
-CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -d2 -w4 -e25 -zq -od -fo=$^.
-CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -d2 -w4 -e25 -zq -od -fo=$^.
+CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -w4 -e25 -zq -od -fo=$^.
+CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -d2 -w4 -e25 -zq -od -fo=$^.
+CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -d2 -w4 -e25 -zq -od -fo=$^.
 CC16_FLAGS=$(CC16_FLAGS_D$(DEBUG_LEVEL))
 
 # 32-bits C Compiler.
 CC32=wcc386
-CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -w4 -e25 -zq -od -6r -mf -fo=$^.
-CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -d2 -w4 -e25 -zq -od -6r -mf -fo=$^.
-CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -d2 -w4 -e25 -zq -od -6r -mf -fo=$^.
+CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -w4 -e25 -zq -od -6r -mf -fo=$^.
+CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -d2 -w4 -e25 -zq -od -6r -mf -fo=$^.
+CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -d2 -w4 -e25 -zq -od -6r -mf -fo=$^.
 CC32_FLAGS=$(CC32_FLAGS_D$(DEBUG_LEVEL))
 

trunk/bootcode/airboot.md5

@@ -1 @@
-3fbd042146daf016accd81b36e5e6560  airboot.bin
+7611b247c861439e5e1819e403099ccf  airboot.bin

trunk/bootcode/bldlevel.inc

@@ -40 +40 @@
 ;
 
-; Vendor
-;~ BLDLVL_VENDOR           TEXTEQU <'KIEWITZ'>
-;~ BLDLVL_VENDOR           TEXTEQU <'RDPe'>
-BLDLVL_VENDOR           TEXTEQU <'*UNKNOWN*'>
+; Vendor supplying this build -- make BLDLVL_VENDOR=YourInitials
+IFNDEF  BLDLVL_VENDOR
+BLDLVL_VENDOR           EQU     '*UNKNOWN*'
+ENDIF
+
+; Build machine -- make BLDLVL_MACHINE=YourMachine
+IFNDEF  BLDLVL_MACHINE
+BLDLVL_MACHINE          EQU     '*UNKNOWN*'    ; 16 chars max.
+ENDIF
+
 ; Version
 BLDLVL_MAJOR_VERSION    EQU     AB_MAJOR_VERSION    + '0'
@@ -56 +62 @@
 BLDLVL_MINUTES          EQU     (AB_MINUTES SHR 4)+'0',(AB_MINUTES AND 0Fh)+'0'
 BLDLVL_SECONDS          EQU     (AB_SECONDS SHR 4)+'0',(AB_SECONDS AND 0Fh)+'0'
-; Build machine
-;~ BLDLVL_MACHINE          EQU     'OS2BLDBOX'    ; 16 chars max.
-BLDLVL_MACHINE          EQU     '*UNKNOWN*'    ; 16 chars max.
+
 ; Build language
 IFDEF   WASM

trunk/bootcode/fc.mnu

@@ -4 +4 @@
 
 B:      Build Development Version [EN]
+        cmd /c "set BLDLVL_VENDOR=& set BLDLVL_MACHINE=& wmake -h dev"
+V:      Build Vendor Dev  Version [EN]
         wmake -h dev
 M:      Build Development Version [??]