Skip to contentSkip to conversation

ARM: socfpga: Fix default mtdparts

PATCH New Marek Vasut 2 participants 3 messages Nov 20, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: socfpga: Fix default mtdparts

The default mtdparts value grew a trailing zero during the Kconfig conversion. This is because the mtdparts value in the header file had a \0 at the end, which got misconverted into plain 0 instead of being dropped.

Fixes 43ede0bca7fc ("Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT")
Cc Adam Ford <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tom Rini <[email protected]>
---
 configs/socfpga_arria5_defconfig       | 2 +-
 configs/socfpga_cyclone5_defconfig     | 2 +-
 configs/socfpga_de0_nano_soc_defconfig | 2 +-
 configs/socfpga_is1_defconfig          | 2 +-
 configs/socfpga_mcvevk_defconfig       | 2 +-
 configs/socfpga_sockit_defconfig       | 2 +-
 configs/socfpga_socrates_defconfig     | 2 +-
 configs/socfpga_sr1500_defconfig       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
configs/socfpga_arria5_defconfig +1 -1
index c4c71177b9..491d54ddc3 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
configs/socfpga_cyclone5_defconfig +1 -1
index 6bf7172c2c..caa6027982 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
configs/socfpga_de0_nano_soc_defconfig +1 -1
index ebb34f5b73..ec87a6f1c6 100644
@@ -28,7 +28,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
configs/socfpga_is1_defconfig +1 -1
index 30d3b2a2a2..ae30250bbc 100644
@@ -26,7 +26,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
configs/socfpga_mcvevk_defconfig +1 -1
index 1eb57a60d3..081d8903bc 100644
@@ -28,7 +28,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
configs/socfpga_sockit_defconfig +1 -1
index f9b5ee2d00..d70f1ed8b6 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
configs/socfpga_socrates_defconfig +1 -1
index e24723673c..8ac2bf5159 100644
@@ -28,7 +28,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
configs/socfpga_sr1500_defconfig +1 -1
index 08b829ddb8..107a13197d 100644
@@ -29,7 +29,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
Signature · 1 line
2.24.0.432.g9d3f5f5b63
#1 lore raw

PATCH 1/1 ARM: socfpga: Fix default mtdparts

Quoted 10 lines · Marek Vasut

The default mtdparts value grew a trailing zero during the Kconfig conversion. This is because the mtdparts value in the header file had a \0 at the end, which got misconverted into plain 0 instead of being dropped.

Fixes 43ede0bca7fc ("Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT")
Cc Adam Ford <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tom Rini <[email protected]>

After checking 43ede0bca7fc for any other possible breaks and seeing none:

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191120/19166e15/attachment.sig>
author Applied
#2 lore raw

PATCH 1/1 ARM: socfpga: Fix default mtdparts

Quoted 13 lines · Tom Rini
Quoted 10 lines · Marek Vasut

The default mtdparts value grew a trailing zero during the Kconfig conversion. This is because the mtdparts value in the header file had a \0 at the end, which got misconverted into plain 0 instead of being dropped.

Fixes 43ede0bca7fc ("Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT")
Cc Adam Ford <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tom Rini <[email protected]>
Quoted 4 lines

After checking 43ede0bca7fc for any other possible breaks and seeing none:

Applied, thanks.