On 8/13/2012 1:51 PM, Benoît Thébaudeau wrote:
Signed-off-by: Benoît Thébaudeau benoit.thebaudeau@advansee.com Cc: Scott Wood scottwood@freescale.com Cc: Stefano Babic sbabic@denx.de
.../arch/arm/include/asm/arch-mx5/imx-regs.h | 9 + .../drivers/mtd/nand/mxc_nand.c | 217 +++++++++++++++----- .../include/fsl_nfc.h | 149 +++++++++----- .../nand_spl/nand_boot_fsl_nfc.c | 114 +++++++--- 4 files changed, 363 insertions(+), 126 deletions(-)
diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx5/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx5/imx-regs.h index 7f66b61..55e9660 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx5/imx-regs.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -232,6 +232,15 @@ #define CS0_32M_CS1_32M_CS2_32M_CS3_32M 3
/*
- SRC register definitions
- */
+#if defined(CONFIG_MX51) +#define SRC_SBMR_NF16B (1 << 2) +#elif defined(CONFIG_MX53) +#define SRC_SBMR_NF16B (1 << 13) +#endif
You could give an error if a multi-platform kernel has both defined, if a run-time check is too difficult.