From: Joe Hershberger <joe.hershberger@ni.com>
Date: Tue, 28 Feb 2012 01:32:18 +0000 (-0600)
Subject: Xilinx: ARM: nand: Only trace that the NAND has on-die ECC if it claims to work
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9054d0f02cd9ed765ee19ae6931871e4ec42d7b;p=thirdparty%2Fu-boot.git

Xilinx: ARM: nand: Only trace that the NAND has on-die ECC if it claims to work

The device should say that it is using the mode before we report it.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/board/xilinx/dfe/xilinx_nandpss.c b/board/xilinx/dfe/xilinx_nandpss.c
index 99eb9a005e3..25017712396 100644
--- a/board/xilinx/dfe/xilinx_nandpss.c
+++ b/board/xilinx/dfe/xilinx_nandpss.c
@@ -1137,7 +1137,6 @@ int board_nand_init(struct nand_chip *nand_chip)
 				(dev_id == 0xdc) || (dev_id == 0xcc) ||
 				(dev_id == 0xa3) || (dev_id == 0xb3) ||
 				(dev_id == 0xd3) || (dev_id == 0xc3))) {
-		printf("OnDie ECC flash\n");
 		nand_chip->cmdfunc(mtd, NAND_CMD_SET_FEATURES,
 						ONDIE_ECC_FEATURE_ADDR, -1);
 		nand_chip->write_buf(mtd, set_feature, 4);
@@ -1146,8 +1145,10 @@ int board_nand_init(struct nand_chip *nand_chip)
 						ONDIE_ECC_FEATURE_ADDR, -1);
 		nand_chip->read_buf(mtd, get_feature, 4);
 
-		if (get_feature[0] & 0x08)
+		if (get_feature[0] & 0x08) {
+			printf("OnDie ECC flash: ");
 			ondie_ecc_enabled = 1;
+		}
 	} else if ((nand_chip->onfi_version == 23) &&
 				(nand_chip->onfi_params.features & (1 << 9))) {
 		ez_nand_supported = 1;