From 4b2dfdc18a0e310ed7bb83eb15e1971d349d6195 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 1 May 2025 16:14:55 -0500 Subject: [PATCH] kernel config: bump the number of allowed CONFIG_SERIAL_8250_NR_UARTS as MSS supports 5 out of the box Signed-off-by: Robert Nelson --- 04_build_linux.sh | 8 ++++++++ patches/linux/mpfs_defconfig | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/04_build_linux.sh b/04_build_linux.sh index a4a1eda..6626559 100755 --- a/04_build_linux.sh +++ b/04_build_linux.sh @@ -79,6 +79,10 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then ./scripts/config --enable CONFIG_FW_LOADER_COMPRESS_XZ ./scripts/config --enable CONFIG_FW_LOADER_COMPRESS_ZSTD + #Bump the number of default uarts allowed + ./scripts/config --set-val CONFIG_SERIAL_8250_NR_UARTS 8 + ./scripts/config --set-val CONFIG_SERIAL_8250_RUNTIME_UARTS 8 + echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig" make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig else @@ -164,6 +168,10 @@ else make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig fi +#echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} menuconfig" +#make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} menuconfig +#exit 2 + echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs" make -j${CORES} ARCH=riscv CROSS_COMPILE="ccache ${CC}" Image modules dtbs diff --git a/patches/linux/mpfs_defconfig b/patches/linux/mpfs_defconfig index 4909e1b..b885e93 100644 --- a/patches/linux/mpfs_defconfig +++ b/patches/linux/mpfs_defconfig @@ -26,7 +26,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set # CONFIG_WERROR is not set -CONFIG_LOCALVERSION="-20240521" +CONFIG_LOCALVERSION="-20250501" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_DEFAULT_INIT="" @@ -2766,8 +2766,8 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_NR_UARTS=8 +CONFIG_SERIAL_8250_RUNTIME_UARTS=8 # CONFIG_SERIAL_8250_EXTENDED is not set # CONFIG_SERIAL_8250_DW is not set # CONFIG_SERIAL_8250_RT288X is not set