diff options
Diffstat (limited to 'target/linux')
18 files changed, 137 insertions, 11 deletions
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index b0b058436..1d1e262a8 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -39,8 +39,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT depends on !ADK_TARGET_ARCH_NDS32 select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT -config ADK_TARGET_LINUX_KERNEL_VERSION_6_13 - bool "6.13.9" +config ADK_TARGET_LINUX_KERNEL_VERSION_6_14 + bool "6.14.2" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -51,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_13 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_12 - bool "6.12.18" + bool "6.12.23" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -265,7 +265,6 @@ config ADK_TARGET_LINUX_KERNEL_GIT_VER config ADK_TARGET_LINUX_KERNEL_GIT_TYPE string depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT - default "branch" if ADK_TARGET_LINUX_ARCH_LM32 default "branch" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "hash" diff --git a/target/linux/config/Config.in.arc b/target/linux/config/Config.in.arc index 461d1b7cd..f2da2a7ea 100644 --- a/target/linux/config/Config.in.arc +++ b/target/linux/config/Config.in.arc @@ -24,4 +24,11 @@ config ADK_LINUX_KERNEL_ARC_BUILTIN_DTB_NAME default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_QEMU_ARC default "nsim_700" if ADK_TARGET_CPU_ARC_ARC700 +config ADK_LINUX_KERNEL_BUILTIN_DTB_NAME + string + depends on ADK_TARGET_ARCH_ARC + default "hsdk" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_HSDK + default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM + default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_QEMU_ARC + default "nsim_700" if ADK_TARGET_CPU_ARC_ARC700 diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 2da563549..8ccb10e72 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -497,10 +497,13 @@ config ADK_LINUX_KERNEL_MMC_DW select ADK_LINUX_KERNEL_MMC select ADK_LINUX_KERNEL_MMC_SPI select ADK_LINUX_KERNEL_MMC_BLOCK + select ADK_LINUX_KERNEL_MMC_DW_PLTFM select ADK_LINUX_KERNEL_BLK_DEV select ADK_LINUX_KERNEL_BLK_DEV_SD select ADK_LINUX_KERNEL_MMC_SDHCI select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM + select ADK_LINUX_KERNEL_PWRSEQ_EMMC + select ADK_LINUX_KERNEL_PWRSEQ_SIMPLE depends on ADK_TARGET_SYSTEM_SYNOPSYS_HSDK default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK default n diff --git a/target/linux/config/Config.in.bus b/target/linux/config/Config.in.bus index 45c79e1eb..54eddce4a 100644 --- a/target/linux/config/Config.in.bus +++ b/target/linux/config/Config.in.bus @@ -25,3 +25,9 @@ config ADK_LINUX_KERNEL_PCI_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 || \ ADK_TARGET_SYSTEM_PHYTEC_IMX6 default n + +config ADK_LINUX_KERNEL_PCI_IXP4XX + bool + depends on ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + default n diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma index c570b546e..11094514b 100644 --- a/target/linux/config/Config.in.dma +++ b/target/linux/config/Config.in.dma @@ -58,6 +58,14 @@ config ADK_LINUX_KERNEL_DMA_BCM2708 default y if ADK_TARGET_BOARD_BCM28XX default n +config ADK_LINUX_KERNEL_DW_AXI_DMAC + bool + select ADK_LINUX_KERNEL_DMADEVICES + select ADK_LINUX_KERNEL_DMA_SHARED_BUFFER + depends on ADK_TARGET_SYSTEM_SYNOPSYS_HSDK + default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK + default n + config ADK_LINUX_KERNEL_IMX_SDMA bool select ADK_LINUX_KERNEL_MXS_DMA diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index effa41d58..38c5cf7b2 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -91,6 +91,22 @@ config ADK_LINUX_KERNEL_ETRAX_AXISFLASHMAP depends on ADK_TARGET_SYSTEM_FOXBOARD_LX832 default y if ADK_TARGET_SYSTEM_FOXBOARD_LX832 +config ADK_LINUX_KERNEL_MTD_PHYSMAP_IXP4XX + bool "Linksys NSLU2 Flashmap driver" + select ADK_LINUX_KERNEL_BLOCK + select ADK_LINUX_KERNEL_MTD + select ADK_LINUX_KERNEL_MTD_PARTITIONS + select ADK_LINUX_KERNEL_MTD_CHAR + select ADK_LINUX_KERNEL_MTD_BLKDEVS + select ADK_LINUX_KERNEL_MTD_BLOCK + select ADK_LINUX_KERNEL_MTD_ROOTFS_ROOT_DEV + select ADK_LINUX_KERNEL_MTD_CFI + select ADK_LINUX_KERNEL_MTD_CFI_INTELEXT + select ADK_LINUX_KERNEL_MTD_PHYSMAP + select ADK_LINUX_KERNEL_MTD_PHYSMAP_OF + depends on ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + config ADK_LINUX_KERNEL_MTD_M25P80 bool "MTD M25P80 driver" select ADK_LINUX_KERNEL_BLOCK @@ -164,6 +180,7 @@ config ADK_TARGET_MTD_SIZE depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \ + || ADK_TARGET_SYSTEM_LINKSYS_NSLU2 \ || ADK_TARGET_SYSTEM_MIKROTIK_RB532 default "16777216" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 1bed25ee6..ee4a0204e 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -43,9 +43,6 @@ config ADK_LINUX_KERNEL_FAT_DEFAULT_IOCHARSET string default "iso8859-1" -config ADK_LINUX_KERNEL_SQUASHFS_XZ - bool - config ADK_LINUX_KERNEL_JFFS2_COMPRESSION_OPTIONS bool @@ -253,7 +250,6 @@ config ADK_LINUX_KERNEL_JFFS2_FS config ADK_LINUX_KERNEL_SQUASHFS tristate "SquashFS filesystem" select ADK_LINUX_KERNEL_MISC_FILESYSTEMS - select ADK_LINUX_KERNEL_SQUASHFS_XZ help Squashfs compressed read-only filesystem diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index db330f0f1..8d1906caf 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -31,8 +31,6 @@ config ADK_LINUX_KERNEL_INET select ADK_LINUX_KERNEL_NET_CORE select ADK_LINUX_KERNEL_NETDEVICES select ADK_LINUX_KERNEL_ETHERNET - select ADK_LINUX_KERNEL_CRYPTO - select ADK_LINUX_KERNEL_CRYPTO_AES default y config ADK_LINUX_KERNEL_IP_FIB_HASH diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index db4c1d999..eb891d86b 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -120,7 +120,8 @@ config ADK_LINUX_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_SOM_C6745 \ || ADK_TARGET_SYSTEM_ROCKPI4_PLUS \ || ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 \ - || ADK_TARGET_SYSTEM_PCDUINO_3B + || ADK_TARGET_SYSTEM_PCDUINO_3B \ + || ADK_TARGET_SYSTEM_LINKSYS_NSLU2 select ADK_LINUX_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_ORANGE_PI0 diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 157c2f222..e6e3351f6 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -78,6 +78,7 @@ config ADK_LINUX_KERNEL_USB select ADK_LINUX_KERNEL_NLS select ADK_LINUX_KERNEL_USB_SUPPORT select ADK_LINUX_KERNEL_USB_ANNOUNCE_NEW_DEVICES + select ADK_LINUX_KERNEL_USB_PCI if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 default m if ADK_TARGET_SYSTEM_PCENGINES_APU default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG @@ -88,6 +89,7 @@ config ADK_LINUX_KERNEL_USB default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default y if ADK_TARGET_SYSTEM_RASPBERRY_PI5 + default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 default n help Universal Serial Bus (USB) is a specification for a serial bus @@ -159,6 +161,7 @@ config ADK_LINUX_KERNEL_USB_EHCI_HCD default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default y if ADK_TARGET_SYSTEM_RASPBERRY_PI5 + default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 default n help The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 @@ -205,11 +208,13 @@ config ADK_LINUX_KERNEL_USB_OHCI_HCD select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_PCENGINES_ALIX select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_PCENGINES_APU select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_ROCKPI4_PLUS + select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 default m if ADK_TARGET_SYSTEM_PCENGINES_APU default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX default m if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS + default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 default n help The Open Host Controller Interface (OHCI) is a standard for accessing diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 59c60d94f..eaa07a65d 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -35,6 +35,15 @@ config ADK_LINUX_KERNEL_IMX2_WDT help Watchdog driver for IMX6 boards. +config ADK_LINUX_KERNEL_IXP4XX_WATCHDOG + bool "Hardware Watchdog for Linksys NSLU2" + select ADK_LINUX_KERNEL_WATCHDOG + depends on ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + default n + help + Watchdog driver for Linksys NSLU2. + config ADK_LINUX_KERNEL_SCx200_WDT bool "Natsemi Hardware Watchdog" depends on ADK_TARGET_SYSTEM_PCENGINES_WRAP diff --git a/target/linux/patches/2.6.32.70/proc-xscale.patch b/target/linux/patches/2.6.32.70/proc-xscale.patch new file mode 100644 index 000000000..a8546bba9 --- /dev/null +++ b/target/linux/patches/2.6.32.70/proc-xscale.patch @@ -0,0 +1,12 @@ +diff -Nur linux-2.6.32.70.orig/arch/arm/mm/proc-xscale.S linux-2.6.32.70/arch/arm/mm/proc-xscale.S +--- linux-2.6.32.70.orig/arch/arm/mm/proc-xscale.S 2016-01-29 22:13:00.000000000 +0100 ++++ linux-2.6.32.70/arch/arm/mm/proc-xscale.S 2025-04-06 10:56:31.793163221 +0200 +@@ -605,7 +605,7 @@ + + .align + +- .section ".proc.info.init", #alloc, #execinstr ++ .section ".proc.info.init", "ax" + + .type __80200_A0_A1_proc_info,#object + __80200_A0_A1_proc_info: diff --git a/target/linux/patches/2.6.32.70/uaccess.patch b/target/linux/patches/2.6.32.70/uaccess.patch new file mode 100644 index 000000000..428a06b69 --- /dev/null +++ b/target/linux/patches/2.6.32.70/uaccess.patch @@ -0,0 +1,14 @@ +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 + +diff -Nur linux-2.6.32.70.orig/arch/arm/include/asm/uaccess.h linux-2.6.32.70/arch/arm/include/asm/uaccess.h +--- linux-2.6.32.70.orig/arch/arm/include/asm/uaccess.h 2016-01-29 22:13:00.000000000 +0100 ++++ linux-2.6.32.70/arch/arm/include/asm/uaccess.h 2025-04-06 10:41:37.342042671 +0200 +@@ -145,7 +145,7 @@ + + #define put_user(x,p) \ + ({ \ +- register const typeof(*(p)) __r2 asm("r2") = (x); \ ++ register typeof(*(p)) __r2 asm("r2") = (x); \ + register const typeof(*(p)) __user *__p asm("r0") = (p);\ + register int __e asm("r0"); \ + switch (sizeof(*(__p))) { \ diff --git a/target/linux/patches/6.12.18/armnommu-versatile.patch b/target/linux/patches/6.12.23/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.12.18/armnommu-versatile.patch +++ b/target/linux/patches/6.12.23/armnommu-versatile.patch diff --git a/target/linux/patches/6.12.18/hppa-cross-compile.patch b/target/linux/patches/6.12.23/hppa-cross-compile.patch index 51c24fff2..51c24fff2 100644 --- a/target/linux/patches/6.12.18/hppa-cross-compile.patch +++ b/target/linux/patches/6.12.23/hppa-cross-compile.patch diff --git a/target/linux/patches/6.12.18/macsonic.patch b/target/linux/patches/6.12.23/macsonic.patch index 51e76113b..51e76113b 100644 --- a/target/linux/patches/6.12.18/macsonic.patch +++ b/target/linux/patches/6.12.23/macsonic.patch diff --git a/target/linux/patches/6.6.82/linksys-nslu2.patch b/target/linux/patches/6.6.82/linksys-nslu2.patch new file mode 100644 index 000000000..20958062e --- /dev/null +++ b/target/linux/patches/6.6.82/linksys-nslu2.patch @@ -0,0 +1,12 @@ +diff -Nur linux-6.6.82.orig/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts linux-6.6.82/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts +--- linux-6.6.82.orig/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts 2025-03-09 09:55:04.000000000 +0100 ++++ linux-6.6.82/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts 2025-04-08 19:11:26.464512676 +0200 +@@ -21,7 +21,7 @@ + }; + + chosen { +- bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait"; ++ bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock4 rootfstype=squashfs rootwait"; + stdout-path = "uart0:115200n8"; + }; + diff --git a/target/linux/patches/6a2f2e4198eaff63ee75f6085ce9f966c47b4441/flat-fix-debug-output.patch b/target/linux/patches/6a2f2e4198eaff63ee75f6085ce9f966c47b4441/flat-fix-debug-output.patch new file mode 100644 index 000000000..8ca77b3c7 --- /dev/null +++ b/target/linux/patches/6a2f2e4198eaff63ee75f6085ce9f966c47b4441/flat-fix-debug-output.patch @@ -0,0 +1,39 @@ +--- /home/mirabilos/q/linux-6a2f2e4198eaff63ee75f6085ce9f966c47b4441/arch/lm32/kernel/flat.c 2025-04-13 20:33:20.000000000 +0000 ++++ linux-6a2f2e4198eaff63ee75f6085ce9f966c47b4441/arch/lm32/kernel/flat.c 2025-04-14 02:40:22.277112693 +0000 +@@ -23,13 +20,13 @@ unsigned long lm32_get_addr_from_rp(unsi + + switch (type) { + case FLAT_LM32_RELOC_TYPE_32_BIT: +- pr_debug("*ptr = %lx", get_unaligned(ptr)); ++ pr_debug("*ptr = %lx at %p\n", get_unaligned(ptr), ptr); + val = get_unaligned(ptr); + break; + + case FLAT_LM32_RELOC_TYPE_LO16_BIT: + case FLAT_LM32_RELOC_TYPE_HI16_BIT: +- pr_debug("*usptr = %x", get_unaligned(usptr)); ++ pr_debug("*usptr = %x at %p\n", get_unaligned(usptr), usptr); + val = get_unaligned(usptr) & 0xffff; + val += *persistent; + break; +@@ -56,17 +53,17 @@ void lm32_put_addr_at_rp(unsigned long * + switch (type) { + case FLAT_LM32_RELOC_TYPE_32_BIT: + put_unaligned(addr, ptr); +- pr_debug("new ptr =%lx", get_unaligned(ptr)); ++ pr_debug("new value %lx at %p\n", get_unaligned(ptr), ptr); + break; + + case FLAT_LM32_RELOC_TYPE_LO16_BIT: + put_unaligned(addr, usptr); +- pr_debug("new value %x at %p", get_unaligned(usptr), usptr); ++ pr_debug("new value %x (lo) at %p\n", get_unaligned(usptr), usptr); + break; + + case FLAT_LM32_RELOC_TYPE_HI16_BIT: + put_unaligned(addr >> 16, usptr); +- pr_debug("new value %x at %p", get_unaligned(usptr), usptr); ++ pr_debug("new value %x (hi) at %p\n", get_unaligned(usptr), usptr); + break; + + } |