diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-25 10:40:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-25 10:40:38 -0500 |
| commit | 2218c54bc13c8045903afc05d1364439a230da1f (patch) | |
| tree | 04c07b31c7953846b907fab4a4609a38e312b4ab /arch/arm/include/asm/imx-common/regs-bch.h | |
| parent | cc4228f9d69f58495c2404adba9145bb36e613bf (diff) | |
| parent | ed3fb1fb22fb9e0e786c58c2d80cd030b89b9b7d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm/imx-common/regs-bch.h')
| -rw-r--r-- | arch/arm/include/asm/imx-common/regs-bch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/imx-common/regs-bch.h b/arch/arm/include/asm/imx-common/regs-bch.h index 5c477835fc..adfbace05d 100644 --- a/arch/arm/include/asm/imx-common/regs-bch.h +++ b/arch/arm/include/asm/imx-common/regs-bch.h @@ -123,7 +123,7 @@ struct mxs_bch_regs { #define BCH_FLASHLAYOUT0_NBLOCKS_OFFSET 24 #define BCH_FLASHLAYOUT0_META_SIZE_MASK (0xff << 16) #define BCH_FLASHLAYOUT0_META_SIZE_OFFSET 16 -#if defined(CONFIG_MX6) +#if (defined(CONFIG_MX6) || defined(CONFIG_MX7)) #define BCH_FLASHLAYOUT0_ECC0_MASK (0x1f << 11) #define BCH_FLASHLAYOUT0_ECC0_OFFSET 11 #else @@ -154,7 +154,7 @@ struct mxs_bch_regs { #define BCH_FLASHLAYOUT1_PAGE_SIZE_MASK (0xffff << 16) #define BCH_FLASHLAYOUT1_PAGE_SIZE_OFFSET 16 -#if defined(CONFIG_MX6) +#if (defined(CONFIG_MX6) || defined(CONFIG_MX7)) #define BCH_FLASHLAYOUT1_ECCN_MASK (0x1f << 11) #define BCH_FLASHLAYOUT1_ECCN_OFFSET 11 #else |