6 Commits c288bdc22b ... b355bcd910

Tác giả SHA1 Thông báo Ngày
  Waldemar Brodkorb b355bcd910 binutils: add older versions 1 tuần trước cách đây
  Waldemar Brodkorb c0ebd92555 lzma: update to 4.65 1 tuần trước cách đây
  Waldemar Brodkorb fc1b5c2bd5 gcc: allow to compile gcc5 1 tuần trước cách đây
  Waldemar Brodkorb 5df16b938d mikrotik-rb532: fix NAND detection 2 tuần trước cách đây
  Waldemar Brodkorb c0c5641f23 mikrotik-rb532: add some required patches to LTS kernel 2 tuần trước cách đây
  Waldemar Brodkorb 6adef88fbc rb532: enable NAND support (non-working) 2 tuần trước cách đây

+ 2 - 2
mk/linux-ver.mk

@@ -52,10 +52,10 @@ KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		4f2afffbeddaad6b8527d41a3e3a82646d3cf5dfd0acbb6c4e8a99fc70461b96
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_10),y)
-KERNEL_FILE_VER:=	5.10.236
+KERNEL_FILE_VER:=	5.10.253
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		6da5cc8f7d39ed3acb4d59129a3f1570d981526ebbf58ea82595b7b6e000fb89
+KERNEL_HASH:=		ec0724928050e8e2f6226fe8bbb206f42a951c0ed2dbb533c5462789f6d75ac8
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y)
 KERNEL_FILE_VER:=	5.4.292

+ 13 - 3
package/lzma/Makefile

@@ -4,22 +4,32 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		lzma
-PKG_VERSION:=		4.32.7
+PKG_VERSION:=		4.65
 PKG_RELEASE:=		1
-PKG_HASH:=		02aa57f995d15b7acb7c2496d88a39fb0124ea00bf027cc61dd24eddb5942dff
+PKG_HASH:=		dcbdb5f4843eff638e4a5e8be0e2486a3c5483df73c70823618db8e66f609ec2
 PKG_DESCR:=		compression utility
 PKG_SECTION:=		app/archive
 PKG_NEEDS:=		c++
 PKG_URL:=		http://tukaani.org/lzma/
 PKG_SITES:=		http://tukaani.org/lzma/
 
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,LZMA,lzma,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LZMA,lzma,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
+HOST_STYLE:=		manual
+
+host-build:
+	(cd $(WRKBUILD) && $(MAKE) -C C/LzmaUtil -f makefile.gcc)
+	(cd $(WRKBUILD) && $(MAKE) -C CPP/7zip/Compress/LZMA_Alone -f makefile.gcc)
+
+lzma-hostinstall:
+	$(INSTALL_BIN) $(WRKBUILD)/CPP/7zip/Compress/LZMA_Alone/lzma \
+		$(STAGING_HOST_DIR)/usr/bin
 
 lzma-install:
 	$(INSTALL_DIR) $(IDIR_LZMA)/usr/bin

+ 15 - 0
target/config/Config.in.binutils

@@ -71,6 +71,21 @@ config ADK_TOOLCHAIN_BINUTILS_2_26
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_KVX
 
+config ADK_TOOLCHAIN_BINUTILS_2_25
+	bool "2.25"
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_KVX
+
+config ADK_TOOLCHAIN_BINUTILS_2_24
+	bool "2.24"
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_KVX
+
+config ADK_TOOLCHAIN_BINUTILS_2_23
+	bool "2.23"
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_KVX
+
 config ADK_TOOLCHAIN_BINUTILS_ARC
 	bool "arc-2023.09"
 	depends on ADK_TARGET_ARCH_ARC

+ 1 - 0
target/linux/Config.in.kernelcfg

@@ -76,6 +76,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG
 	default "hp6xx_defconfig" if ADK_TARGET_SYSTEM_HP_JORNADA
 	default "pic32mzda_defconfig" if ADK_TARGET_SYSTEM_MICROCHIP_PIC32
 	default "mvebu_v5_defconfig" if ADK_TARGET_SYSTEM_SHEEVAPLUG
+	default "rb532_defconfig" if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default ""
 
 config ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH

+ 1 - 1
target/linux/Config.in.kernelversion

@@ -105,7 +105,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_15
 	depends on !ADK_TARGET_ARCH_METAG
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_5_10
-	bool "5.10.236"
+	bool "5.10.253"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X

+ 13 - 1
target/linux/config/Config.in.flash

