diff options
Diffstat (limited to 'target')
26 files changed, 192 insertions, 32 deletions
diff --git a/target/arc/kernel/synopsys-hsdk b/target/arc/kernel/synopsys-hsdk index 55ae3ccb6..a4e93f109 100644 --- a/target/arc/kernel/synopsys-hsdk +++ b/target/arc/kernel/synopsys-hsdk @@ -9,3 +9,9 @@ CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS=y CONFIG_ARC_HAS_LL64=y CONFIG_ARC_HAS_DIV_REM=y CONFIG_ARC_HAS_ACCL_REGS=y +CONFIG_ARC_CACHE=y +CONFIG_ARC_CACHE_LINE_SHIFT=6 +CONFIG_ARC_HAS_ICACHE=y +CONFIG_ARC_HAS_DCACHE=y +CONFIG_ARC_CACHE_PAGES=y + diff --git a/target/arm/Makefile b/target/arm/Makefile index 9ca6969a1..227cc97ca 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -129,10 +129,6 @@ ifeq ($(ADK_TARGET_FS),nfsroot) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" -ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y) - @echo "Use following in RedBoot bootloader:" - @echo "RedBoot> ip_address -l <localip> -h <serverip>; load -r -v -b 0x01d00000 ${TARGET_KERNEL}; exec 0x01d00000" -endif endif ifeq ($(ADK_TARGET_FS),squashfs) targethelp: @@ -205,6 +201,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) VENDOR:=allwinner/ endif +ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y) +VENDOR:=intel/ixp/ +endif endif dtb-install: @@ -272,6 +271,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) ${KERNEL_MAKE} $(VENDOR)stm32f746-disco.dtb $(MAKE_TRACE) endif +ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y) + ${KERNEL_MAKE} $(VENDOR)intel-ixp42x-linksys-nslu2.dtb $(MAKE_TRACE) +endif for x in $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb; do \ [[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb $(FW_DIR); \ break; \ @@ -294,7 +296,7 @@ ifeq (${ADK_TARGET_FS},genimage) imageinstall: dtb-install $(FW_DIR)/$(GENIMAGE) targethelp endif ifeq ($(ADK_TARGET_FS),nfsroot) -imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +imageinstall: kernel-install dtb-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif ifeq ($(ADK_TARGET_FS),squashfs) imageinstall: $(BUILD_DIR)/root.squashfs kernel-install dtb-install targethelp diff --git a/target/arm/kernel/linksys-nslu2 b/target/arm/kernel/linksys-nslu2 index a0a941721..924970b7c 100644 --- a/target/arm/kernel/linksys-nslu2 +++ b/target/arm/kernel/linksys-nslu2 @@ -1,4 +1,7 @@ CONFIG_ARM=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V5=y +CONFIG_ARCH_MULTI_V4_V5=y CONFIG_ARCH_IXDP425=y CONFIG_ARCH_IXDP4XX=y CONFIG_ARCH_IXP4XX=y @@ -7,6 +10,38 @@ CONFIG_ATAGS=y CONFIG_CPU_XSCALE=y CONFIG_IXP4XX_NPE=y CONFIG_IXP4XX_QMGR=y -CONFIG_IXP4XX_WATCHDOG=y CONFIG_MACH_NSLU2=y CONFIG_FPE_NWFPE=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_THUMB=y +CONFIG_KUSER_HELPERS=y + +CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_REGMAP=y +CONFIG_REGMAP_MMIO=y +CONFIG_INTEL_IXP4XX_EB=y +CONFIG_MTD=y +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +CONFIG_MTD_OTP=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_UTIL=y +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_PHYSMAP_IXP4XX=y diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index 72f55eadd..18333a17c 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/target/arm/systems/linksys-nslu2 @@ -4,15 +4,17 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_NETDEVICE - select ADK_TARGET_WITH_BLOCK select ADK_TARGET_WITH_I2C + select ADK_TARGET_WITH_MTD + select ADK_TARGET_WITH_PCI select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION select ADK_PACKAGE_IXP4XX_MICROCODE + select ADK_PACKAGE_APEX + select ADK_HOST_BUILD_UPSLUG2 help Linksys NSLU2 diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt index 2704b08ae..d4ea880ca 100644 --- a/target/config/Config.in.kernelfmt +++ b/target/config/Config.in.kernelfmt @@ -113,3 +113,4 @@ config ADK_TARGET_KERNEL_APPEND_DTB string default "armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 && !ADK_TARGET_KERNEL_VENDORED_DTB default "marvell/armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 && ADK_TARGET_KERNEL_VENDORED_DTB + default "intel/ixp/intel-ixp42x-linksys-nslu2" if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 && ADK_TARGET_KERNEL_VENDORED_DTB diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index 5c658fd02..403a2739f 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -59,8 +59,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS config ADK_TARGET_ROOTFS_SQUASHFS bool "Compressed read-only root filesystem (squashfs)" - select ADK_KERNEL_SQUASHFS - select ADK_HOST_NEED_SQUASHFS + select ADK_LINUX_KERNEL_SQUASHFS + select ADK_HOST_NEED_SQUASHFS_TOOLS select ADK_HOST_NEED_QEMU if ADK_TARGET_QEMU select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on ADK_TARGET_WITH_MTD \ @@ -101,8 +101,7 @@ config ADK_TARGET_ROOTFS_NFSROOT select ADK_LINUX_KERNEL_IP_PNP_DHCP if ADK_TARGET_OS_LINUX depends on !ADK_TARGET_QEMU && \ !ADK_TARGET_SIM && \ - !ADK_TARGET_SYSTEM_ARANYM_M68K && \ - !ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + !ADK_TARGET_SYSTEM_ARANYM_M68K depends on ADK_TARGET_WITH_NETDEVICE help Root filesystem mounted via NFS. (DHCP) diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index d60b42a08..0a0a0ef81 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -133,6 +133,10 @@ config ADK_HOST_BUILD_STLINK bool default n +config ADK_HOST_BUILD_UPSLUG2 + bool + default n + config ADK_HOST_BUILD_TAR bool default n @@ -280,13 +284,13 @@ config ADK_HOST_BUILD_OPKG default y if ADK_HOST_NEED_OPKG default n -config ADK_HOST_NEED_SQUASHFS +config ADK_HOST_NEED_SQUASHFS_TOOLS bool default n -config ADK_HOST_BUILD_SQUASHFS +config ADK_HOST_BUILD_SQUASHFS_TOOLS bool - default y if ADK_HOST_NEED_SQUASHFS + default y if ADK_HOST_NEED_SQUASHFS_TOOLS default n config ADK_HOST_NEED_SYSLINUX 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.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/lm32/uclibc-ng-nommu.config b/target/lm32/uclibc-ng-nommu.config index dbdf5613c..b540d0fbb 100644 --- a/target/lm32/uclibc-ng-nommu.config +++ b/target/lm32/uclibc-ng-nommu.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.44 C Library Configuration +# uClibc-ng 1.0.52 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -45,7 +45,6 @@ FORCE_OPTIONS_FOR_ARCH=y TARGET_SUBARCH="" UCLIBC_FORMAT_FLAT=y # UCLIBC_FORMAT_FLAT_SEP_DATA is not set -# UCLIBC_FORMAT_SHARED_FLAT is not set ARCH_HAS_DEPRECATED_SYSCALLS=y ARCH_BIG_ENDIAN=y @@ -73,8 +72,11 @@ HAVE_DOT_CONFIG=y HAVE_NO_PIC=y ARCH_HAS_NO_SHARED=y ARCH_HAS_NO_LDSO=y +UCLIBC_CTOR_DTOR=y HAS_NO_THREADS=y # UCLIBC_HAS_LINUXTHREADS is not set +PTHREADS_STACK_DEFAULT_SIZE=2097152 +UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set MALLOC_SIMPLE=y @@ -129,7 +131,20 @@ UCLIBC_HAS_CRYPT_IMPL=y UCLIBC_HAS_SHA256_CRYPT_IMPL=y UCLIBC_HAS_SHA512_CRYPT_IMPL=y UCLIBC_HAS_CRYPT=y -# UCLIBC_HAS_NETWORK_SUPPORT is not set +UCLIBC_HAS_NETWORK_SUPPORT=y +UCLIBC_HAS_SOCKET=y +UCLIBC_HAS_IPV4=y +UCLIBC_HAS_IPV6=y +UCLIBC_USE_NETLINK=y +UCLIBC_SUPPORT_AI_ADDRCONFIG=y +# UCLIBC_HAS_BSD_RES_CLOSE is not set +UCLIBC_HAS_COMPAT_RES_STATE=y +# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set +UCLIBC_HAS_RESOLVER_SUPPORT=y +# UCLIBC_DNSRAND_MODE_URANDOM is not set +# UCLIBC_DNSRAND_MODE_CLOCK is not set +UCLIBC_DNSRAND_MODE_PRNGPLUS=y +# UCLIBC_DNSRAND_MODE_SIMPLECOUNTER is not set # # String and Stdio Support @@ -180,11 +195,14 @@ UCLIBC_HAS_GNU_GETSUBOPT=y # # Big and Tall # -# UCLIBC_HAS_REGEX is not set -# UCLIBC_HAS_FNMATCH is not set -# UCLIBC_HAS_NFTW is not set -# UCLIBC_HAS_FTW is not set -# UCLIBC_HAS_FTS is not set +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_NFTW=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_FTS=y +UCLIBC_HAS_GLOB=y +UCLIBC_HAS_GNU_GLOB=y # # Library Installation Options diff --git a/target/x86/Makefile b/target/x86/Makefile index d2283400c..9298c3cbb 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -13,7 +13,9 @@ QEMU_ARGS+=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-net nic,model=virtio -net user +ifeq ($(ADK_TARGET_FS),archive) QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio +endif else QEMU_ARGS+=-net user -net nic,model=e1000 endif diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 221311091..d9cb4ca62 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -18,7 +18,9 @@ endif ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-net nic,model=virtio -net user +ifeq ($(ADK_TARGET_FS),archive) QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio +endif else QEMU_ARGS+=-net user -net nic,model=e1000 endif |