sunxi_nand_spl: Remove NAND_SUNXI_SPL_SYNDROME_PARTITIONS_END

We only ever use syndrome mode for the partitions which contain the SPL,
as that is required for the BROM to be able to read the SPL.

Instead of using some arbritray limit for deciding whether or not to
use syndrome, be smart and check if u-boot-dtb.bin is directly behind
the SPL, if it is not then it is on its own partition and we should not
use syndrome.

Note the reason why we only use syndrome mode for the SPL is because it
comeswith weaker randomization, introducing a risk for more bit errors,
so we want to avoid it when possible.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 1d08d28d0e5dcf39f1f448a57284f3a580b0f787..c34c234cc18c57b820491796882fa1c7a1aa05d8 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -100,14 +100,6 @@ config SPL_NAND_DENALI
          This is a small implementation of the Denali NAND controller
          for use on SPL.
 
-config NAND_SUNXI_SPL_SYNDROME_PARTITIONS_END
-       hex "Size of syndrome partitions in sunxi NAND"
-       default 0x400000
-       depends on NAND_SUNXI
-       ---help---
-       End address for boot partitions on NAND. Those partitions have a
-       different random seed that has to match the sunxi BROM setting.
-
 endif
 
 endmenu

diff --git a/drivers/mtd/nand/sunxi_nand_spl.c b/drivers/mtd/nand/sunxi_nand_spl.c
index 14320c44948aaf257b5c333acb580f3f2cfb14f8..5c0a52744f6653389eb0fa6acaf669e554db14b4 100644 (file)
--- a/drivers/mtd/nand/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/sunxi_nand_spl.c
@@ -356,8 +356,12 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *dest)
                2 * 1024 * 1024 + CONFIG_SYS_NAND_U_BOOT_OFFS,
                4 * 1024 * 1024 + CONFIG_SYS_NAND_U_BOOT_OFFS,
        };
-       int syndrome = offs < CONFIG_NAND_SUNXI_SPL_SYNDROME_PARTITIONS_END;
-       int i;
+       int i, syndrome;
+
+       if (CONFIG_SYS_NAND_U_BOOT_OFFS == CONFIG_SPL_PAD_TO)
+               syndrome = 1; /* u-boot-dtb.bin appended to SPL */
+       else
+               syndrome = 0; /* u-boot-dtb.bin on its own partition */
 
        if (offs == CONFIG_SYS_NAND_U_BOOT_OFFS) {
                for (i = 0; i < ARRAY_SIZE(boot_offsets); i++) {