From: Tony Dinh Date: Mon, 18 Nov 2024 19:34:59 +0000 (-0800) Subject: arm: mvebu: Disable JFFS2 support for Kirkwood and Armada XP boards X-Git-Url: http://git.dujemihanovic.xyz/repo?a=commitdiff_plain;h=325ac6c1e7facd67b91eb8ada12b49f648063942;p=u-boot.git arm: mvebu: Disable JFFS2 support for Kirkwood and Armada XP boards These boards don't use JFFS2 file system for booting so remove it. Ref: https://lore.kernel.org/u-boot/20241114233005.GN3600562@bill-the-cat/T/#t Signed-off-by: Tony Dinh Acked-by: Phil Sutter Reviewed-by: Stefan Roese --- diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index 323e2f5d4c..1ba02e0595 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -33,7 +33,6 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896k(u-boot),128k(u-boot-env),5m(kernel),-(rootfs)" diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig index e35ca165d0..941156750a 100644 --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig @@ -33,7 +33,6 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(root)" diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index 25e5be3ba7..44e9b17682 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -49,7 +49,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TIME=y -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index af758fcc43..add4a24a31 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)" diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 0fab4c38e0..540b9184b3 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896K(uboot),128K(uboot_env),-@1M(root)" diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index 9d195e1cf2..6ee40e380b 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x80000@0x0(uboot),0x20000@0x80000(uboot_env),-@0xa0000(rootfs)" diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index 783879d4ee..ca70ee9637 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -34,7 +34,6 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xa0000@0x0(uboot),0x010000@0xa0000(env),0x500000@0xc0000(uimage),0x1a40000@0x5c0000(rootfs)" @@ -66,5 +65,3 @@ CONFIG_SYS_NS16550_REG_SIZE=-4 CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_NAND=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index f6718350d5..9a42c39155 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -30,7 +30,6 @@ CONFIG_CMD_NAND=y CONFIG_CMD_SATA=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(root)" diff --git a/configs/nsa325_defconfig b/configs/nsa325_defconfig index c4235eecfb..ab9316340d 100644 --- a/configs/nsa325_defconfig +++ b/configs/nsa325_defconfig @@ -42,7 +42,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_SNTP=y CONFIG_CMD_DNS=y # CONFIG_CMD_BLOCK_CACHE is not set -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x100000(uboot),0x80000(stock_uboot_env),0x80000(key_store),0x80000(info),0xA00000(etc),0xA00000(kernel_1),0x2FC0000(rootfs1),0xA00000(kernel_2),0x2FC0000(rootfs2)" @@ -73,6 +72,4 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y CONFIG_USB_EHCI_HCD=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_NAND=y CONFIG_UBIFS_SILENCE_MSG=y diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig index 50103f375a..50c9292550 100644 --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig @@ -32,7 +32,6 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1M(u-boot),4M(uImage),32M(rootfs),-(data)" diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig index fb8036a75e..03b4fd9b2f 100644 --- a/configs/pogo_v4_defconfig +++ b/configs/pogo_v4_defconfig @@ -41,7 +41,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_SNTP=y CONFIG_CMD_DNS=y # CONFIG_CMD_BLOCK_CACHE is not set -CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:2M(u-boot),3M(uImage),3M(uImage2),8M(failsafe),112M(root)" @@ -73,6 +72,4 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y CONFIG_USB_EHCI_HCD=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_NAND=y CONFIG_UBIFS_SILENCE_MSG=y