him411/gl-infra-builder-FUjr
1
0
Fork 0
mirror of https://github.com/FUjr/gl-infra-builder.git synced 2025-12-16 17:15:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

22.03.2:support mv1000

Browse Source
This commit is contained in:
Weiping Yang 2023-02-27 01:50:38 -05:00
parent fabbd4f0ab
commit 2432dcfb41
11 changed files with 5808 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches-22.03.2/0031-modify-image-rootfs-size-to-512M.patch Normal file
View File

@ -0,0 +1,25 @@
From d9a02dfb7e3589f813ccb9f0508af2111db81f6d Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Sun, 26 Feb 2023 23:29:38 -0500
Subject: [PATCH] modify image rootfs size to 512M
---
config/Config-images.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/Config-images.in b/config/Config-images.in
index dcd7575c3e..b676e0f018 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -297,7 +297,7 @@ menu "Target Images"
config TARGET_ROOTFS_PARTSIZE
int "Root filesystem partition size (in MiB)"
depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS
- default 104
+ default 512
help
Select the root filesystem partition size.
--
2.17.1

26
patches-22.03.2/1001-add-mv1000-uboot-envtools-partition.patch Normal file
View File

@ -0,0 +1,26 @@
From 25f925b53c5c772a125b89b373b04a3e982ec422 Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Sun, 26 Feb 2023 23:31:47 -0500
Subject: [PATCH] add mv1000 uboot-envtools
---
package/boot/uboot-envtools/files/mvebu | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu
index cffd396ae1..757b69779b 100644
--- a/package/boot/uboot-envtools/files/mvebu
+++ b/package/boot/uboot-envtools/files/mvebu
@@ -26,7 +26,8 @@ cznic,turris-omnia)
ubootenv_add_uci_config "/dev/mtd0" "0xf0000" "0x10000" "0x10000"
fi
;;
-glinet,gl-mv1000)
+glinet,gl-mv1000|\
+gl-mv1000)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x8000" "1"
;;
globalscale,espressobin|\
--
2.17.1

25
patches-22.03.2/1002-adapt-to-mv1000-usb-devise.patch Normal file
View File

@ -0,0 +1,25 @@
From b8b39a3904c5b686b3ff3b5808459d608f46aec5 Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Mon, 27 Feb 2023 01:22:07 -0500
Subject: [PATCH] adapt-to-mv1000-usb-devise
---
package/kernel/linux/modules/usb.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 1fc3541f10..763b6fced3 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -169,7 +169,7 @@ define KernelPackage/usb-gadget-eth
$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm_subset.ko \
$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko \
$(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko
- AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm)
+ AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
$(call AddDepends/usb)
endef
--
2.17.1

37
patches-22.03.2/3005-mvebu-adjust-01-leds.patch Normal file
View File

@ -0,0 +1,37 @@
From 1592185f17d4f13518d95a24b9289aab374540af Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Sat, 25 Feb 2023 04:16:01 -0500
Subject: [PATCH] mvebu-adjust-01-leds
---
.../linux/mvebu/cortexa53/base-files/etc/board.d/01_leds | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
mode change 100644 => 100755 target/linux/mvebu/cortexa53/base-files/etc/board.d/01_leds
diff --git a/target/linux/mvebu/cortexa53/base-files/etc/board.d/01_leds b/target/linux/mvebu/cortexa53/base-files/etc/board.d/01_leds
old mode 100644
new mode 100755
index 4dce204f14..0f7b53a8dd
--- a/target/linux/mvebu/cortexa53/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/cortexa53/base-files/etc/board.d/01_leds
@@ -1,3 +1,5 @@
+#!/bin/sh
+#
# SPDX-License-Identifier: GPL-2.0-only
. /lib/functions/uci-defaults.sh
@@ -7,8 +9,9 @@ board_config_update
board=$(board_name)
case "$board" in
-glinet,gl-mv1000)
- ucidef_set_led_netdev "wan" "WAN" "green:wan" "wan"
+glinet,gl-mv1000|\
+gl-mv1000)
+ ucidef_set_led_netdev "wan" "WAN" "gl-mv1000:white:wan" "wan"
;;
esac
--
2.17.1

72
patches-22.03.2/3006-mvebu-adjust-02_network.patch Normal file
View File

@ -0,0 +1,72 @@
From a70578eadae572187daab68d6e7318f10daeb140 Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Sun, 26 Feb 2023 22:44:41 -0500
Subject: [PATCH] mvebu-adjust-02_network
---
.../base-files/etc/board.d/02_network | 25 ++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
mode change 100644 => 100755 target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network
diff --git a/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network
old mode 100644
new mode 100755
index 7da9de58c7..441fc286e8
--- a/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network
@@ -1,9 +1,12 @@
+#!/bin/sh
#
# Copyright (C) 2014-2016 OpenWrt.org
# Copyright (C) 2016 LEDE-Project.org
#
+. /lib/functions.sh
. /lib/functions/uci-defaults.sh
+. /lib/functions/system.sh
board_config_update
@@ -11,11 +14,12 @@ board=$(board_name)
case "$board" in
glinet,gl-mv1000|\
+gl-mv1000|\
globalscale,espressobin|\
globalscale,espressobin-emmc|\
globalscale,espressobin-v7|\
globalscale,espressobin-v7-emmc)
- ucidef_set_interfaces_lan_wan "lan0 lan1" "wan"
+ ucidef_set_interfaces_lan_wan "lan0 lan1 usb0" "wan"
;;
globalscale,espressobin-ultra)
ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" "wan"
@@ -29,6 +33,25 @@ methode,udpu)
;;
esac
+mvebu_setup_macs()
+{
+ local board="$1"
+ local lan_mac=""
+ local wan_mac=""
+
+ case "$board" in
+ glinet,gl-mv1000|\
+ gl-mv1000)
+ wan_mac=$(mtd_get_mac_binary "factory" 0)
+ lan_mac=$(macaddr_add "$wan_mac" 1)
+ ;;
+ esac
+
+ [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
+ [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
+}
+
+mvebu_setup_macs $board
board_config_flush
exit 0
--
2.17.1

500
patches-22.03.2/3007-mvebu-adjust-usb-devise.patch Normal file
View File

@ -0,0 +1,500 @@
From 1aa3f596fc06cfcf302e3c4aa718447abc958196 Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Mon, 27 Feb 2023 01:28:15 -0500
Subject: [PATCH] mvebu-adjust-usb-devise
---
target/linux/mvebu/Makefile | 2 +-
target/linux/mvebu/config-5.10 | 223 +++++++++++++--------------------
2 files changed, 86 insertions(+), 139 deletions(-)
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index ce43c8652d..4b17f74e5d 100644
--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
BOARD:=mvebu
BOARDNAME:=Marvell EBU Armada
-FEATURES:=fpu usb pci pcie gpio nand squashfs ramdisk boot-part rootfs-part legacy-sdcard targz
+FEATURES:=fpu usb pci pcie gpio nand squashfs ramdisk boot-part rootfs-part legacy-sdcard targz usbgadget
SUBTARGETS:=cortexa9 cortexa53 cortexa72
KERNEL_PATCHVER:=5.10
diff --git a/target/linux/mvebu/config-5.10 b/target/linux/mvebu/config-5.10
index 0bce22daee..46ec8b1d26 100644
--- a/target/linux/mvebu/config-5.10
+++ b/target/linux/mvebu/config-5.10
@@ -1,81 +1,63 @@
+CONFIG_64BIT=y
CONFIG_AHCI_MVEBU=y
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_V6_V7=y
-CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MMAP_RND_BITS=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=24
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
CONFIG_ARCH_MVEBU=y
-CONFIG_ARCH_NR_GPIO=0
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_STACKWALK=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
-CONFIG_ARMADA_370_CLK=y
-CONFIG_ARMADA_370_XP_IRQ=y
-CONFIG_ARMADA_370_XP_TIMER=y
+CONFIG_ARM64=y
+CONFIG_ARM64_4K_PAGES=y
+CONFIG_ARM64_PAGE_SHIFT=12
+CONFIG_ARM64_PA_BITS=48
+CONFIG_ARM64_PA_BITS_48=y
+CONFIG_ARM64_PTR_AUTH=y
+CONFIG_ARM64_SVE=y
+CONFIG_ARM64_TAGGED_ADDR_ABI=y
+CONFIG_ARM64_VA_BITS=39
+CONFIG_ARM64_VA_BITS_39=y
+CONFIG_ARMADA_37XX_CLK=y
# CONFIG_ARMADA_37XX_WATCHDOG is not set
-CONFIG_ARMADA_38X_CLK=y
+CONFIG_ARMADA_AP806_SYSCON=y
+CONFIG_ARMADA_AP_CP_HELPER=y
+CONFIG_ARMADA_CP110_SYSCON=y
CONFIG_ARMADA_THERMAL=y
-CONFIG_ARMADA_XP_CLK=y
-CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_AMBA=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set
# CONFIG_ARM_ARMADA_8K_CPUFREQ is not set
-CONFIG_ARM_ATAG_DTB_COMPAT=y
-# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set
-CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_CRYPTO=y
-CONFIG_ARM_ERRATA_720789=y
-CONFIG_ARM_ERRATA_764369=y
CONFIG_ARM_GIC=y
-CONFIG_ARM_GLOBAL_TIMER=y
-CONFIG_ARM_HAS_SG_CHAIN=y
-CONFIG_ARM_HEAVY_MB=y
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_MVEBU_V7_CPUIDLE=y
-CONFIG_ARM_PATCH_IDIV=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARM_THUMB=y
-CONFIG_ARM_UNWIND=y
-CONFIG_ARM_VIRT_EXT=y
+CONFIG_ARM_GIC_V2M=y
+CONFIG_ARM_GIC_V3=y
+CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ARM_GIC_V3_ITS_PCI=y
+# CONFIG_ARM_PL172_MPMC is not set
+CONFIG_ARM_PSCI_FW=y
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
CONFIG_ATA=y
-CONFIG_ATAGS=y
-CONFIG_ATA_LEDS=y
-CONFIG_AUTO_ZRELADDR=y
-CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
+CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_NVME=y
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_MQ_PCI=y
CONFIG_BLK_SCSI_REQUEST=y
CONFIG_BOUNCE=y
-# CONFIG_CACHE_FEROCEON_L2 is not set
-CONFIG_CACHE_L2X0=y
+CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
-CONFIG_CLKSRC_MMIO=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_COMMON_CLK=y
CONFIG_COMPAT_32BIT_TIME=y
CONFIG_CPUFREQ_DT=y
CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -87,22 +69,12 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_HAS_ASID=y
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_PJ4B=y
CONFIG_CPU_PM=y
CONFIG_CPU_RMAP=y
-CONFIG_CPU_SPECTRE=y
CONFIG_CPU_THERMAL=y
-CONFIG_CPU_THUMB_CAPABLE=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_V7=y
CONFIG_CRC16=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_AES_ARM=y
-CONFIG_CRYPTO_AES_ARM_BS=y
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y
@@ -114,54 +86,40 @@ CONFIG_CRYPTO_DEV_MARVELL_CESA=y
CONFIG_CRYPTO_ESSIV=y
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_LIB_DES=y
CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM=y
-CONFIG_CRYPTO_SHA1_ARM_NEON=y
-CONFIG_CRYPTO_SHA256_ARM=y
-CONFIG_CRYPTO_SHA512_ARM=y
-CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_ZSTD=y
CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_DEBUG_ALIGN_RODATA=y
CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
-CONFIG_DEBUG_MVEBU_UART0=y
-# CONFIG_DEBUG_MVEBU_UART0_ALTERNATE is not set
-# CONFIG_DEBUG_MVEBU_UART1_ALTERNATE is not set
-CONFIG_DEBUG_UART_8250=y
-CONFIG_DEBUG_UART_8250_SHIFT=2
-CONFIG_DEBUG_UART_PHYS=0xd0012000
-CONFIG_DEBUG_UART_VIRT=0xfec12000
-CONFIG_DEBUG_UNCOMPRESS=y
-CONFIG_DEBUG_USER=y
CONFIG_DMADEVICES=y
+CONFIG_DMA_DIRECT_REMAP=y
CONFIG_DMA_ENGINE=y
CONFIG_DMA_ENGINE_RAID=y
CONFIG_DMA_OF=y
-CONFIG_DMA_OPS=y
CONFIG_DMA_REMAP=y
CONFIG_DTC=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_EDAC_ATOMIC_SCRUB=y
CONFIG_EDAC_SUPPORT=y
CONFIG_EXT4_FS=y
CONFIG_EXTCON=y
CONFIG_F2FS_FS=y
CONFIG_FIXED_PHY=y
CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_FRAME_POINTER=y
CONFIG_FS_IOMAP=y
CONFIG_FS_MBCACHE=y
CONFIG_FW_LOADER_PAGED_BUF=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_GENERIC_ARCH_TOPOLOGY=y
CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_GENERIC_CSUM=y
CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_IDLE_POLL_SETUP=y
@@ -175,12 +133,12 @@ CONFIG_GENERIC_MSI_IRQ=y
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PINCONF=y
CONFIG_GENERIC_SCHED_CLOCK=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_VDSO_32=y
CONFIG_GLOB=y
CONFIG_GPIOLIB=y
CONFIG_GPIOLIB_IRQCHIP=y
@@ -191,32 +149,30 @@ CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GRO_CELLS=y
CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_HAS_DMA=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAVE_SMP=y
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
+CONFIG_HOLES_IN_ZONE=y
CONFIG_HOTPLUG_CPU=y
-CONFIG_HWBM=y
CONFIG_HWMON=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ_FIXED=0
CONFIG_HZ_PERIODIC=y
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MV64XXX=y
# CONFIG_I2C_PXA is not set
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INPUT=y
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_INPUT_POLLDEV=y
CONFIG_IRQCHIP=y
CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_DOMAIN_HIERARCHY=y
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_IRQ_WORK=y
-# CONFIG_IWMMXT is not set
CONFIG_JBD2=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_PCA963X=y
@@ -227,32 +183,24 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
-CONFIG_MACH_ARMADA_370=y
-# CONFIG_MACH_ARMADA_375 is not set
-CONFIG_MACH_ARMADA_38X=y
-# CONFIG_MACH_ARMADA_39X is not set
-CONFIG_MACH_ARMADA_XP=y
-# CONFIG_MACH_DOVE is not set
-CONFIG_MACH_MVEBU_ANY=y
-CONFIG_MACH_MVEBU_V7=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_MANGLE_BOOTARGS=y
CONFIG_MARVELL_PHY=y
CONFIG_MDIO_BUS=y
CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_DEVRES=y
CONFIG_MDIO_I2C=y
CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY=y
-CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_MFD_SYSCON=y
CONFIG_MIGRATION=y
CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
-CONFIG_MMC_MVSDIO=y
CONFIG_MMC_SDHCI=y
# CONFIG_MMC_SDHCI_PCI is not set
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_PXAV3=y
-CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MODULES_USE_ELF_RELA=y
CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_NAND_CORE=y
CONFIG_MTD_NAND_ECC=y
@@ -261,24 +209,24 @@ CONFIG_MTD_NAND_MARVELL=y
CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_LZMA_FW=y
+CONFIG_MTD_SPLIT_UIMAGE_FW=y
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_BEB_LIMIT=20
CONFIG_MTD_UBI_BLOCK=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_MVEBU_CLK_COMMON=y
-CONFIG_MVEBU_CLK_COREDIV=y
-CONFIG_MVEBU_CLK_CPU=y
-CONFIG_MVEBU_DEVBUS=y
-CONFIG_MVEBU_MBUS=y
+CONFIG_MVEBU_GICP=y
+CONFIG_MVEBU_ICU=y
+CONFIG_MVEBU_ODMI=y
+CONFIG_MVEBU_PIC=y
+CONFIG_MVEBU_SEI=y
CONFIG_MVMDIO=y
CONFIG_MVNETA=y
-CONFIG_MVNETA_BM=y
-CONFIG_MVNETA_BM_ENABLE=y
# CONFIG_MVPP2 is not set
CONFIG_MV_XOR=y
CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEON=y
+CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_NET_DEVLINK=y
CONFIG_NET_DSA=y
CONFIG_NET_DSA_MV88E6XXX=y
@@ -294,7 +242,6 @@ CONFIG_NVMEM=y
CONFIG_NVME_CORE=y
# CONFIG_NVME_HWMON is not set
# CONFIG_NVME_MULTIPATH is not set
-# CONFIG_NVME_TCP is not set
CONFIG_OF=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_EARLY_FLATTREE=y
@@ -304,44 +251,38 @@ CONFIG_OF_IRQ=y
CONFIG_OF_KOBJ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_ORION_WATCHDOG=y
-CONFIG_OUTER_CACHE=y
-CONFIG_OUTER_CACHE_SYNC=y
CONFIG_PADATA=y
-CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PAGE_POOL=y
+CONFIG_PARTITION_PERCPU=y
CONFIG_PCI=y
-CONFIG_PCI_BRIDGE_EMUL=y
+# CONFIG_PCI_AARDVARK is not set
CONFIG_PCI_DOMAINS=y
CONFIG_PCI_DOMAINS_GENERIC=y
CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_MVEBU=y
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PGTABLE_LEVELS=2
+CONFIG_PGTABLE_LEVELS=3
CONFIG_PHYLIB=y
CONFIG_PHYLINK=y
+CONFIG_PHYS_ADDR_T_64BIT=y
# CONFIG_PHY_MVEBU_A3700_COMPHY is not set
# CONFIG_PHY_MVEBU_A3700_UTMI is not set
# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
# CONFIG_PHY_MVEBU_CP110_COMPHY is not set
CONFIG_PINCTRL=y
-CONFIG_PINCTRL_ARMADA_370=y
-CONFIG_PINCTRL_ARMADA_38X=y
-CONFIG_PINCTRL_ARMADA_XP=y
+CONFIG_PINCTRL_ARMADA_37XX=y
+CONFIG_PINCTRL_ARMADA_AP806=y
+CONFIG_PINCTRL_ARMADA_CP110=y
CONFIG_PINCTRL_MVEBU=y
# CONFIG_PINCTRL_SINGLE is not set
-CONFIG_PJ4B_ERRATA_4742=y
-CONFIG_PL310_ERRATA_753970=y
-CONFIG_PLAT_ORION=y
CONFIG_PM_OPP=y
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_SUPPLY=y
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=11
CONFIG_PWM=y
CONFIG_PWM_SYSFS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
CONFIG_RATIONAL=y
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y
@@ -349,12 +290,12 @@ CONFIG_REGMAP_MMIO=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_RFS_ACCEL=y
+CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
CONFIG_RPS=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_ARMADA38X=y
# CONFIG_RTC_DRV_MV is not set
CONFIG_RTC_I2C_AND_SPI=y
-CONFIG_RTC_MC146818_LIB=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
CONFIG_SATA_AHCI_PLATFORM=y
CONFIG_SATA_HOST=y
@@ -373,8 +314,7 @@ CONFIG_SFP=y
CONFIG_SGL_ALLOC=y
CONFIG_SG_POOL=y
CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
-CONFIG_SOC_BUS=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSE_IRQ=y
CONFIG_SPI=y
# CONFIG_SPI_ARMADA_3700 is not set
@@ -382,45 +322,52 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
CONFIG_SPI_ORION=y
CONFIG_SRAM=y
-CONFIG_SRAM_EXEC=y
CONFIG_SRCU=y
+CONFIG_SWIOTLB=y
CONFIG_SWPHY=y
-CONFIG_SWP_EMULATE=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
CONFIG_THERMAL=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
CONFIG_THERMAL_GOV_STEP_WISE=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_OF=y
+CONFIG_THREAD_INFO_IN_TASK=y
CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TIMER_OF=y
CONFIG_TIMER_PROBE=y
CONFIG_TREE_RCU=y
CONFIG_TREE_SRCU=y
CONFIG_UBIFS_FS=y
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-CONFIG_UNWINDER_ARM=y
+CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_USB=y
CONFIG_USB_COMMON=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_ORION=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_GADGET=y
CONFIG_USB_LEDS_TRIGGER_USBPORT=y
+CONFIG_USB_MVEBU_U3D=y
+CONFIG_USB_MV_UDC=y
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_NET_QMI_WWAN=y
CONFIG_USB_PHY=y
CONFIG_USB_STORAGE=y
CONFIG_USB_SUPPORT=y
+CONFIG_USB_USBNET=y
+CONFIG_USB_WDM=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_MVEBU=y
CONFIG_USB_XHCI_PLATFORM=y
-CONFIG_USE_OF=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
+CONFIG_VMAP_STACK=y
CONFIG_WATCHDOG_CORE=y
CONFIG_XPS=y
+CONFIG_XXHASH=y
CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_BCJ=y
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
--
2.17.1

40
patches-22.03.2/3008-mvebu-adjust-platform-sh.patch Normal file
View File

@ -0,0 +1,40 @@
From 5cd470a43678423e906879340e9d782830491a6a Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Mon, 27 Feb 2023 01:32:53 -0500
Subject: [PATCH] mvebu-adjust-platform-sh
---
.../linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh
index 0ee1d61506..d52baf1b02 100755
--- a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh
@@ -10,6 +10,7 @@ REQUIRE_IMAGE_METADATA=1
platform_check_image() {
case "$(board_name)" in
glinet,gl-mv1000|\
+ gl-mv1000|\
globalscale,espressobin|\
globalscale,espressobin-emmc|\
globalscale,espressobin-ultra|\
@@ -26,6 +27,7 @@ platform_check_image() {
platform_do_upgrade() {
case "$(board_name)" in
glinet,gl-mv1000|\
+ gl-mv1000|\
globalscale,espressobin|\
globalscale,espressobin-emmc|\
globalscale,espressobin-ultra|\
@@ -44,6 +46,7 @@ platform_do_upgrade() {
platform_copy_config() {
case "$(board_name)" in
glinet,gl-mv1000|\
+ gl-mv1000|\
globalscale,espressobin|\
globalscale,espressobin-emmc|\
globalscale,espressobin-ultra|\
--
2.17.1

4856
patches-22.03.2/3009-mvebu-adjust-emmc-img-and-add-usb-devise-drive.patch Normal file
View File

File diff suppressed because it is too large Load Diff

82
patches-22.03.2/3010-update-mvebu-fwtools-script.patch Normal file
View File

@ -0,0 +1,82 @@
From d5d5a2cd3dd981a0fc68a528151a5ba772e7ab0a Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Mon, 27 Feb 2023 01:41:14 -0500
Subject: [PATCH] update-mvebu-fwtools-script
---
.../base-files/lib/upgrade/fwtool.sh | 63 +++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100644 target/linux/mvebu/cortexa53/base-files/lib/upgrade/fwtool.sh
diff --git a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/fwtool.sh b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/fwtool.sh
new file mode 100644
index 0000000000..7c82bc5289
--- /dev/null
+++ b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/fwtool.sh
@@ -0,0 +1,63 @@
+fwtool_check_signature() {
+ [ $# -gt 1 ] && return 1
+
+ [ ! -x /usr/bin/ucert ] && {
+ if [ "$REQUIRE_IMAGE_SIGNATURE" = 1 ]; then
+ return 1
+ else
+ return 0
+ fi
+ }
+
+ if ! fwtool -q -s /tmp/sysupgrade.ucert "$1"; then
+ v "Image signature not present"
+ [ "$REQUIRE_IMAGE_SIGNATURE" = 1 -a "$FORCE" != 1 ] && {
+ v "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"
+ }
+ [ "$REQUIRE_IMAGE_SIGNATURE" = 1 ] && return 1
+ return 0
+ fi
+
+ fwtool -q -T -s /dev/null "$1" | \
+ ucert -V -m - -c "/tmp/sysupgrade.ucert" -P /etc/opkg/keys
+
+ return $?
+}
+
+fwtool_check_image() {
+ [ $# -gt 1 ] && return 1
+
+ . /usr/share/libubox/jshn.sh
+
+ if ! fwtool -q -i /tmp/sysupgrade.meta "$1"; then
+ v "Image metadata not present"
+ [ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && {
+ v "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"
+ }
+ [ "$REQUIRE_IMAGE_METADATA" = 1 ] && return 1
+ return 0
+ fi
+
+ json_load "$(cat /tmp/sysupgrade.meta)" || {
+ v "Invalid image metadata"
+ return 1
+ }
+
+ device="$(cat /tmp/sysinfo/board_name)"
+
+ json_select supported_devices || return 1
+
+ json_get_keys dev_keys
+ for k in $dev_keys; do
+ json_get_var dev "$k"
+ dev=$(echo $dev | awk -F "-emmc" '{print $1}')
+ [ "$dev" = "$device" ] && return 0
+ done
+
+ v "Device $device not supported by this image"
+ for k in $dev_keys; do
+ json_get_var dev "$k"
+ v "$dev"
+ done
+ return 1
+}
--
2.17.1

33
patches-22.03.2/3011-mvebu-adjust-cortexa53.patch Normal file
View File

@ -0,0 +1,33 @@
From 61725b10deb08c3e39dd239164a436c999675543 Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Mon, 27 Feb 2023 01:42:57 -0500
Subject: [PATCH] mvebu-adjust-cortexa53
---
target/linux/mvebu/image/cortexa53.mk | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/target/linux/mvebu/image/cortexa53.mk b/target/linux/mvebu/image/cortexa53.mk
index bfaa597d9a..6f560f728e 100644
--- a/target/linux/mvebu/image/cortexa53.mk
+++ b/target/linux/mvebu/image/cortexa53.mk
@@ -1,10 +1,11 @@
-define Device/glinet_gl-mv1000
- $(call Device/Default-arm64)
- DEVICE_VENDOR := GL.iNet
- DEVICE_MODEL := GL-MV1000
+define Device/gl-mv1000-emmc
+ $(call Device/Default-arm64-emmc)
+ DEVICE_TITLE := GL.iNet GL-MV1000 EMMC
SOC := armada-3720
+ DEVICE_DTS := armada-gl-mv1000-emmc
+ SUPPORTED_DEVICES := gl-mv1000-emmc
endef
-TARGET_DEVICES += glinet_gl-mv1000
+TARGET_DEVICES += gl-mv1000-emmc
define Device/globalscale_espressobin
$(call Device/Default-arm64)
--
2.17.1

112
patches-22.03.2/4005-support-mv1000-target.patch Normal file
View File

@ -0,0 +1,112 @@
From 384c05eb480ae34d5fa59435330682470747e68c Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Mon, 27 Feb 2023 01:44:01 -0500
Subject: [PATCH] support-mv1000-target
---
...l-mv1000.dts => armada-gl-mv1000-emmc.dts} | 48 ++++++++++++++-----
1 file changed, 37 insertions(+), 11 deletions(-)
rename target/linux/mvebu/files/arch/arm64/boot/dts/marvell/{armada-3720-gl-mv1000.dts => armada-gl-mv1000-emmc.dts} (78%)
diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-gl-mv1000-emmc.dts
similarity index 78%
rename from target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
rename to target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-gl-mv1000-emmc.dts
index acf15e8ca9..3701b238f4 100644
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-gl-mv1000-emmc.dts
@@ -7,13 +7,34 @@
/ {
model = "GL.iNet GL-MV1000";
- compatible = "glinet,gl-mv1000", "marvell,armada3720";
+ compatible = "gl-mv1000", "marvell,armada3720";
aliases {
- led-boot = &led_power;
- led-failsafe = &led_power;
- led-running = &led_power;
- led-upgrade = &led_power;
+ //led-boot = &led_power;
+ //led-failsafe = &led_power;
+ //led-running = &led_power;
+ //led-upgrade = &led_power;
+ };
+
+ gl_hw {
+ compatible = "gl-hw-info";
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ model = "mv1000";
+ wan = "wan";
+ lan = "lan0 lan1 usb0";
+ flash_size = <7456>;
+ switch-button = "gpio-22";
+ reset-button = "gpio-14";
+ usb-port = "1-1";
+ factory_data {
+ device_mac = "factory";
+ device_ddns = "factory", "0x10";
+ device_sn_bak = "factory", "0x20";
+ device_sn = "factory", "0x30";
+ country_code = "factory", "0x88";
+ };
};
chosen {
@@ -49,7 +70,7 @@
switch {
label = "switch";
- linux,code = <BTN_0>;
+ linux,code = <KEY_SETUP>;
gpios = <&gpiosb 22 GPIO_ACTIVE_LOW>;
};
};
@@ -58,17 +79,17 @@
compatible = "gpio-leds";
vpn {
- label = "green:vpn";
+ label = "gl-mv1000:white:vpn";
gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;
};
wan {
- label = "green:wan";
+ label = "gl-mv1000:white:wan";
gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
};
led_power: power {
- label = "green:power";
+ label = "gl-mv1000:white:power";
gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
default-state = "on";
};
@@ -97,14 +118,19 @@
partition@f0000 {
label = "u-boot-env";
reg = <0Xf0000 0x8000>;
- read-only;
+ //read-only;
};
factory: partition@f8000 {
label = "factory";
reg = <0xf8000 0x8000>;
- read-only;
+ //read-only;
};
+
+ partition@100000 {
+ label = "log";
+ reg = <0x100000 0x20000>;
+ };
};
};
};
--
2.17.1