diff --git a/04_build_linux.sh b/04_build_linux.sh index 7549e22..ef8e34e 100755 --- a/04_build_linux.sh +++ b/04_build_linux.sh @@ -41,6 +41,7 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig ./scripts/config --set-str CONFIG_LOCALVERSION "-$(date +%Y%m%d)" + ./scripts/config --module CONFIG_IKHEADERS #6.1 to 6.6 switches ./scripts/config --disable CONFIG_FW_LOADER_DEBUG @@ -175,6 +176,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} DTC_FLAGS=\"-@\" Image modules dtbs" make -j${CORES} ARCH=riscv CROSS_COMPILE="ccache ${CC}" DTC_FLAGS="-@" Image modules dtbs diff --git a/patches/linux/dts/mpfs-beaglev-fire.dts b/patches/linux/dts/mpfs-beaglev-fire.dts index 6ac1a1e..dd3b9d7 100644 --- a/patches/linux/dts/mpfs-beaglev-fire.dts +++ b/patches/linux/dts/mpfs-beaglev-fire.dts @@ -31,6 +31,7 @@ serial2 = &mmuart2; serial3 = &mmuart3; serial4 = &mmuart4; + mmc0 = &mmc; }; chosen { @@ -127,13 +128,6 @@ "", "", "", "", "", "SD_CARD_CS", "USER_BUTTON"; status = "okay"; - sd-card-cs-hog { - gpio-hog; - gpios = <12 12>; - output-high; - line-name = "SD_CARD_CS"; - }; - user-button-hog { gpio-hog; gpios = <13 13>; diff --git a/patches/linux/mpfs_defconfig b/patches/linux/mpfs_defconfig index 02335cb..d7d8b8c 100644 --- a/patches/linux/mpfs_defconfig +++ b/patches/linux/mpfs_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.6.51-linux4microchip+fpga-2024.09 Kernel Configuration +# Linux/riscv 6.6.75-linux4microchip+fpga-2025.03 Kernel Configuration # CONFIG_CC_VERSION_TEXT="riscv64-linux-gcc (GCC) 11.4.0" CONFIG_CC_IS_GCC=y @@ -11,12 +11,13 @@ CONFIG_AS_VERSION=24000 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24000 CONFIG_LLD_VERSION=0 +CONFIG_RUST_IS_AVAILABLE=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=124 +CONFIG_PAHOLE_VERSION=129 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -27,7 +28,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="-20250123" +CONFIG_LOCALVERSION="-20250414" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_DEFAULT_INIT="" @@ -137,7 +138,7 @@ CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -# CONFIG_IKHEADERS is not set +CONFIG_IKHEADERS=m CONFIG_LOG_BUF_SHIFT=17 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_PRINTK_INDEX is not set @@ -284,6 +285,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_HWEIGHT=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_PGTABLE_LEVELS=5 CONFIG_LOCKDEP_SUPPORT=y CONFIG_RISCV_DMA_NONCOHERENT=y @@ -650,11 +652,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" CONFIG_ZBUD=y -CONFIG_Z3FOLD=m +# CONFIG_Z3FOLD_DEPRECATED is not set CONFIG_ZSMALLOC=m # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC_CHAIN_SIZE=8 @@ -2267,6 +2269,8 @@ CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_ENC28J60 is not set # CONFIG_ENCX24J600 is not set # CONFIG_LAN743X is not set +# CONFIG_MICROCHIP_CORETSE is not set +# CONFIG_MICROCHIP_CORETSN is not set # CONFIG_LAN966X_SWITCH is not set # CONFIG_VCAP is not set CONFIG_NET_VENDOR_MICROSEMI=y @@ -4096,6 +4100,7 @@ CONFIG_HID_ZYDACRON=m CONFIG_HID_SENSOR_HUB=m CONFIG_HID_SENSOR_CUSTOM_SENSOR=m CONFIG_HID_ALPS=m +# CONFIG_HID_MCP2200 is not set CONFIG_HID_MCP2221=m # end of Special HID drivers @@ -5719,9 +5724,9 @@ CONFIG_TMPFS_INODE64=y # CONFIG_TMPFS_QUOTA is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y CONFIG_HUGETLBFS=y +# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_HUGETLB_PAGE=y CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y CONFIG_EFIVAR_FS=m @@ -5931,6 +5936,9 @@ CONFIG_ENCRYPTED_KEYS=y # CONFIG_USER_DECRYPTED_DATA is not set CONFIG_KEY_DH_OPERATIONS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y