ipq40xx: Drop nand features from Chromium image

This target doesn't actually use NAND.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16001
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Brian Norris 2022-11-06 22:14:22 -08:00 committed by Robert Marko
parent 226af7a77c
commit d7f3a1c985
6 changed files with 15 additions and 9 deletions

View File

@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
ARCH:=arm ARCH:=arm
BOARD:=ipq40xx BOARD:=ipq40xx
BOARDNAME:=Qualcomm Atheros IPQ40XX BOARDNAME:=Qualcomm Atheros IPQ40XX
FEATURES:=squashfs fpu ramdisk nand FEATURES:=squashfs fpu ramdisk
CPU_TYPE:=cortex-a7 CPU_TYPE:=cortex-a7
CPU_SUBTYPE:=neon-vfpv4 CPU_SUBTYPE:=neon-vfpv4
SUBTARGETS:=generic chromium mikrotik SUBTARGETS:=generic chromium mikrotik

View File

@ -306,11 +306,6 @@ CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_FIRMWARE=y
CONFIG_MTD_SPLIT_FIT_FW=y CONFIG_MTD_SPLIT_FIT_FW=y
CONFIG_MTD_SPLIT_WRGG_FW=y CONFIG_MTD_SPLIT_WRGG_FW=y
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_BEB_LIMIT=20
CONFIG_MTD_UBI_BLOCK=y
CONFIG_MTD_UBI_NVMEM=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEON=y CONFIG_NEON=y
@ -532,7 +527,6 @@ CONFIG_TIMER_OF=y
CONFIG_TIMER_PROBE=y CONFIG_TIMER_PROBE=y
CONFIG_TREE_RCU=y CONFIG_TREE_RCU=y
CONFIG_TREE_SRCU=y CONFIG_TREE_SRCU=y
CONFIG_UBIFS_FS=y
CONFIG_UEVENT_HELPER_PATH="" CONFIG_UEVENT_HELPER_PATH=""
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
CONFIG_UNWINDER_ARM=y CONFIG_UNWINDER_ARM=y

View File

@ -0,0 +1,6 @@
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_BEB_LIMIT=20
CONFIG_MTD_UBI_BLOCK=y
CONFIG_MTD_UBI_NVMEM=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_UBIFS_FS=y

View File

@ -1,3 +1,3 @@
BOARDNAME:=Generic BOARDNAME:=Generic
FEATURES+=emmc FEATURES+=emmc nand
DEFAULT_PACKAGES += ath10k-board-qca4019 DEFAULT_PACKAGES += ath10k-board-qca4019

View File

@ -4,3 +4,9 @@ CONFIG_MTD_ROUTERBOOT_PARTS=y
CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y
CONFIG_MTD_SPLIT_MINOR_FW=y CONFIG_MTD_SPLIT_MINOR_FW=y
# CONFIG_NVMEM_LAYOUT_MIKROTIK is not set # CONFIG_NVMEM_LAYOUT_MIKROTIK is not set
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_BEB_LIMIT=20
CONFIG_MTD_UBI_BLOCK=y
CONFIG_MTD_UBI_NVMEM=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_UBIFS_FS=y

View File

@ -1,4 +1,4 @@
BOARDNAME:=MikroTik BOARDNAME:=MikroTik
FEATURES += minor FEATURES += minor nand
KERNEL_IMAGES:=vmlinux KERNEL_IMAGES:=vmlinux
IMAGES_DIR:=compressed IMAGES_DIR:=compressed