From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 5 Sep 2013 10:04:49 +0000 (+0200)
Subject: Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.10-rc3~8^2~3
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=f0f102fde85aca438f4322893729f28135bf3c61;hp=19d829fa60fc4e6df514a046142faaaf9fc8185d

Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
---

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 96aca00ebc..da83f06e47 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -827,7 +827,8 @@ static int atmel_pmecc_nand_init_params(struct nand_chip *nand,
 	switch (mtd->writesize) {
 	case 2048:
 	case 4096:
-		host->pmecc_degree = PMECC_GF_DIMENSION_13;
+		host->pmecc_degree = (sector_size == 512) ?
+			PMECC_GF_DIMENSION_13 : PMECC_GF_DIMENSION_14;
 		host->pmecc_cw_len = (1 << host->pmecc_degree) - 1;
 		host->pmecc_sector_number = mtd->writesize / sector_size;
 		host->pmecc_bytes_per_sector = pmecc_get_ecc_bytes(
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 409919898e..76fa500edd 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -130,7 +130,6 @@
 /* Ethernet Hardware */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT		20
 #define CONFIG_MACB_SEARCH_PHY
 #define CONFIG_RGMII