diff options
| author | Brian Norris | 2022-11-07 06:14:22 +0000 |
|---|---|---|
| committer | Robert Marko | 2024-08-02 17:54:38 +0000 |
| commit | d7f3a1c985fdea710317151b2b7f3eb40ec045e8 (patch) | |
| tree | 5c1da152c7ae1ea6b2ba5da2c478228a9ad82def | |
| parent | 226af7a77cc7398b126267c66106c593a49d8ad2 (diff) | |
| download | openwrt-d7f3a1c985fdea710317151b2b7f3eb40ec045e8.tar.gz | |
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>
| -rw-r--r-- | target/linux/ipq40xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ipq40xx/config-6.6 | 6 | ||||
| -rw-r--r-- | target/linux/ipq40xx/generic/config-default | 6 | ||||
| -rw-r--r-- | target/linux/ipq40xx/generic/target.mk | 2 | ||||
| -rw-r--r-- | target/linux/ipq40xx/mikrotik/config-default | 6 | ||||
| -rw-r--r-- | target/linux/ipq40xx/mikrotik/target.mk | 2 |
6 files changed, 15 insertions, 9 deletions
diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 30091e5d29..68a47c9082 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=ipq40xx BOARDNAME:=Qualcomm Atheros IPQ40XX -FEATURES:=squashfs fpu ramdisk nand +FEATURES:=squashfs fpu ramdisk CPU_TYPE:=cortex-a7 CPU_SUBTYPE:=neon-vfpv4 SUBTARGETS:=generic chromium mikrotik diff --git a/target/linux/ipq40xx/config-6.6 b/target/linux/ipq40xx/config-6.6 index 3049efc3d6..683463628f 100644 --- a/target/linux/ipq40xx/config-6.6 +++ b/target/linux/ipq40xx/config-6.6 @@ -306,11 +306,6 @@ CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_FIT_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_NEED_DMA_MAP_STATE=y CONFIG_NEON=y @@ -532,7 +527,6 @@ CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y -CONFIG_UBIFS_FS=y CONFIG_UEVENT_HELPER_PATH="" CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNWINDER_ARM=y diff --git a/target/linux/ipq40xx/generic/config-default b/target/linux/ipq40xx/generic/config-default new file mode 100644 index 0000000000..bd9876a0b6 --- /dev/null +++ b/target/linux/ipq40xx/generic/config-default @@ -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 diff --git a/target/linux/ipq40xx/generic/target.mk b/target/linux/ipq40xx/generic/target.mk index 90c1b762af..4ff40dea2b 100644 --- a/target/linux/ipq40xx/generic/target.mk +++ b/target/linux/ipq40xx/generic/target.mk @@ -1,3 +1,3 @@ BOARDNAME:=Generic -FEATURES+=emmc +FEATURES+=emmc nand DEFAULT_PACKAGES += ath10k-board-qca4019 diff --git a/target/linux/ipq40xx/mikrotik/config-default b/target/linux/ipq40xx/mikrotik/config-default index ab470ecb41..805e6db23b 100644 --- a/target/linux/ipq40xx/mikrotik/config-default +++ b/target/linux/ipq40xx/mikrotik/config-default @@ -4,3 +4,9 @@ CONFIG_MTD_ROUTERBOOT_PARTS=y CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y CONFIG_MTD_SPLIT_MINOR_FW=y # 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 diff --git a/target/linux/ipq40xx/mikrotik/target.mk b/target/linux/ipq40xx/mikrotik/target.mk index 4530a90985..12bf8a4cd3 100644 --- a/target/linux/ipq40xx/mikrotik/target.mk +++ b/target/linux/ipq40xx/mikrotik/target.mk @@ -1,4 +1,4 @@ BOARDNAME:=MikroTik -FEATURES += minor +FEATURES += minor nand KERNEL_IMAGES:=vmlinux IMAGES_DIR:=compressed |