@@ -80,6 +80,15 @@ config ADK_LINUX_KERNEL_MTD_OF_PARTS
 config ADK_LINUX_KERNEL_MTD_REDBOOT_PARTS
 	bool
 
+config ADK_LINUX_KERNEL_MTD_RAW_NAND
+	bool
+
+config ADK_LINUX_KERNEL_MTD_BLOCK2MTD
+	bool
+
+config ADK_LINUX_KERNEL_MTD_NAND_ECC_SW_HAMMING
+	bool
+
 config ADK_LINUX_KERNEL_ETRAX_AXISFLASHMAP
 	bool "Axis Flashmap driver"
 	select ADK_LINUX_KERNEL_BLOCK
@@ -134,7 +143,7 @@ config ADK_LINUX_KERNEL_MTD_M25P80
 	default n
 
 config ADK_LINUX_KERNEL_MTD_NAND_PLATFORM
-	bool "NAND platform driver"
+	bool "NAND driver for RB532"
 	select ADK_LINUX_KERNEL_BLOCK
 	select ADK_LINUX_KERNEL_MISC_FILESYSTEMS
 	select ADK_LINUX_KERNEL_MTD
@@ -143,6 +152,9 @@ config ADK_LINUX_KERNEL_MTD_NAND_PLATFORM
 	select ADK_LINUX_KERNEL_MTD_CHAR
 	select ADK_LINUX_KERNEL_MTD_BLKDEVS
 	select ADK_LINUX_KERNEL_MTD_BLOCK
+	select ADK_LINUX_KERNEL_MTD_BLOCK2MTD
+	select ADK_LINUX_KERNEL_MTD_RAW_NAND
+	select ADK_LINUX_KERNEL_MTD_NAND_ECC_SW_HAMMING
 	depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default n

+ 17 - 0
target/linux/patches/4.19.320/MIPS-rb532-Fix-MMIO-UART-resource-registration.patch

