fixup! Replace BBL with OpenSBI

.github/workflows/main.yml

@@ -46,13 +46,6 @@ jobs:
       - name: Set up Depot CLI
         uses: depot/setup-action@v1
 
-        #TODO: change before merge -- gh release download -D dep/ -R ${{ github.repository_owner }}/riscv-pk v${{ env.RISCV_PK_VERSION }} --archive=tar.gz
-      - name: Download opensbi
-        run: >
-          wget https://github.com/cartesi/opensbi/archive/refs/heads/${{ env.OPENSBI_VERSION }}.tar.gz && mv ${{ env.OPENSBI_VERSION }}.tar.gz dep/opensbi-${{ env.OPENSBI_VERSION }}.tar.gz && ls -la dep
-        env:
-          GITHUB_TOKEN: ${{ secrets.CI_TOKEN }}
-
       - name: Build docker image
         id: docker_build
         uses: depot/build-push-action@v1

Makefile

@@ -27,9 +27,9 @@ UNAME:=$(shell uname)
 TAG ?= devel
 TOOLCHAIN_REPOSITORY ?= cartesi/toolchain
 TOOLCHAIN_TAG ?= 0.15.0
-KERNEL_VERSION ?= 5.15.63-ctsi-2
+KERNEL_VERSION ?= linux-6.5.9-ctsi-y
 KERNEL_SRCPATH := dep/linux-${KERNEL_VERSION}.tar.gz
-OPENSBI_VERSION ?= opensbi-1.2-ctsi-y
+OPENSBI_VERSION ?= opensbi-1.3.1-ctsi-y
 OPENSBI_SRCPATH := dep/opensbi-${OPENSBI_VERSION}.tar.gz
 KERNEL_CONFIG ?= configs/default-linux-config
 
@@ -126,7 +126,7 @@ cartesi-linux-config:
 	cp $(KERNEL_CONFIG) ./cartesi-linux-config
 
 $(KERNEL_SRCPATH):
-	wget -O $@ https://github.com/cartesi/linux/archive/v$(KERNEL_VERSION).tar.gz
+	wget -O $@ https://github.com/cartesi/linux/archive/refs/heads/$(KERNEL_VERSION).tar.gz
 
 clean-config:
 	rm -f ./cartesi-linux-config
@@ -146,6 +146,6 @@ shasumfile: $(KERNEL_SRCPATH) $(OPENSBI_SRCPATH)
 
 download: checksum
 
-$(OPENSBI_SRCPATH): URL=https://github.com/cartesi/opensbi/archive/${OPENSBI_VERSION}.tar.gz
+$(OPENSBI_SRCPATH): URL=https://github.com/cartesi/opensbi/archive/refs/heads/${OPENSBI_VERSION}.tar.gz
 $(OPENSBI_SRCPATH): | dep
 	T=`mktemp` && wget "$(URL)" -O $$T && mv $$T $@ || rm $$T

build.mk

@@ -67,7 +67,7 @@ native-deb: # HOST   == riscv64
 
 # build linux w/ opensbi
 # ------------------------------------------------------------------------------
-OPENSBI_OPTS=$(JOBS) FW_PAYLOAD_PATH=$(abspath $(IMAGE)) PLATFORM=cartesi CROSS_COMPILE=$(TOOLCHAIN_PREFIX)-
+OPENSBI_OPTS=$(JOBS) FW_PAYLOAD_PATH=$(abspath $(IMAGE)) FW_PAYLOAD=y FW_OPTIONS=0x01 PLATFORM=cartesi CROSS_COMPILE=$(TOOLCHAIN_PREFIX)-
 $(LINUX): $(IMAGE)
 	@mkdir -p artifacts
 	$(MAKE) -rC $(OPENSBI_DIR) $(OPENSBI_OPTS)
@@ -101,8 +101,8 @@ run-selftest:
 
 # clone (for non CI environment)
 # ------------------------------------------------------------------------------
-clone: LINUX_BRANCH ?= linux-5.15.63-ctsi-y
-clone: OPENSBI_BRANCH ?= opensbi-1.2-ctsi-y
+clone: LINUX_BRANCH ?= linux-6.5.9-ctsi-y
+clone: OPENSBI_BRANCH ?= opensbi-1.3.1-ctsi-y
 clone:
 	git clone --depth 1 --branch $(LINUX_BRANCH) \
 		[email protected]:cartesi/linux.git $(LINUX_DIR) || \

shasumfile

@@ -1,2 +1,2 @@
-e8d4d1882632eac7fd8e433b4eb4db014fd56e645fdad3b89be7d1ca4f20ca07  dep/linux-5.15.63-ctsi-2.tar.gz
-dad6cc6b0efeb3fd34d80199279dbaf7217c2f2179a5fdb639c3829e62f6b44a  dep/opensbi-opensbi-1.2-ctsi-y.tar.gz
+ac235221a482701959e7a1b5dcef95c2b9bbd3c387170a11c2c43cc84a9c24c2  dep/linux-linux-6.5.9-ctsi-y.tar.gz
+68388abd01e2dc2705f0dedd6525c6aa11fe3446480647310a57ef7a9ad5b5ce  dep/opensbi-opensbi-1.3.1-ctsi-y.tar.gz