Merge branch 'master' into master

IObundle · Jun 6, 2024 · 5ad9f9a · 5ad9f9a
2 parents 0fe33e0 + 8bc21fe
commit 5ad9f9a
Show file tree

Hide file tree

Showing 11 changed files with 734 additions and 87 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
     if: ${{ !cancelled() }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: run spi test
@@ -43,7 +43,7 @@ jobs:
     if: ${{ !cancelled() }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: run uart16550 test
@@ -56,7 +56,7 @@ jobs:
     if: ${{ !cancelled() }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: clean
@@ -73,7 +73,7 @@ jobs:
     if: ${{ !cancelled() }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: clean
@@ -93,7 +93,7 @@ jobs:
     needs: [ verilator-baremetal ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: test baremetal
@@ -110,13 +110,13 @@ jobs:
     needs: [ verilator-baremetal ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: test baremetal
         run: make fpga-run RUN_LINUX=0 BOARD=AES-KU040-DB-G
       - name: test linux
-        run: make test-linux-fpga-connect BOARD=AES-KU040-DB-G
+        run: make test-linux-fpga-connect BOARD=AES-KU040-DB-G BOOT_FLOW=FLASH_TO_EXTMEM
 
 ##  doc:
 ##    runs-on: self-hosted
@@ -125,7 +125,7 @@ jobs:
 ##    needs: [ cyclonev, aes-ku040 ]
 ##  
 ##    steps:
-##      - uses: actions/checkout@v3
+##      - uses: actions/checkout@v4
 ##        with:
 ##          submodules: 'recursive'
 ##      - name: clean

diff --git a/Makefile b/Makefile
@@ -11,6 +11,7 @@ include $(LIB_DIR)/setup.mk
 INIT_MEM ?= 0
 RUN_LINUX ?= 0
 USE_EXTMEM := 1
+BOOT_FLOW ?= CONSOLE_TO_EXTMEM
 
 ifeq ($(INIT_MEM),1)
 SETUP_ARGS += INIT_MEM
@@ -39,7 +40,7 @@ sim-test-spi:
 fpga-run:
 	nix-shell --run 'make clean setup INIT_MEM=$(INIT_MEM) USE_EXTMEM=$(USE_EXTMEM)'
 	nix-shell --run 'make -C ../$(CORE)_V*/ fpga-fw-build BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX)'
-	make -C ../$(CORE)_V*/ fpga-run BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) 
+	make -C ../$(CORE)_V*/ fpga-run BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) BOOT_FLOW=$(BOOT_FLOW)
 
 fpga-build:
 	nix-shell --run 'make clean setup INIT_MEM=$(INIT_MEM) USE_EXTMEM=$(USE_EXTMEM)'
@@ -49,7 +50,7 @@ fpga-build:
 fpga-connect:
 	nix-shell --run 'make -C ../$(CORE)_V*/ fpga-fw-build BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX)'
 	# Should run under 'bash', running with 'fish' as a shell gives an error
-	make -C ../$(CORE)_V*/ fpga-run BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) 
+	make -C ../$(CORE)_V*/ fpga-run BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) BOOT_FLOW=$(BOOT_FLOW)
 
 fpga-test:
 	make clean setup fpga-run INIT_MEM=0
@@ -63,6 +64,6 @@ test-all:
 test-linux-fpga-connect: build_dir_name
 	-rm $(BUILD_DIR)/hardware/fpga/test.log
 	-ln -s minicom_test1.txt $(BUILD_DIR)/hardware/fpga/minicom_linux_script.txt
-	make fpga-connect RUN_LINUX=1
+	make fpga-connect RUN_LINUX=1 BOOT_FLOW=$(BOOT_FLOW)
 
 .PHONY: sim-test fpga-test test-all test-linux-fpga-connect