mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 05:01:30 +00:00
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
This commit is contained in:
commit
f0f102fde8
2 changed files with 2 additions and 2 deletions
|
@ -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(
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue