From: Caleb James DeLisle Date: Fri, 12 Sep 2025 06:43:21 +0000 (+0000) Subject: econet: Clean up kernel config and move subtarget devices into own file X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F20027%2Fhead;p=thirdparty%2Fopenwrt.git econet: Clean up kernel config and move subtarget devices into own file The kernel config accidentally contains CONFIG_UBIFS_FS_AUTHENTICATION which select a number of other unnecessary components, remove them. The target has at least two subtargets, only one is currently implemented. Move the Device builds into a file for this subtarget. Signed-off-by: Caleb James DeLisle Link: https://github.com/openwrt/openwrt/pull/20027 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/econet/en751221/config-6.12 b/target/linux/econet/en751221/config-6.12 index a1bf145c207..80bb91957d8 100644 --- a/target/linux/econet/en751221/config-6.12 +++ b/target/linux/econet/en751221/config-6.12 @@ -2,13 +2,8 @@ CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_ARCH_MMAP_RND_BITS_MAX=15 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 -CONFIG_ASN1=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_CLKSRC_MMIO=y CONFIG_CLONE_BACKWARDS=y -CONFIG_CLZ_TAB=y CONFIG_COMMON_CLK=y CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_COMPAT_32BIT_TIME=y @@ -32,20 +27,15 @@ CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_CPU_SUPPORTS_MSA=y CONFIG_CRC16=y -CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 CONFIG_CRYPTO_LIB_SHA1=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_RSA=y -CONFIG_CRYPTO_SIG=y -CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_ZSTD=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_ZBOOT=y @@ -95,8 +85,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_MIPS_CPU=y CONFIG_IRQ_WORK=y # CONFIG_JFFS2_FS is not set -CONFIG_KEYS=y -CONFIG_LIBCRC32C=m CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LZO_COMPRESS=y @@ -114,7 +102,6 @@ CONFIG_MIPS_RAW_APPENDED_DTB=y CONFIG_MIPS_SPRAM=y CONFIG_MMU_LAZY_TLB_REFCOUNT=y CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MPILIB=y CONFIG_MTD_NAND_CORE=y CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_MTK_BMT=y @@ -137,7 +124,6 @@ CONFIG_OF_FLATTREE=y CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y -CONFIG_OID_REGISTRY=y CONFIG_PADATA=y CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y @@ -145,9 +131,6 @@ CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PCI_DRIVERS_LEGACY=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 -CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS7_TEST_KEY is not set -# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_SPINLOCKS=y @@ -155,7 +138,6 @@ CONFIG_RANDSTRUCT_NONE=y CONFIG_RATIONAL=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y -# CONFIG_SECONDARY_TRUSTED_KEYRING is not set CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SGL_ALLOC=y @@ -169,9 +151,6 @@ CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_SYSTEM_DATA_VERIFICATION=y -# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set -CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_HAS_CPU_MIPS32_R2=y CONFIG_SYS_HAS_EARLY_PRINTK=y @@ -188,13 +167,9 @@ CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y -CONFIG_UBIFS_ATIME_SUPPORT=y CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_SECURITY=y CONFIG_USE_GENERIC_EARLY_PRINTK_8250=y CONFIG_USE_OF=y -CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_XPS=y CONFIG_XXHASH=y CONFIG_ZBOOT_LOAD_ADDRESS=0x80020000 diff --git a/target/linux/econet/image/Makefile b/target/linux/econet/image/Makefile index 94804115cfc..120ad234d31 100644 --- a/target/linux/econet/image/Makefile +++ b/target/linux/econet/image/Makefile @@ -21,31 +21,6 @@ define Device/Default KERNEL := kernel-bin | append-dtb endef -define Device/smartfiber_xp8421-b - DEVICE_VENDOR := SmartFiber - DEVICE_MODEL := XP8421-B - DEVICE_DTS := en751221_smartfiber_xp8421-b - IMAGES := tclinux.trx - IMAGE/tclinux.trx := append-kernel | lzma | tclinux-trx -endef -TARGET_DEVICES += smartfiber_xp8421-b - -# NOTE: This will not work for upgrading from factory because it requires a cryptographic signature -# however, it it can be flashed, then it will boot correctly. -define Device/tplink_archer-vr1200v-v2 - DEVICE_VENDOR := TP-Link - DEVICE_MODEL := Archer vr1200v - DEVICE_VARIANT := v2 - TPLINK_FLASHLAYOUT := 16Mmtk - TPLINK_HWID := 0x0b473502 - TPLINK_HWREV := 0x0006007c - TPLINK_HWREVADD := 0x0 - TPLINK_HVERSION := 3 - DEVICE_DTS := en751221_tplink_archer-vr1200v-v2 - IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := append-kernel | lzma | pad-to 4193792 | append-rootfs | \ - tplink-v2-header -R 0x400000 -endef -TARGET_DEVICES += tplink_archer-vr1200v-v2 +include $(SUBTARGET).mk $(eval $(call BuildImage)) diff --git a/target/linux/econet/image/en751221.mk b/target/linux/econet/image/en751221.mk new file mode 100644 index 00000000000..801af349e07 --- /dev/null +++ b/target/linux/econet/image/en751221.mk @@ -0,0 +1,26 @@ +define Device/smartfiber_xp8421-b + DEVICE_VENDOR := SmartFiber + DEVICE_MODEL := XP8421-B + DEVICE_DTS := en751221_smartfiber_xp8421-b + IMAGES := tclinux.trx + IMAGE/tclinux.trx := append-kernel | lzma | tclinux-trx +endef +TARGET_DEVICES += smartfiber_xp8421-b + +# NOTE: This will not work for upgrading from factory because it requires a cryptographic signature +# however, it it can be flashed, then it will boot correctly. +define Device/tplink_archer-vr1200v-v2 + DEVICE_VENDOR := TP-Link + DEVICE_MODEL := Archer vr1200v + DEVICE_VARIANT := v2 + TPLINK_FLASHLAYOUT := 16Mmtk + TPLINK_HWID := 0x0b473502 + TPLINK_HWREV := 0x0006007c + TPLINK_HWREVADD := 0x0 + TPLINK_HVERSION := 3 + DEVICE_DTS := en751221_tplink_archer-vr1200v-v2 + IMAGES := sysupgrade.bin + IMAGE/sysupgrade.bin := append-kernel | lzma | pad-to 4193792 | append-rootfs | \ + tplink-v2-header -R 0x400000 +endef +TARGET_DEVICES += tplink_archer-vr1200v-v2