Merge pull request #271 from firesim/6.2fixes

6.2fixes
firesim · Mar 31, 2023 · fb93e31 · fb93e31
2 parents 12784a4 + 2c8e836
commit fb93e31
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git a/boards/chipyard/base-workloads/br-base/linux-config b/boards/chipyard/base-workloads/br-base/linux-config
@@ -1,7 +1,7 @@
 CONFIG_AS_VERSION=23900
 # CONFIG_ATA is not set
 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-CONFIG_CMDLINE="console=ttyS0 earlycon"
+CONFIG_CMDLINE="console=ttyS0 console=ttySIF0 earlycon"
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DEFAULT_HOSTNAME="ucb"
 # CONFIG_DRM is not set
@@ -23,7 +23,7 @@ CONFIG_NR_CPUS=32
 # CONFIG_PCI is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_SCSI is not set
-# CONFIG_SERIAL_SIFIVE is not set
+CONFIG_SERIAL_SIFIVE=y
 # CONFIG_SOC_SIFIVE is not set
 # CONFIG_SPI is not set
 # CONFIG_USB_SUPPORT is not set
@@ -59,6 +59,7 @@ CONFIG_INITRAMFS_ROOT_GID=0
 CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_RISCV_DMA_NONCOHERENT=y
 CONFIG_RISCV_ISA_ZICBOM=y
+CONFIG_RISCV_ROCC=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
 CONFIG_TOOLCHAIN_HAS_ZICBOM=y
 CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y

diff --git a/boards/default/firmware/opensbi b/boards/default/firmware/opensbi
diff --git a/boards/default/linux b/boards/default/linux
diff --git a/boards/firechip/base-workloads/br-base/linux-config b/boards/firechip/base-workloads/br-base/linux-config
@@ -1,10 +1,7 @@
 CONFIG_AS_VERSION=23900
 # CONFIG_ATA is not set
 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-CONFIG_CMDLINE="console=hvc0 earlycon=sbi"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_RISCV_SBI_V01=y
-CONFIG_HVC_RISCV_SBI=y
+CONFIG_CMDLINE="console=ttyS0 console=ttySIF0,3686400 earlycon"
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DEFAULT_HOSTNAME="ucb"
 # CONFIG_DRM is not set
@@ -24,7 +21,7 @@ CONFIG_NR_CPUS=32
 # CONFIG_PCI is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_SCSI is not set
-# CONFIG_SERIAL_SIFIVE is not set
+CONFIG_SERIAL_SIFIVE=y
 # CONFIG_SOC_SIFIVE is not set
 # CONFIG_SPI is not set
 # CONFIG_USB_SUPPORT is not set
@@ -60,6 +57,7 @@ CONFIG_INITRAMFS_ROOT_GID=0
 CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_RISCV_DMA_NONCOHERENT=y
 CONFIG_RISCV_ISA_ZICBOM=y
+CONFIG_RISCV_ROCC=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
 CONFIG_TOOLCHAIN_HAS_ZICBOM=y
 CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y

diff --git a/boards/firechip/base-workloads/fedora-base/linux-config b/boards/firechip/base-workloads/fedora-base/linux-config
@@ -1,7 +1,7 @@
 CONFIG_AS_VERSION=23900
 # CONFIG_ATA is not set
 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-CONFIG_CMDLINE="console=ttyS0 earlycon"
+CONFIG_CMDLINE="console=ttyS0 console=ttySIF0,3686400 earlycon"
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DEFAULT_HOSTNAME="ucb"
 # CONFIG_DRM is not set
@@ -57,6 +57,7 @@ CONFIG_INITRAMFS_ROOT_GID=0
 CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_RISCV_DMA_NONCOHERENT=y
 CONFIG_RISCV_ISA_ZICBOM=y
+CONFIG_RISCV_ROCC=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
 CONFIG_TOOLCHAIN_HAS_ZICBOM=y
 CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y

diff --git a/boards/firechip/drivers/icenet-driver b/boards/firechip/drivers/icenet-driver
diff --git a/boards/prototype/base-workloads/br-base/linux-config b/boards/prototype/base-workloads/br-base/linux-config
@@ -1,6 +1,6 @@
 # CONFIG_ATA is not set
 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-CONFIG_CMDLINE="console=ttyS0 earlycon"
+CONFIG_CMDLINE="console=ttyS0 console=ttySIF0 earlycon"
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DEFAULT_HOSTNAME="ucb"
 # CONFIG_DRM is not set
@@ -22,7 +22,7 @@ CONFIG_NR_CPUS=32
 # CONFIG_PCI is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_SCSI is not set
-# CONFIG_SERIAL_SIFIVE is not set
+CONFIG_SERIAL_SIFIVE=y
 # CONFIG_SOC_SIFIVE is not set
 CONFIG_SPI_DEBUG=y
 CONFIG_SPI_MEM=y
@@ -54,4 +54,5 @@ CONFIG_INITRAMFS_ROOT_UID=0
 # CONFIG_SPI_CADENCE_XSPI is not set
 # CONFIG_SPI_SN_F_OSPI is not set
 # CONFIG_SSIF_IPMI_BMC is not set
+CONFIG_RISCV_ROCC=y
 
diff --git a/wlutil/initramfs/nodisk/.gitignore b/wlutil/initramfs/nodisk/.gitignore
@@ -0,0 +1 @@
+bin/busybox