Dear Mike Frysinger,
From: Reinhard Meyer u-boot@emk-elektronik.de
Supports most types that support Read-Id and the FM25H20.
Signed-off-by: Reinhard Meyer u-boot@emk-elektronik.de Signed-off-by: Mike Frysinger vapier@gentoo.org
[snippebedip]
+#ifdef CONFIG_SPI_FRAM_RAMTRON
- { 6, 0xc2, spi_fram_probe_ramtron, },
+# undef IDCODE_CONT_LEN +# define IDCODE_CONT_LEN 6 +#endif
That code should only increase the IDCODE_CONT_LEN, not set it to a value. It might have been set larger by a previous #ifdef.
+#ifdef CONFIG_SPI_FRAM_RAMTRON + { 6, 0xc2, spi_fram_probe_ramtron, }, +# if IDCODE_CONT_LEN < 6 +# undef IDCODE_CONT_LEN +# define IDCODE_CONT_LEN 6 +# endif +#endif
Even "nicer" and maybe better understandable could be:
+#ifdef CONFIG_SPI_FRAM_RAMTRON +# define RAMTRON_CONT_LEN 6 + { RAMTRON_CONT_LEN, 0xc2, spi_fram_probe_ramtron, }, +# if IDCODE_CONT_LEN < RAMTRON_CONT_LEN +# undef IDCODE_CONT_LEN +# define IDCODE_CONT_LEN RAMTRON_CONT_LEN +# endif +#endif
I cannot test all this right now. Maybe you put just the probing part (1/2) into mainline, once all my local ahead-of-MASTER and posted patches are in mainline, I'll do a big rebase and fix session here and post a new ramtron patch.
Reinhard