diff --git a/linux/buildroot-config-src/buildroot-2023.05.1/main.config b/linux/buildroot-config-src/buildroot-2023.05.1/main.config index bb0547d71..99ffa9cef 100644 --- a/linux/buildroot-config-src/buildroot-2023.05.1/main.config +++ b/linux/buildroot-config-src/buildroot-2023.05.1/main.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Buildroot 2023.05.2-166-gb362115b25 Configuration +# Buildroot 2023.05.3 Configuration # BR2_HAVE_DOT_CONFIG=y BR2_HOST_GCC_AT_LEAST_4_9=y @@ -399,15 +399,16 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="" # Kernel # BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_LATEST_VERSION=y +# BR2_LINUX_KERNEL_LATEST_VERSION is not set # BR2_LINUX_KERNEL_LATEST_CIP_VERSION is not set # BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION is not set -# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set +BR2_LINUX_KERNEL_CUSTOM_VERSION=y # BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set # BR2_LINUX_KERNEL_CUSTOM_GIT is not set # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_SVN is not set -BR2_LINUX_KERNEL_VERSION="6.3.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6" +BR2_LINUX_KERNEL_VERSION="6.6" BR2_LINUX_KERNEL_PATCH="" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set # BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set @@ -433,6 +434,7 @@ BR2_LINUX_KERNEL_GZIP=y # # Linux Kernel Extensions # +# BR2_LINUX_KERNEL_EXT_RTAI is not set # BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS is not set # BR2_LINUX_KERNEL_EXT_FBTFT is not set # BR2_LINUX_KERNEL_EXT_AUFS is not set diff --git a/linux/devicetree/wally-virt.dts b/linux/devicetree/wally-virt.dts index b2fa1e81c..7cc0f757a 100644 --- a/linux/devicetree/wally-virt.dts +++ b/linux/devicetree/wally-virt.dts @@ -15,7 +15,7 @@ memory@80000000 { device_type = "memory"; - reg = <0x00 0x80000000 0x00 0x08000000>; + reg = <0x00 0x80000000 0x00 0x10000000>; }; cpus { diff --git a/linux/testvector-generation/EmulateLinux.sh b/linux/testvector-generation/EmulateLinux.sh new file mode 100755 index 000000000..59b365675 --- /dev/null +++ b/linux/testvector-generation/EmulateLinux.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +usage() { echo "Usage: $0 [-h] [-b ] [-d ]" 1>&2; exit 1; } + +help() { + echo "Usage: $0 [OPTIONS] " + echo " -b get images from given buildroot" + echo " -d specify device tree to use" + exit 0; +} + +# defaults +imageDir=$RISCV/buildroot/output/images +DEVICE_TREE=../devicetree/wally-virt.dtb + +# Process options and arguments. The following code grabs the single +# sdcard device argument no matter where it is in the positional +# parameters list. +ARGS=() +while [ $OPTIND -le "$#" ] ; do + if getopts "hb:d:" arg ; then + case "${arg}" in + h) help + ;; + b) BUILDROOT=${OPTARG} + ;; + d) DEVICE_TREE=${OPTARG} + ;; + esac + else + ARGS+=("${!OPTIND}") + ((OPTIND++)) + fi +done + +# File location variables +imageDir=$BUILDROOT/output/images + +#imageDir=$RISCV/buildroot/output/images +imageDir=~/repos/buildroot-sept2023/output/images +tvDir=$RISCV/linux-testvectors +tcpPort=1239 + +# QEMU Simulation +qemu-system-riscv64 \ +-M virt -m 256M -dtb $DEVICE_TREE \ +-nographic \ +-bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" +-singlestep -rtc clock=vm -icount shift=0,align=off,sleep=on