@@ -0,0 +1,17 @@
+diff -Nur linux-4.19.320.orig/arch/mips/rb532/devices.c linux-4.19.320/arch/mips/rb532/devices.c
+--- linux-4.19.320.orig/arch/mips/rb532/devices.c	2024-08-19 05:32:18.000000000 +0200
++++ linux-4.19.320/arch/mips/rb532/devices.c	2026-04-19 09:36:30.112899077 +0200
+@@ -225,11 +225,11 @@
+ static struct plat_serial8250_port rb532_uart_res[] = {
+ 	{
+ 		.type           = PORT_16550A,
+-		.membase	= (char *)KSEG1ADDR(REGBASE + UART0BASE),
++		.mapbase        = REGBASE + UART0BASE,
+ 		.irq		= UART0_IRQ,
+ 		.regshift	= 2,
+ 		.iotype		= UPIO_MEM,
+-		.flags		= UPF_BOOT_AUTOCONF,
++		.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,
+ 	},
+ 	{
+ 		.flags		= 0,

+ 12 - 0
target/linux/patches/4.19.320/mips-vdso-gcc15.patch

@@ -0,0 +1,12 @@
+diff -Nur linux-4.19.320.orig/arch/mips/vdso/Makefile linux-4.19.320/arch/mips/vdso/Makefile
+--- linux-4.19.320.orig/arch/mips/vdso/Makefile	2024-08-19 05:32:18.000000000 +0200
++++ linux-4.19.320/arch/mips/vdso/Makefile	2026-04-19 09:15:00.183108904 +0200
+@@ -18,7 +18,7 @@
+ 	-O2 -g -fPIC -fno-strict-aliasing -fno-common -fno-builtin -G 0 \
+ 	-DDISABLE_BRANCH_PROFILING \
+ 	$(call cc-option, -fno-asynchronous-unwind-tables) \
+-	$(call cc-option, -fno-stack-protector)
++	$(call cc-option, -fno-stack-protector) -std=gnu11
+ aflags-vdso := $(ccflags-vdso) \
+ 	-D__ASSEMBLY__ -Wa,-gdwarf-2
+ 

+ 0 - 0
target/linux/patches/5.10.236/arc.patch → target/linux/patches/5.10.253/arc.patch


+ 0 - 0
target/linux/patches/5.10.236/darwin-dtc.patch → target/linux/patches/5.10.253/darwin-dtc.patch


+ 0 - 0
target/linux/patches/5.10.236/dtc-noyaml.patch → target/linux/patches/5.10.253/dtc-noyaml.patch


+ 0 - 0
target/linux/patches/5.10.236/nds32-ag101p.patch → target/linux/patches/5.10.253/nds32-ag101p.patch


+ 0 - 0
target/linux/patches/5.10.236/or1k-more-ram.patch → target/linux/patches/5.10.253/or1k-more-ram.patch


+ 0 - 0
target/linux/patches/5.10.236/relocs.patch → target/linux/patches/5.10.253/relocs.patch


+ 0 - 0
target/linux/patches/5.10.236/startup.patch → target/linux/patches/5.10.253/startup.patch


+ 17 - 0
target/linux/patches/5.4.292/MIPS-rb532-Fix-MMIO-UART-resource-registration.patch

@@ -0,0 +1,17 @@
+diff -Nur linux-4.19.320.orig/arch/mips/rb532/devices.c linux-4.19.320/arch/mips/rb532/devices.c
+--- linux-4.19.320.orig/arch/mips/rb532/devices.c	2024-08-19 05:32:18.000000000 +0200
++++ linux-4.19.320/arch/mips/rb532/devices.c	2026-04-19 09:36:30.112899077 +0200
+@@ -225,11 +225,11 @@
+ static struct plat_serial8250_port rb532_uart_res[] = {
+ 	{
+ 		.type           = PORT_16550A,
+-		.membase	= (char *)KSEG1ADDR(REGBASE + UART0BASE),
++		.mapbase        = REGBASE + UART0BASE,
+ 		.irq		= UART0_IRQ,
+ 		.regshift	= 2,
+ 		.iotype		= UPIO_MEM,
+-		.flags		= UPF_BOOT_AUTOCONF,
++		.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,
+ 	},
+ 	{
+ 		.flags		= 0,

+ 12 - 0
target/linux/patches/5.4.292/mips-vdso-gcc15.patch

@@ -0,0 +1,12 @@
+diff -Nur linux-4.19.320.orig/arch/mips/vdso/Makefile linux-4.19.320/arch/mips/vdso/Makefile
+--- linux-4.19.320.orig/arch/mips/vdso/Makefile	2024-08-19 05:32:18.000000000 +0200
++++ linux-4.19.320/arch/mips/vdso/Makefile	2026-04-19 09:15:00.183108904 +0200
+@@ -18,7 +18,7 @@
+ 	-O2 -g -fPIC -fno-strict-aliasing -fno-common -fno-builtin -G 0 \
+ 	-DDISABLE_BRANCH_PROFILING \
+ 	$(call cc-option, -fno-asynchronous-unwind-tables) \
+-	$(call cc-option, -fno-stack-protector)
++	$(call cc-option, -fno-stack-protector) -std=gnu11
+ aflags-vdso := $(ccflags-vdso) \
+ 	-D__ASSEMBLY__ -Wa,-gdwarf-2
+ 

+ 0 - 1
target/mips/kernel/mikrotik-rb532

@@ -1,4 +1,3 @@
 CONFIG_MIPS=y
 CONFIG_MIKROTIK_RB532=y
-CONFIG_CPU_MIPS32_R1=y
 CONFIG_CMDLINE_BOOL=y

+ 21 - 0
toolchain/binutils/Makefile.inc

@@ -79,6 +79,27 @@ PKG_HASH:=		9615feddaeedc214d1a1ecd77b6697449c952eab69d79ab2125ea050e944bcc1
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_25),y)
+PKG_VERSION:=		2.25
+PKG_RELEASE:=		1
+PKG_HASH:=		cccf377168b41a52a76f46df18feb8f7285654b3c1bd69fc8265cb0fc6902f2d
+PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y)
+PKG_VERSION:=		2.24
+PKG_RELEASE:=		1
+PKG_HASH:=		4930b2886309112c00a279483eaef2f0f8e1b1b62010e0239c16b22af7c346d4
+PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_23),y)
+PKG_VERSION:=		2.23
+PKG_RELEASE:=		1
+PKG_HASH:=		7909a08eabdbaac0f7a22e9ede82a66ba70acd50629b045e705af864eef10b65
+PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_KVX),y)
 PKG_VERSION:=		782547a4e2bdf1308728032853678ca69bb154ea
 PKG_GIT:=		hash

+ 4 - 0
toolchain/gcc/Makefile

@@ -265,6 +265,10 @@ ifeq ($(ADK_TOOLCHAIN_GCC_NDS32),y)
 EXTRA_CXXFLAGS:=	--std=c++03
 endif
 
+ifeq ($(ADK_TOOLCHAIN_GCC_5),y)
+EXTRA_CXXFLAGS:=	-std=gnu++14
+endif
+
 ifeq (${ADK_MAKE_PARALLEL},y)
 GCC_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
 endif