From 07a6fa69da5ea1221d02995c56d93dfa0be497ee Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 8 Jan 2025 10:04:53 -0600 Subject: [PATCH] Fixups to work with linux-6.19 --- mkroot/mkroot.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mkroot/mkroot.sh b/mkroot/mkroot.sh index d2cbd44f..ce8af387 100755 --- a/mkroot/mkroot.sh +++ b/mkroot/mkroot.sh @@ -245,7 +245,8 @@ get_target_config() elif [ "$CROSS" == microblaze ]; then QEMU_M=petalogix-s3adsp1800 KARCH=microblaze KARGS=ttyUL0 KCONF="$(be2csv MMU CPU_BIG_ENDIAN SERIAL_UARTLITE{,_CONSOLE} \ - XILINX_{EMACLITE,MICROBLAZE0_{FAMILY="spartan3adsp",USE_{{MSR,PCMP}_INSTR,BARREL,HW_MUL}=1}})" + XILINX_{EMACLITE,MICROBLAZE0_{FAMILY="spartan3adsp",USE_{{MSR,PCMP}_INSTR,BARREL,HW_MUL}=1}} \ + NET_VENDOR_XILINX)" elif [ "${CROSS#mips}" != "$CROSS" ]; then # mips mipsel mips64 mips64el QEMU_M=malta KARCH=mips KCONF="$(be2csv MIPS_MALTA CPU_MIPS32_R2 BLK_DEV_SD NET_VENDOR_AMD PCNET32 \ @@ -297,7 +298,7 @@ get_target_config() KCONF="$(be2csv CPU_SUBTYPE_SH7751R MMU VSYSCALL SH_{FPU,RTS7751R2D} PCI \ RTS7751R2D_PLUS SERIAL_SH_SCI{,_CONSOLE} NET_VENDOR_REALTEK 8139CP \ BLK_DEV_SD ATA{,_SFF,_BMDMA} PATA_PLATFORM BINFMT_ELF_FDPIC \ - CMDLINE_EXTEND MEMORY_START=0x0c000000)" + CMDLINE_FROM_BOOTLOADER MEMORY_START=0x0c000000)" #see also SPI{,_SH_SCI} MFD_SM501 RTC_{CLASS,DRV_{R9701,SH},HCTOSYS} [ "$CROSS" == sh4eb ] && KCONF+=,CPU_BIG_ENDIAN else die "Unknown \$CROSS=$CROSS" @@ -306,7 +307,7 @@ get_target_config() } # Linux kernel .config symbols common to all architectures -: ${GENERIC_KCONF:=$(be2csv PANIC_TIMEOUT=1 NO_HZ HIGH_RES_TIMERS RD_GZIP \ +: ${GENERIC_KCONF:=$(be2csv PANIC_TIMEOUT=1 NO_HZ_IDLE HIGH_RES_TIMERS RD_GZIP \ BINFMT_{ELF,SCRIPT} BLK_DEV{,_INITRD,_LOOP} EXT4_{FS,USE_FOR_EXT2} \ VFAT_FS FAT_DEFAULT_UTF8 MISC_FILESYSTEMS NLS_{CODEPAGE_437,ISO8859_1} \ SQUASHFS{,_XATTR,_ZLIB} TMPFS{,_POSIX_ACL} DEVTMPFS{,_MOUNT} \ -- 2.39.5