diff options
| author | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-10-18 05:33:04 +0200 |
|---|---|---|
| committer | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-10-18 05:33:04 +0200 |
| commit | 7ef15e8446a343f37051854c9f3817178c4dc64c (patch) | |
| tree | 9053a447a476c2a110a4c513666ae846241c09f5 | |
| parent | 876983cbb4308090ab7e644e243a6b758758f7de (diff) | |
| parent | ae396d343a39374269b28fc572daf04d86b9589c (diff) | |
Merge remote-tracking branch 'origin/ls_v2022.04' into lf_v2022.04
* origin/ls_v2022.04:
LF-6627: nand drvier fixups in nandboot on ls1043ardb-pd
| -rw-r--r-- | board/freescale/ls1043ardb/ls1043ardb.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index 51228bcf796..b5837453604 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -363,7 +363,20 @@ void nand_fixup() csor = (csor & ~(CSOR_NAND_SPRZ_MASK)) | CSOR_NAND_SPRZ_224; #ifdef CONFIG_TFABOOT - set_ifc_csor(IFC_CS1, csor); + u8 cfg_rcw_src1, cfg_rcw_src2; + u16 cfg_rcw_src; + cfg_rcw_src1 = CPLD_READ(cfg_rcw_src1); + cfg_rcw_src2 = CPLD_READ(cfg_rcw_src2); + cpld_rev_bit(&cfg_rcw_src1); + cfg_rcw_src = cfg_rcw_src1; + cfg_rcw_src = (cfg_rcw_src << 1) | cfg_rcw_src2; + + if (cfg_rcw_src == 0x25) + set_ifc_csor(IFC_CS1, csor); + else if (cfg_rcw_src == 0x118) + set_ifc_csor(IFC_CS0, csor); + else + printf("Invalid setting\n"); #else #ifdef CONFIG_NAND_BOOT set_ifc_csor(IFC_CS0, csor); |