Merge branch '33-use-dependencies-instead-of-makefile-chaining-2' into 'master'

Resolve "Use dependencies instead of makefile chaining"

Closes #33

See merge request bslathi19/super6502!30

.gitlab-ci.yml

@@ -20,9 +20,23 @@ variables:
      GIT_SUBMODULE_STRATEGY: recursive
 
 stages:          # List of stages for jobs, and their order of execution
+  - toolchain
   - build
 
-build-fpga:       # This job runs in the build stage, which runs first.
+build toolchain:
+  tags:
+    - linux
+  stage: toolchain
+  script:
+    - source init_env.sh
+    - cd sw/cc65
+    - make -j
+  artifacts:
+    paths:
+      - sw/cc65/bin
+      - sw/cc65/lib
+
+build fpga:       # This job runs in the build stage, which runs first.
   tags:
     - efinity
     - linux
@@ -32,15 +46,36 @@ build-fpga:       # This job runs in the build stage, which runs first.
     - cd hw/efinix_fpga
     - make
 
-build-sim:
+build sim:
   tags:
    - iverilog
    - linux
   stage: build
   script:  
     - source init_env.sh
-    - cd sw/cc65
-    - make -j
-    - cd ../..
     - cd hw/efinix_fpga/simulation
     - make
+  dependencies:
+    - build toolchain
+
+build bios:
+  tags:
+    - linux
+  stage: build
+  script:
+    - source init_env.sh
+    - cd sw/
+    - make bios
+  dependencies:
+    - build toolchain
+
+build kernel:
+  tags:
+    - linux
+  stage: build
+  script:
+    - source init_env.sh
+    - cd sw/
+    - make kernel
+  dependencies:
+    - build toolchain

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "hw/efinix_fpga/simulation/src/verilog-6502"]
 	path = hw/efinix_fpga/simulation/src/verilog-6502
 	url = https://git.byronlathi.com/bslathi19/verilog-6502
+[submodule "hw/efinix_fpga/simulation/src/verilog-sd-emulator"]
+	path = hw/efinix_fpga/simulation/src/verilog-sd-emulator
+	url = https://git.byronlathi.com/bslathi19/verilog-sd-emulator

sw/Makefile

@@ -1,6 +1,6 @@
-.PHONY: all install bootloader kernel clean
+.PHONY: all install bios kernel clean
 
-all: toolchain bootloader kernel
+all: toolchain bios kernel
 
 install: all
 	sh script/format_disk.sh
@@ -9,8 +9,8 @@ install: all
 toolchain:
 	@$(MAKE) -j4 -C cc65
 
-bootloader:
+bios:
-	@$(MAKE) -C bootloader
+	@$(MAKE) -C bios
 
 kernel:
 	@$(MAKE) -C kernel