stnolting · stnolting · Aug 16, 2021 · Aug 7, 2021 · Aug 7, 2021 · Aug 7, 2021
diff --git a/.github/workflows/Implementation.yml b/.github/workflows/Implementation.yml
@@ -48,12 +48,12 @@ jobs:
     - name: '🚧 Generate ${{ matrix.board }} ${{ matrix.design }} bitstream'
       uses: docker://ghcr.io/stnolting/neorv32/impl
       with:
-        args: make -C setups/examples BOARD=${{ matrix.board }} ${{ matrix.design }}
+        args: make -C setups/osflow BOARD=${{ matrix.board }} ${{ matrix.design }}
 
     - name: '📤 Upload Artifact: ${{ matrix.board }} ${{ matrix.design }} bitstream and reports'
       uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.board }}-${{ matrix.design }}
         path: |
-          setups/examples/${{ matrix.bitstream }}
+          setups/osflow/${{ matrix.bitstream }}
           setups/osflow/${{ matrix.board }}/*-report.txt
diff --git a/setups/examples/README.md b/setups/examples/README.md
diff --git a/setups/examples/Makefile → setups/osflow/Makefile b/setups/examples/Makefile → setups/osflow/Makefile
@@ -1,5 +1,5 @@
-OSFLOW := ../osflow
-EXAMPLES := ../examples
+OSFLOW := .
+BOARD_TOPS := ./board_tops
 TEMPLATES := ../../rtl/templates
 MV := mv
 
@@ -18,7 +18,7 @@ UPduino_REV ?= v3
 run:
 	$(eval TASK ?= clean $(BITSTREAM))
 	$(MAKE) -C $(OSFLOW) -f common.mk \
-	  BOARD_SRC=$(EXAMPLES)/neorv32_$(BOARD)_BoardTop_$(DESIGN).vhd \
+	  BOARD_SRC=$(BOARD_TOPS)/neorv32_$(BOARD)_BoardTop_$(DESIGN).vhd \
 	  TOP=neorv32_$(BOARD)_BoardTop_$(DESIGN) \
 	  ID=$(DESIGN) \
 	  $(TASK)
@@ -81,7 +81,7 @@ MixedLanguage:
 	$(MAKE) \
 	  DESIGN=$@ \
 	  DESIGN_SRC=$(TEMPLATES)/processor/neorv32_ProcessorTop_Minimal*.vhd \
-	  NEORV32_VERILOG_SRC='devices/ice40/sb_ice40_components.v ../examples/neorv32_Fomu_MixedLanguage_ClkGen.v' \
+	  NEORV32_VERILOG_SRC='devices/ice40/sb_ice40_components.v ../board_tops/neorv32_Fomu_MixedLanguage_ClkGen.v' \
 	  $(BOARD)
 
 # Help

diff --git a/setups/osflow/README.md b/setups/osflow/README.md
@@ -6,6 +6,7 @@ open source toolchains. Synthesis based on [ghdl-yosys](https://github.com/ghdl/
 ## Folder Structure
 
 * `boards`: board-specific makefiles for generating bitstreams
+* `board_top`: board-specific top entities (board wrappers; may include FPGA-specific modules)
 * `constraints`: physical constraints (mainly pin mappings)
 * `devices`: FPGA-specific primitives and optimized processor modules (like memories)
 

diff --git a/...xamples/neorv32_Fomu_BoardTop_Minimal.vhd → ...rd_tops/neorv32_Fomu_BoardTop_Minimal.vhd b/...xamples/neorv32_Fomu_BoardTop_Minimal.vhd → ...rd_tops/neorv32_Fomu_BoardTop_Minimal.vhd
diff --git a/...les/neorv32_Fomu_BoardTop_MinimalBoot.vhd → ...ops/neorv32_Fomu_BoardTop_MinimalBoot.vhd b/...les/neorv32_Fomu_BoardTop_MinimalBoot.vhd → ...ops/neorv32_Fomu_BoardTop_MinimalBoot.vhd
diff --git a/...s/neorv32_Fomu_BoardTop_MixedLanguage.vhd → ...s/neorv32_Fomu_BoardTop_MixedLanguage.vhd b/...s/neorv32_Fomu_BoardTop_MixedLanguage.vhd → ...s/neorv32_Fomu_BoardTop_MixedLanguage.vhd
diff --git a/...amples/neorv32_Fomu_BoardTop_UP5KDemo.vhd → ...d_tops/neorv32_Fomu_BoardTop_UP5KDemo.vhd b/...amples/neorv32_Fomu_BoardTop_UP5KDemo.vhd → ...d_tops/neorv32_Fomu_BoardTop_UP5KDemo.vhd
diff --git a/...mples/neorv32_Fomu_MixedLanguage_ClkGen.v → ..._tops/neorv32_Fomu_MixedLanguage_ClkGen.v b/...mples/neorv32_Fomu_MixedLanguage_ClkGen.v → ..._tops/neorv32_Fomu_MixedLanguage_ClkGen.v
diff --git a/...orv32_OrangeCrab_BoardTop_MinimalBoot.vhd → ...orv32_OrangeCrab_BoardTop_MinimalBoot.vhd b/...orv32_OrangeCrab_BoardTop_MinimalBoot.vhd → ...orv32_OrangeCrab_BoardTop_MinimalBoot.vhd
diff --git a/.../neorv32_UPduino_BoardTop_MinimalBoot.vhd → .../neorv32_UPduino_BoardTop_MinimalBoot.vhd b/.../neorv32_UPduino_BoardTop_MinimalBoot.vhd → .../neorv32_UPduino_BoardTop_MinimalBoot.vhd
diff --git a/...les/neorv32_UPduino_BoardTop_UP5KDemo.vhd → ...ops/neorv32_UPduino_BoardTop_UP5KDemo.vhd b/...les/neorv32_UPduino_BoardTop_UP5KDemo.vhd → ...ops/neorv32_UPduino_BoardTop_UP5KDemo.vhd
diff --git a/...les/neorv32_iCESugar_BoardTop_Minimal.vhd → ...ops/neorv32_iCESugar_BoardTop_Minimal.vhd b/...les/neorv32_iCESugar_BoardTop_Minimal.vhd → ...ops/neorv32_iCESugar_BoardTop_Minimal.vhd
diff --git a/...neorv32_iCESugar_BoardTop_MinimalBoot.vhd → ...neorv32_iCESugar_BoardTop_MinimalBoot.vhd b/...neorv32_iCESugar_BoardTop_MinimalBoot.vhd → ...neorv32_iCESugar_BoardTop_MinimalBoot.vhd