diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
| commit | 442f6346d2c52259f618b0f7b2025ea8fb5ab336 (patch) | |
| tree | 9bfbecd9f9506c2d535c0851bf809ca60d8f178c /common | |
| parent | 4a62a18d33e39f00d717c4aa314697dca924cf3f (diff) | |
| parent | 332eedd6e75c57c3f4acea1b3045f628a7a2f349 (diff) | |
| download | barebox-442f6346d2c52259f618b0f7b2025ea8fb5ab336.tar.gz barebox-442f6346d2c52259f618b0f7b2025ea8fb5ab336.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'common')
| -rw-r--r-- | common/imx-bbu-nand-fcb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/imx-bbu-nand-fcb.c b/common/imx-bbu-nand-fcb.c index 5d3d3f7e93..7218c5e1cc 100644 --- a/common/imx-bbu-nand-fcb.c +++ b/common/imx-bbu-nand-fcb.c @@ -441,7 +441,7 @@ static int read_fcb(struct mtd_info *mtd, int num, struct fcb_block **retfcb) goto err; } - if (cpu_is_mx6ul()) + if (cpu_is_mx6ul() || cpu_is_mx6ull()) fcb = read_fcb_bch(rawpage, 40); else fcb = read_fcb_hamming_13_8(rawpage); @@ -899,8 +899,8 @@ static int imx_bbu_write_fcbs_dbbts(struct mtd_info *mtd, struct fcb_block *fcb) fcb_raw_page = xzalloc(mtd->writesize + mtd->oobsize); - if (cpu_is_mx6ul()) { - /* 40 bit BCH, for i.MX6UL */ + if (cpu_is_mx6ul() || cpu_is_mx6ull()) { + /* 40 bit BCH, for i.MX6UL(L) */ encode_bch_ecc(fcb_raw_page + 32, fcb, 40); } else { memcpy(fcb_raw_page + 12, fcb, sizeof(struct fcb_block)); |