diff options
Diffstat (limited to 'target')
-rw-r--r-- | target/arm/Makefile | 10 | ||||
-rw-r--r-- | target/arm/kernel/banana-pro | 48 | ||||
-rw-r--r-- | target/arm/kernel/solidrun-clearfog | 11 | ||||
-rw-r--r-- | target/config/Config.in.binutils | 6 | ||||
-rw-r--r-- | target/config/Config.in.kernelfmt | 4 | ||||
-rw-r--r-- | target/config/Config.in.libc | 6 | ||||
-rw-r--r-- | target/linux/Config.in.kernelcfg | 4 | ||||
-rw-r--r-- | target/linux/Config.in.kernelversion | 20 | ||||
-rw-r--r-- | target/linux/config/Config.in.block | 33 | ||||
-rw-r--r-- | target/linux/config/Config.in.ethernet | 10 | ||||
-rw-r--r-- | target/linux/config/Config.in.serial | 5 | ||||
-rw-r--r-- | target/linux/config/Config.in.usb | 5 | ||||
-rw-r--r-- | target/linux/patches/4.19.320/arc.patch (renamed from target/linux/patches/4.19.313/arc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.320/arm-nommu.patch (renamed from target/linux/patches/4.19.313/arm-nommu.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.320/darwin-dtc.patch (renamed from target/linux/patches/4.19.313/darwin-dtc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.320/darwin-file2alias.patch (renamed from target/linux/patches/4.19.313/darwin-file2alias.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.320/fec-coldfire.patch (renamed from target/linux/patches/4.19.313/fec-coldfire.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.320/or1k-more-ram.patch (renamed from target/linux/patches/4.19.313/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.320/relocs.patch (renamed from target/linux/patches/4.19.313/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.320/startup.patch (renamed from target/linux/patches/4.19.313/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.320/vdso2.patch (renamed from target/linux/patches/4.19.313/vdso2.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.224/arc.patch (renamed from target/linux/patches/5.10.216/arc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.224/darwin-dtc.patch (renamed from target/linux/patches/5.10.216/darwin-dtc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.224/darwin-file2alias.patch (renamed from target/linux/patches/5.10.216/darwin-file2alias.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.224/dtc-noyaml.patch (renamed from target/linux/patches/5.10.216/dtc-noyaml.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.224/nds32-ag101p.patch (renamed from target/linux/patches/5.10.216/nds32-ag101p.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.224/or1k-more-ram.patch (renamed from target/linux/patches/5.10.216/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.224/relocs.patch (renamed from target/linux/patches/5.10.216/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.224/startup.patch (renamed from target/linux/patches/5.10.216/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.165/darwin-dtc.patch (renamed from target/linux/patches/5.15.158/darwin-dtc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.165/darwin-file2alias.patch (renamed from target/linux/patches/5.15.158/darwin-file2alias.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.165/dtc-noyaml.patch (renamed from target/linux/patches/5.15.158/dtc-noyaml.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.165/enable-ethernet-bpi-m2-plus.patch (renamed from target/linux/patches/5.15.158/enable-ethernet-bpi-m2-plus.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.165/nds32-ag101p.patch (renamed from target/linux/patches/5.15.158/nds32-ag101p.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.165/or1k-more-ram.patch (renamed from target/linux/patches/5.15.158/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.165/relocs.patch (renamed from target/linux/patches/5.15.158/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.165/rockchip-115200.patch (renamed from target/linux/patches/5.15.158/rockchip-115200.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.165/startup.patch (renamed from target/linux/patches/5.15.158/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/arc.patch (renamed from target/linux/patches/5.4.275/arc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/arm-nommu.patch (renamed from target/linux/patches/5.4.275/arm-nommu.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/darwin-dtc.patch (renamed from target/linux/patches/5.4.275/darwin-dtc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/darwin-file2alias.patch (renamed from target/linux/patches/5.4.275/darwin-file2alias.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/dtc-noyaml.patch (renamed from target/linux/patches/5.4.275/dtc-noyaml.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/macsonic.patch (renamed from target/linux/patches/5.4.275/macsonic.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/or1k-more-ram.patch (renamed from target/linux/patches/5.4.275/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/relocs.patch (renamed from target/linux/patches/5.4.275/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/sh4.patch (renamed from target/linux/patches/5.4.275/sh4.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.282/startup.patch (renamed from target/linux/patches/5.4.275/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/armnommu-fix-thread-registers.patch (renamed from target/linux/patches/6.1.90/armnommu-fix-thread-registers.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/armnommu-versatile.patch (renamed from target/linux/patches/6.1.90/armnommu-versatile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/board-rockpi4-0003-arm64-dts-pcie.patch (renamed from target/linux/patches/6.1.90/board-rockpi4-0003-arm64-dts-pcie.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/enable-ethernet-bpi-m2-plus.patch (renamed from target/linux/patches/6.1.90/enable-ethernet-bpi-m2-plus.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/hppa-cross-compile.patch (renamed from target/linux/patches/6.1.90/hppa-cross-compile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/macsonic.patch (renamed from target/linux/patches/6.1.90/macsonic.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/nios2.patch (renamed from target/linux/patches/6.1.90/nios2.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/or1k-more-ram.patch (renamed from target/linux/patches/6.1.90/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/riscv32.patch (renamed from target/linux/patches/6.1.90/riscv32.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/riscv64-flat.patch (renamed from target/linux/patches/6.1.90/riscv64-flat.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/rockchip-115200.patch (renamed from target/linux/patches/6.1.90/rockchip-115200.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.107/rockchip-pcie-timeout.patch (renamed from target/linux/patches/6.1.90/rockchip-pcie-timeout.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.6.43/riscv-flat.patch | 19 | ||||
-rw-r--r-- | target/linux/patches/6.6.56/armnommu-fix-thread-registers.patch (renamed from target/linux/patches/6.6.43/armnommu-fix-thread-registers.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.6.56/armnommu-versatile.patch (renamed from target/linux/patches/6.6.43/armnommu-versatile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.6.56/hppa-cross-compile.patch (renamed from target/linux/patches/6.6.43/hppa-cross-compile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.6.56/macsonic.patch (renamed from target/linux/patches/6.6.43/macsonic.patch) | 0 | ||||
-rw-r--r-- | target/mips/Makefile | 13 | ||||
-rw-r--r-- | target/mips/imgtec-ci20/genimage.cfg | 33 | ||||
-rw-r--r-- | target/mips/systems/imgtec-ci20 | 2 |
68 files changed, 177 insertions, 52 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 255d5c793..280e954b7 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -193,6 +193,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y) VENDOR:=xilinx/ endif +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) +VENDOR:=marvell/ +endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) VENDOR:=st/ endif @@ -202,6 +205,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) VENDOR:=ti/omap/ endif +ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) +VENDOR:=allwinner/ +endif endif dtb-install: @@ -242,7 +248,7 @@ ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) done endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) - ${KERNEL_MAKE} sun7i-a20-bananapro.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)sun7i-a20-bananapro.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y) ${KERNEL_MAKE} sun8i-h2-plus-orangepi-zero.dtb $(MAKE_TRACE) @@ -255,7 +261,7 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) $(VENDOR)imx6dl-hummingboard.dtb $(VENDOR)imx6q-hummingboard.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) - ${KERNEL_MAKE} armada-388-clearfog.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)armada-388-clearfog.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F429),y) ${KERNEL_MAKE} dtbs $(MAKE_TRACE) diff --git a/target/arm/kernel/banana-pro b/target/arm/kernel/banana-pro index e55c93aa7..d3beba2b4 100644 --- a/target/arm/kernel/banana-pro +++ b/target/arm/kernel/banana-pro @@ -1,9 +1,51 @@ CONFIG_ARM=y CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y CONFIG_KUSER_HELPERS=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DW=y +CONFIG_ATAGS=y +CONFIG_PINCTRL=y +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +CONFIG_PINCTRL_SUNXI=y +CONFIG_PINCTRL_SUN4I_A10=y +CONFIG_PINCTRL_SUN5I=y +CONFIG_PINCTRL_SUN6I_A31=y +CONFIG_PINCTRL_SUN6I_A31_R=y +CONFIG_PINCTRL_SUN8I_A23=y +CONFIG_PINCTRL_SUN8I_A33=y +CONFIG_PINCTRL_SUN8I_A83T=y +CONFIG_PINCTRL_SUN8I_A83T_R=y +CONFIG_PINCTRL_SUN8I_A23_R=y +CONFIG_PINCTRL_SUN8I_H3=y +CONFIG_PINCTRL_SUN8I_H3_R=y +CONFIG_PINCTRL_SUN8I_V3S=y +CONFIG_PINCTRL_SUN9I_A80=y +CONFIG_PINCTRL_SUN9I_A80_R=y +CONFIG_PINCTRL_SUN20I_D1=y +CONFIG_COMMON_CLK=y +CONFIG_CLK_SUNXI=y +CONFIG_CLK_SUNXI_CLOCKS=y +CONFIG_CLK_SUNXI_PRCM_SUN6I=y +CONFIG_CLK_SUNXI_PRCM_SUN8I=y +CONFIG_CLK_SUNXI_PRCM_SUN9I=y +CONFIG_SUNXI_CCU=y +CONFIG_SUN20I_D1_CCU=y +CONFIG_SUN20I_D1_R_CCU=y +CONFIG_SUN4I_A10_CCU=y +CONFIG_SUN5I_CCU=y +CONFIG_SUN6I_A31_CCU=y +CONFIG_SUN6I_RTC_CCU=y +CONFIG_SUN8I_A23_CCU=y +CONFIG_SUN8I_A33_CCU=y +CONFIG_SUN8I_A83T_CCU=y +CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_V3S_CCU=y +CONFIG_SUN8I_DE2_CCU=y +CONFIG_SUN8I_R40_CCU=y +CONFIG_SUN9I_A80_CCU=y +CONFIG_SUN8I_R_CCU=y diff --git a/target/arm/kernel/solidrun-clearfog b/target/arm/kernel/solidrun-clearfog index 431536dff..b75cf2c6d 100644 --- a/target/arm/kernel/solidrun-clearfog +++ b/target/arm/kernel/solidrun-clearfog @@ -1,9 +1,12 @@ CONFIG_ARM=y CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MVEBU=y -CONFIG_MACH_ARMADA_370=y -CONFIG_MACH_ARMADA_375=y -CONFIG_MACH_ARMADA_380=y -CONFIG_MACH_ARMADA_XP=y +CONFIG_MACH_MVEBU_ANY=y +CONFIG_MACH_MVEBU_V7=y +CONFIG_MACH_ARMADA_38X=y +CONFIG_KUSER_HELPERS=y +CONFIG_ATAGS=y CONFIG_PCI_MVEBU=y diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index 7a7d2ff82..75b43639a 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -8,12 +8,16 @@ default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_CPU_ARC_ARC64 default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32 -default ADK_TOOLCHAIN_BINUTILS_2_42 +default ADK_TOOLCHAIN_BINUTILS_2_43_1 config ADK_TOOLCHAIN_BINUTILS_GIT bool "git" depends on !ADK_TARGET_ARCH_AVR32 +config ADK_TOOLCHAIN_BINUTILS_2_43_1 + bool "2.43.1" + depends on !ADK_TARGET_ARCH_AVR32 + config ADK_TOOLCHAIN_BINUTILS_2_42 bool "2.42" depends on !ADK_TARGET_ARCH_AVR32 diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt index 23d800d24..2a1fb1e9f 100644 --- a/target/config/Config.in.kernelfmt +++ b/target/config/Config.in.kernelfmt @@ -19,6 +19,9 @@ config ADK_TARGET_KERNEL_UIMAGE config ADK_TARGET_KERNEL_UIMAGEBIN bool +config ADK_TARGET_KERNEL_UIMAGEGZ + bool + config ADK_TARGET_KERNEL_BZIMAGE bool @@ -54,6 +57,7 @@ config ADK_TARGET_KERNEL default "loader" if ADK_TARGET_KERNEL_LOADER default "uImage" if ADK_TARGET_KERNEL_UIMAGE default "uImage.bin" if ADK_TARGET_KERNEL_UIMAGEBIN + default "uImage.gz" if ADK_TARGET_KERNEL_UIMAGEGZ default "zImage" if ADK_TARGET_KERNEL_ZIMAGE default "Image" if ADK_TARGET_KERNEL_IMAGE default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 1c352c608..aff202edf 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -150,8 +150,8 @@ choice prompt "Target C library version" depends on !ADK_TARGET_CHOOSE_ARCH -config ADK_TARGET_LIB_UCLIBC_NG_1_0_49 - bool "1.0.49" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_50 + bool "1.0.50" depends on ADK_TARGET_LIB_UCLIBC_NG config ADK_TARGET_LIB_UCLIBC_NG_GIT @@ -200,7 +200,7 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string - default "1.0.49" if ADK_TARGET_LIB_UCLIBC_NG_1_0_49 + default "1.0.50" if ADK_TARGET_LIB_UCLIBC_NG_1_0_50 default "1.2.5" if ADK_TARGET_LIB_MUSL_1_2_5 default "2.40" if ADK_TARGET_LIB_GLIBC_2_40 default "4.4.0" if ADK_TARGET_LIB_NEWLIB_4_4_0 diff --git a/target/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg index 87a832a18..6817795e7 100644 --- a/target/linux/Config.in.kernelcfg +++ b/target/linux/Config.in.kernelcfg @@ -38,7 +38,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "twr-k70f120m_defconfig" if ADK_TARGET_SYSTEM_KINETIS_K70 default "imx_v7_cbi_hb_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_TARGET_LINUX_KERNEL_VERSION_GIT default "imx_v6_v7_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "mvebu_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default "mvebu_v7_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default "nsim_700_defconfig" if ADK_TARGET_CPU_ARC_ARC700 && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM default "haps_hs_defconfig" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM default "10m50_defconfig" if ADK_TARGET_SYSTEM_QEMU_NIOS2 @@ -49,6 +49,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "j2_defconfig" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 default "sunxi_defconfig" if ADK_TARGET_SYSTEM_ORANGE_PI0 default "sunxi_defconfig" if ADK_TARGET_SYSTEM_BANANA_P2_ZERO + default "sunxi_defconfig" if ADK_TARGET_SYSTEM_BANANA_PRO default "edosk2674_defconfig" if ADK_TARGET_SYSTEM_HITACHI_EDOSK2674 default "x86_64_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86_64 default "i386_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86 @@ -66,6 +67,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "haps_arc64_defconfig" if ADK_TARGET_CPU_ARC_ARC64 default "m5208evb_defconfig" if ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 default "default_defconfig" if ADK_TARGET_ARCH_KVX + default "ci20_defconfig" if ADK_TARGET_SYSTEM_IMGTEC_CI20 default "" config ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 89876f731..0754084ec 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -39,8 +39,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK -config ADK_TARGET_LINUX_KERNEL_VERSION_6_9 - bool "6.9.3" +config ADK_TARGET_LINUX_KERNEL_VERSION_6_11 + bool "6.11.3" 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_9 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_6 - bool "6.6.43" + bool "6.6.56" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -62,7 +62,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_6 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_1 - bool "6.1.90" + bool "6.1.107" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -73,7 +73,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_1 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_5_15 - bool "5.15.158" + bool "5.15.165" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -83,7 +83,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.216" + bool "5.10.224" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -94,7 +94,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_10 depends on !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 - bool "5.4.275" + bool "5.4.282" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -104,7 +104,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 depends on !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 - bool "4.19.313" + bool "4.19.320" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -246,7 +246,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT default "f6e9dab9d1dc1e8fa2acb75504bf5ff86b885b8e" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 default "b02c139d3608c8ae87f5398a3a29854f6df7a041" if ADK_TARGET_ARCH_KVX default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 - default "d5066442e39dd9bf4ba6431ffb3f99e3d5085d3f" if ADK_TARGET_BOARD_BCM28XX + default "ba0f2212e0e100ee16bdde76b7efca6bb8ee9446" if ADK_TARGET_BOARD_BCM28XX default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537 default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70 default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG @@ -258,8 +258,8 @@ config ADK_TARGET_LINUX_KERNEL_GIT config ADK_TARGET_LINUX_KERNEL_GIT_VER string "kernel version" depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT + default "6.6.47" if ADK_TARGET_BOARD_BCM28XX default "5.16" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 - default "6.1.70" if ADK_TARGET_BOARD_BCM28XX default "5.10.110" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "6.6.32" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index a287c05cf..59fffad68 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -154,6 +154,12 @@ config ADK_LINUX_KERNEL_MMC_SDHCI_IPROC config ADK_LINUX_KERNEL_MMC_SDHCI_BRCMSTB bool +config ADK_LINUX_KERNEL_MMC_SDHCI_DOVE + bool + +config ADK_LINUX_KERNEL_MMC_SDHCI_PXAV3 + bool + config ADK_LINUX_KERNEL_MMC_BCM2835_MMC bool @@ -483,6 +489,33 @@ config ADK_LINUX_KERNEL_MMC_BCM2835_MMC default y if ADK_TARGET_BOARD_BCM28XX default n +config ADK_LINUX_KERNEL_MMC_MVSDIO + bool "SD card support for Soidrun Clearfog" + select ADK_LINUX_KERNEL_BLOCK + select ADK_LINUX_KERNEL_LBDAF + select ADK_LINUX_KERNEL_SCSI + select ADK_LINUX_KERNEL_SCSI_DMA + select ADK_LINUX_KERNEL_SCSI_MULTI_LUN + select ADK_LINUX_KERNEL_SCSI_CONSTANTS + select ADK_LINUX_KERNEL_SCSI_LOGGING + select ADK_LINUX_KERNEL_SCSI_SCAN_ASYNC + select ADK_LINUX_KERNEL_MMC + select ADK_LINUX_KERNEL_MMC_BLOCK + select ADK_LINUX_KERNEL_MMC_BLOCK_BOUNCE + select ADK_LINUX_KERNEL_BLK_DEV + select ADK_LINUX_KERNEL_BLK_DEV_SD + select ADK_LINUX_KERNEL_BLK_DEV_BSG + select ADK_LINUX_KERNEL_BLK_DEV_BSGLIB + select ADK_LINUX_KERNEL_MMC_SDHCI + select ADK_LINUX_KERNEL_MMC_SDHCI_IO_ACCESSORS + select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM + select ADK_LINUX_KERNEL_MMC_SDHCI_DOVE + select ADK_LINUX_KERNEL_MMC_SDHCI_PXAV3 + select ADK_LINUX_KERNEL_MMC_UNSAFE_RESUME + depends on ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default n + config ADK_LINUX_KERNEL_MMC_SDHCI_ESDHC_IMX bool "SD card support for IMX6 boards" select ADK_LINUX_KERNEL_BLOCK diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index ec58b3069..7c3a617ed 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -451,6 +451,16 @@ config ADK_LINUX_KERNEL_MACB also supports the Cadence GEM (Gigabit Ethernet MAC found in some ARM SoC devices). +config ADK_LINUX_KERNEL_MVNETA + tristate "Marvell Ethernet driver for Solidrun Clearfog" + select ADK_LINUX_KERNEL_NETDEV_1000 + select ADK_LINUX_KERNEL_NET_VENDOR_MARVELL + depends on ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default n + help + Marvell Ethernet driver + config ADK_LINUX_KERNEL_TI_DAVINCI_MDIO tristate "BeagleBone Back Davinci" select ADK_LINUX_KERNEL_NET_VENDOR_TI diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index c22746371..39470b7f7 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -127,6 +127,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_QEMU_ARC select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_ROCKPI4_PLUS select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 + select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_BANANA_PRO select ADK_LINUX_KERNEL_SERIAL_8250_EXTENDED if ADK_TARGET_SYSTEM_VISIONFIVE2 select ADK_LINUX_KERNEL_SERIAL_8250_DMA if ADK_TARGET_SYSTEM_ORANGE_PI0 select ADK_LINUX_KERNEL_SERIAL_8250_INGENIC if ADK_TARGET_SYSTEM_IMGTEC_CI20 @@ -171,7 +172,8 @@ config ADK_LINUX_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_RASPBERRY_PI4 \ || ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 \ || ADK_TARGET_SYSTEM_ROCKPI4_PLUS \ - || ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 + || ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 \ + || ADK_TARGET_SYSTEM_BANANA_PRO default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7 default y if ADK_TARGET_SYSTEM_IMGTEC_CI20 default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 @@ -208,6 +210,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default y if ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 + default y if ADK_TARGET_SYSTEM_BANANA_PRO default n help Serial driver for 8250 UART chip. diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 07e097bc1..157c2f222 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -60,6 +60,9 @@ config ADK_LINUX_KERNEL_USB_EHCI_HCD_PCI config ADK_LINUX_KERNEL_USB_XHCI_PCI bool +config ADK_LINUX_KERNEL_USB_XHCI_MVEBU + bool + config ADK_LINUX_KERNEL_USB_LIBUSUAL tristate @@ -123,8 +126,10 @@ config ADK_LINUX_KERNEL_USB_XHCI_HCD select ADK_LINUX_KERNEL_USB_PCI select ADK_LINUX_KERNEL_USB_XHCI_PLATFORM select ADK_LINUX_KERNEL_USB_XHCI_PCI + select ADK_LINUX_KERNEL_USB_XHCI_MVEBU 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_SOLIDRUN_CLEARFOG default n help The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 diff --git a/target/linux/patches/4.19.313/arc.patch b/target/linux/patches/4.19.320/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/4.19.313/arc.patch +++ b/target/linux/patches/4.19.320/arc.patch diff --git a/target/linux/patches/4.19.313/arm-nommu.patch b/target/linux/patches/4.19.320/arm-nommu.patch index d23d3f4eb..d23d3f4eb 100644 --- a/target/linux/patches/4.19.313/arm-nommu.patch +++ b/target/linux/patches/4.19.320/arm-nommu.patch diff --git a/target/linux/patches/4.19.313/darwin-dtc.patch b/target/linux/patches/4.19.320/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/4.19.313/darwin-dtc.patch +++ b/target/linux/patches/4.19.320/darwin-dtc.patch diff --git a/target/linux/patches/4.19.313/darwin-file2alias.patch b/target/linux/patches/4.19.320/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/4.19.313/darwin-file2alias.patch +++ b/target/linux/patches/4.19.320/darwin-file2alias.patch diff --git a/target/linux/patches/4.19.313/fec-coldfire.patch b/target/linux/patches/4.19.320/fec-coldfire.patch index 09d8ad047..09d8ad047 100644 --- a/target/linux/patches/4.19.313/fec-coldfire.patch +++ b/target/linux/patches/4.19.320/fec-coldfire.patch diff --git a/target/linux/patches/4.19.313/or1k-more-ram.patch b/target/linux/patches/4.19.320/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/4.19.313/or1k-more-ram.patch +++ b/target/linux/patches/4.19.320/or1k-more-ram.patch diff --git a/target/linux/patches/4.19.313/relocs.patch b/target/linux/patches/4.19.320/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/4.19.313/relocs.patch +++ b/target/linux/patches/4.19.320/relocs.patch diff --git a/target/linux/patches/4.19.313/startup.patch b/target/linux/patches/4.19.320/startup.patch index 4f42e84a7..4f42e84a7 100644 --- a/target/linux/patches/4.19.313/startup.patch +++ b/target/linux/patches/4.19.320/startup.patch diff --git a/target/linux/patches/4.19.313/vdso2.patch b/target/linux/patches/4.19.320/vdso2.patch index 3d9d47ede..3d9d47ede 100644 --- a/target/linux/patches/4.19.313/vdso2.patch +++ b/target/linux/patches/4.19.320/vdso2.patch diff --git a/target/linux/patches/5.10.216/arc.patch b/target/linux/patches/5.10.224/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/5.10.216/arc.patch +++ b/target/linux/patches/5.10.224/arc.patch diff --git a/target/linux/patches/5.10.216/darwin-dtc.patch b/target/linux/patches/5.10.224/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.10.216/darwin-dtc.patch +++ b/target/linux/patches/5.10.224/darwin-dtc.patch diff --git a/target/linux/patches/5.10.216/darwin-file2alias.patch b/target/linux/patches/5.10.224/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/5.10.216/darwin-file2alias.patch +++ b/target/linux/patches/5.10.224/darwin-file2alias.patch diff --git a/target/linux/patches/5.10.216/dtc-noyaml.patch b/target/linux/patches/5.10.224/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.10.216/dtc-noyaml.patch +++ b/target/linux/patches/5.10.224/dtc-noyaml.patch diff --git a/target/linux/patches/5.10.216/nds32-ag101p.patch b/target/linux/patches/5.10.224/nds32-ag101p.patch index a8beea478..a8beea478 100644 --- a/target/linux/patches/5.10.216/nds32-ag101p.patch +++ b/target/linux/patches/5.10.224/nds32-ag101p.patch diff --git a/target/linux/patches/5.10.216/or1k-more-ram.patch b/target/linux/patches/5.10.224/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/5.10.216/or1k-more-ram.patch +++ b/target/linux/patches/5.10.224/or1k-more-ram.patch diff --git a/target/linux/patches/5.10.216/relocs.patch b/target/linux/patches/5.10.224/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.10.216/relocs.patch +++ b/target/linux/patches/5.10.224/relocs.patch diff --git a/target/linux/patches/5.10.216/startup.patch b/target/linux/patches/5.10.224/startup.patch index eef481021..eef481021 100644 --- a/target/linux/patches/5.10.216/startup.patch +++ b/target/linux/patches/5.10.224/startup.patch diff --git a/target/linux/patches/5.15.158/darwin-dtc.patch b/target/linux/patches/5.15.165/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.15.158/darwin-dtc.patch +++ b/target/linux/patches/5.15.165/darwin-dtc.patch diff --git a/target/linux/patches/5.15.158/darwin-file2alias.patch b/target/linux/patches/5.15.165/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/5.15.158/darwin-file2alias.patch +++ b/target/linux/patches/5.15.165/darwin-file2alias.patch diff --git a/target/linux/patches/5.15.158/dtc-noyaml.patch b/target/linux/patches/5.15.165/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.15.158/dtc-noyaml.patch +++ b/target/linux/patches/5.15.165/dtc-noyaml.patch diff --git a/target/linux/patches/5.15.158/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/5.15.165/enable-ethernet-bpi-m2-plus.patch index 7e9abd9ce..7e9abd9ce 100644 --- a/target/linux/patches/5.15.158/enable-ethernet-bpi-m2-plus.patch +++ b/target/linux/patches/5.15.165/enable-ethernet-bpi-m2-plus.patch diff --git a/target/linux/patches/5.15.158/nds32-ag101p.patch b/target/linux/patches/5.15.165/nds32-ag101p.patch index a8beea478..a8beea478 100644 --- a/target/linux/patches/5.15.158/nds32-ag101p.patch +++ b/target/linux/patches/5.15.165/nds32-ag101p.patch diff --git a/target/linux/patches/5.15.158/or1k-more-ram.patch b/target/linux/patches/5.15.165/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/5.15.158/or1k-more-ram.patch +++ b/target/linux/patches/5.15.165/or1k-more-ram.patch diff --git a/target/linux/patches/5.15.158/relocs.patch b/target/linux/patches/5.15.165/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.15.158/relocs.patch +++ b/target/linux/patches/5.15.165/relocs.patch diff --git a/target/linux/patches/5.15.158/rockchip-115200.patch b/target/linux/patches/5.15.165/rockchip-115200.patch index ad8a2d7a7..ad8a2d7a7 100644 --- a/target/linux/patches/5.15.158/rockchip-115200.patch +++ b/target/linux/patches/5.15.165/rockchip-115200.patch diff --git a/target/linux/patches/5.15.158/startup.patch b/target/linux/patches/5.15.165/startup.patch index eef481021..eef481021 100644 --- a/target/linux/patches/5.15.158/startup.patch +++ b/target/linux/patches/5.15.165/startup.patch diff --git a/target/linux/patches/5.4.275/arc.patch b/target/linux/patches/5.4.282/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/5.4.275/arc.patch +++ b/target/linux/patches/5.4.282/arc.patch diff --git a/target/linux/patches/5.4.275/arm-nommu.patch b/target/linux/patches/5.4.282/arm-nommu.patch index fdcec3f09..fdcec3f09 100644 --- a/target/linux/patches/5.4.275/arm-nommu.patch +++ b/target/linux/patches/5.4.282/arm-nommu.patch diff --git a/target/linux/patches/5.4.275/darwin-dtc.patch b/target/linux/patches/5.4.282/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.4.275/darwin-dtc.patch +++ b/target/linux/patches/5.4.282/darwin-dtc.patch diff --git a/target/linux/patches/5.4.275/darwin-file2alias.patch b/target/linux/patches/5.4.282/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/5.4.275/darwin-file2alias.patch +++ b/target/linux/patches/5.4.282/darwin-file2alias.patch diff --git a/target/linux/patches/5.4.275/dtc-noyaml.patch b/target/linux/patches/5.4.282/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.4.275/dtc-noyaml.patch +++ b/target/linux/patches/5.4.282/dtc-noyaml.patch diff --git a/target/linux/patches/5.4.275/macsonic.patch b/target/linux/patches/5.4.282/macsonic.patch index 75a6fcad2..75a6fcad2 100644 --- a/target/linux/patches/5.4.275/macsonic.patch +++ b/target/linux/patches/5.4.282/macsonic.patch diff --git a/target/linux/patches/5.4.275/or1k-more-ram.patch b/target/linux/patches/5.4.282/or1k-more-ram.patch index 540dc43b5..540dc43b5 100644 --- a/target/linux/patches/5.4.275/or1k-more-ram.patch +++ b/target/linux/patches/5.4.282/or1k-more-ram.patch diff --git a/target/linux/patches/5.4.275/relocs.patch b/target/linux/patches/5.4.282/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.4.275/relocs.patch +++ b/target/linux/patches/5.4.282/relocs.patch diff --git a/target/linux/patches/5.4.275/sh4.patch b/target/linux/patches/5.4.282/sh4.patch index 8ae79d49d..8ae79d49d 100644 --- a/target/linux/patches/5.4.275/sh4.patch +++ b/target/linux/patches/5.4.282/sh4.patch diff --git a/target/linux/patches/5.4.275/startup.patch b/target/linux/patches/5.4.282/startup.patch index 081aa103a..081aa103a 100644 --- a/target/linux/patches/5.4.275/startup.patch +++ b/target/linux/patches/5.4.282/startup.patch diff --git a/target/linux/patches/6.1.90/armnommu-fix-thread-registers.patch b/target/linux/patches/6.1.107/armnommu-fix-thread-registers.patch index 8ab2196dc..8ab2196dc 100644 --- a/target/linux/patches/6.1.90/armnommu-fix-thread-registers.patch +++ b/target/linux/patches/6.1.107/armnommu-fix-thread-registers.patch diff --git a/target/linux/patches/6.1.90/armnommu-versatile.patch b/target/linux/patches/6.1.107/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.1.90/armnommu-versatile.patch +++ b/target/linux/patches/6.1.107/armnommu-versatile.patch diff --git a/target/linux/patches/6.1.90/board-rockpi4-0003-arm64-dts-pcie.patch b/target/linux/patches/6.1.107/board-rockpi4-0003-arm64-dts-pcie.patch index 1777e7a86..1777e7a86 100644 --- a/target/linux/patches/6.1.90/board-rockpi4-0003-arm64-dts-pcie.patch +++ b/target/linux/patches/6.1.107/board-rockpi4-0003-arm64-dts-pcie.patch diff --git a/target/linux/patches/6.1.90/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/6.1.107/enable-ethernet-bpi-m2-plus.patch index 7e9abd9ce..7e9abd9ce 100644 --- a/target/linux/patches/6.1.90/enable-ethernet-bpi-m2-plus.patch +++ b/target/linux/patches/6.1.107/enable-ethernet-bpi-m2-plus.patch diff --git a/target/linux/patches/6.1.90/hppa-cross-compile.patch b/target/linux/patches/6.1.107/hppa-cross-compile.patch index 5400e87a0..5400e87a0 100644 --- a/target/linux/patches/6.1.90/hppa-cross-compile.patch +++ b/target/linux/patches/6.1.107/hppa-cross-compile.patch diff --git a/target/linux/patches/6.1.90/macsonic.patch b/target/linux/patches/6.1.107/macsonic.patch index 177397221..177397221 100644 --- a/target/linux/patches/6.1.90/macsonic.patch +++ b/target/linux/patches/6.1.107/macsonic.patch diff --git a/target/linux/patches/6.1.90/nios2.patch b/target/linux/patches/6.1.107/nios2.patch index 43631971e..43631971e 100644 --- a/target/linux/patches/6.1.90/nios2.patch +++ b/target/linux/patches/6.1.107/nios2.patch diff --git a/target/linux/patches/6.1.90/or1k-more-ram.patch b/target/linux/patches/6.1.107/or1k-more-ram.patch index 6397f8445..6397f8445 100644 --- a/target/linux/patches/6.1.90/or1k-more-ram.patch +++ b/target/linux/patches/6.1.107/or1k-more-ram.patch diff --git a/target/linux/patches/6.1.90/riscv32.patch b/target/linux/patches/6.1.107/riscv32.patch index 648b0de4d..648b0de4d 100644 --- a/target/linux/patches/6.1.90/riscv32.patch +++ b/target/linux/patches/6.1.107/riscv32.patch diff --git a/target/linux/patches/6.1.90/riscv64-flat.patch b/target/linux/patches/6.1.107/riscv64-flat.patch index ee70ea915..ee70ea915 100644 --- a/target/linux/patches/6.1.90/riscv64-flat.patch +++ b/target/linux/patches/6.1.107/riscv64-flat.patch diff --git a/target/linux/patches/6.1.90/rockchip-115200.patch b/target/linux/patches/6.1.107/rockchip-115200.patch index ad8a2d7a7..ad8a2d7a7 100644 --- a/target/linux/patches/6.1.90/rockchip-115200.patch +++ b/target/linux/patches/6.1.107/rockchip-115200.patch diff --git a/target/linux/patches/6.1.90/rockchip-pcie-timeout.patch b/target/linux/patches/6.1.107/rockchip-pcie-timeout.patch index 2ef7df2da..2ef7df2da 100644 --- a/target/linux/patches/6.1.90/rockchip-pcie-timeout.patch +++ b/target/linux/patches/6.1.107/rockchip-pcie-timeout.patch diff --git a/target/linux/patches/6.6.43/riscv-flat.patch b/target/linux/patches/6.6.43/riscv-flat.patch deleted file mode 100644 index 6d26c638f..000000000 --- a/target/linux/patches/6.6.43/riscv-flat.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur linux-6.6.22.orig/fs/binfmt_flat.c linux-6.6.22/fs/binfmt_flat.c ---- linux-6.6.22.orig/fs/binfmt_flat.c 2024-03-15 19:25:07.000000000 +0100 -+++ linux-6.6.22/fs/binfmt_flat.c 2024-04-17 15:41:29.292461687 +0200 -@@ -879,6 +879,7 @@ - if (res < 0) - return res; - -+#ifndef CONFIG_BINFMT_FLAT_NO_DATA_START_OFFSET - /* Update data segment pointers for all libraries */ - for (i = 0; i < MAX_SHARED_LIBS; i++) { - if (!libinfo.lib_list[i].loaded) -@@ -893,6 +894,7 @@ - return -EFAULT; - } - } -+#endif - - set_binfmt(&flat_format); - diff --git a/target/linux/patches/6.6.43/armnommu-fix-thread-registers.patch b/target/linux/patches/6.6.56/armnommu-fix-thread-registers.patch index 8ab2196dc..8ab2196dc 100644 --- a/target/linux/patches/6.6.43/armnommu-fix-thread-registers.patch +++ b/target/linux/patches/6.6.56/armnommu-fix-thread-registers.patch diff --git a/target/linux/patches/6.6.43/armnommu-versatile.patch b/target/linux/patches/6.6.56/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.6.43/armnommu-versatile.patch +++ b/target/linux/patches/6.6.56/armnommu-versatile.patch diff --git a/target/linux/patches/6.6.43/hppa-cross-compile.patch b/target/linux/patches/6.6.56/hppa-cross-compile.patch index 51c24fff2..51c24fff2 100644 --- a/target/linux/patches/6.6.43/hppa-cross-compile.patch +++ b/target/linux/patches/6.6.56/hppa-cross-compile.patch diff --git a/target/linux/patches/6.6.43/macsonic.patch b/target/linux/patches/6.6.56/macsonic.patch index 51e76113b..51e76113b 100644 --- a/target/linux/patches/6.6.43/macsonic.patch +++ b/target/linux/patches/6.6.56/macsonic.patch diff --git a/target/mips/Makefile b/target/mips/Makefile index db66205bd..2255ffa42 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -9,6 +9,9 @@ KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) ifeq ($(ADK_TARGET_KERNEL_UIMAGE),y) KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage endif +ifeq ($(ADK_TARGET_KERNEL_UIMAGEGZ),y) +KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage.gz +endif OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id @@ -76,12 +79,12 @@ targethelp: endif ifeq ($(ADK_TARGET_FS),genimage) targethelp: - @echo "The disk image is: $(FW_DIR)/disk.img" + @echo "The disk image is: $(FW_DIR)/sdcard.img" ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img' else @echo "Use following command to install it on SD card:" - @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k' + @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k' endif endif ifeq ($(ADK_TARGET_FS),ubifs) @@ -90,13 +93,9 @@ targethelp: @echo 'The UBI image is: ${FW_DIR}/${ROOTFSUBIFS}' endif -# image creation and kernel install +# dummy kernel-strip: -ifeq ($(ADK_TARGET_KERNEL_UIMAGE),) - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) -else @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) -endif kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} diff --git a/target/mips/imgtec-ci20/genimage.cfg b/target/mips/imgtec-ci20/genimage.cfg new file mode 100644 index 000000000..8b55766ec --- /dev/null +++ b/target/mips/imgtec-ci20/genimage.cfg @@ -0,0 +1,33 @@ +image sdcard.img { + hdimage { + } + + partition uboot-spl { + in-partition-table = "no" + image = "u-boot-spl.bin" + offset = 512 + } + + partition uboot { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 14K + } + + partition uboot-env { + in-partition-table = "no" + image = "uboot-env.bin" + offset = 526K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext" + offset = 2M + } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } +} diff --git a/target/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20 index 82ea79683..bd2f750d1 100644 --- a/target/mips/systems/imgtec-ci20 +++ b/target/mips/systems/imgtec-ci20 @@ -10,7 +10,7 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20 select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_WITH_COMPRESSION - select ADK_TARGET_KERNEL_UIMAGE + select ADK_TARGET_KERNEL_UIMAGEGZ select ADK_PACKAGE_U_BOOT select ADK_HOST_BUILD_U_BOOT help |