leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-imx

Browse Source
This commit is contained in:
Tom Rini
2016-06-12 12:51:34 -04:00
parent b57129dbda d2ba7a6adc
commit 3fc304b8d7
33 changed files with 458 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/dwc_ahsata.c
View File

@@ -563,7 +563,7 @@ int init_sata(int dev)
struct ahci_probe_ent *probe_ent = NULL;
#if defined(CONFIG_MX6)
if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D))
if (!is_mx6dq() && !is_mx6dqp())
return 1;
#endif
if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) {

4
drivers/misc/mxc_ocotp.c
View File

@@ -95,9 +95,9 @@ u32 fuse_bank_physical(int index)
{
u32 phy_index;
if (is_cpu_type(MXC_CPU_MX6SL)) {
if (is_mx6sl()) {
phy_index = index;
} else if (is_cpu_type(MXC_CPU_MX6UL)) {
} else if (is_mx6ul()) {
if (index >= 6)
phy_index = fuse_bank_physical(5) + (index - 6) + 3;
else

2
drivers/mtd/nand/mxs_nand.c
View File

@@ -152,7 +152,7 @@ static inline uint32_t mxs_nand_get_ecc_strength(uint32_t page_data_size,
int max_ecc_strength_supported;
/* Refer to Chapter 17 for i.MX6DQ, Chapter 18 for i.MX6SX */
if (is_cpu_type(MXC_CPU_MX6SX) || is_soc_type(MXC_SOC_MX7))
if (is_mx6sx() || is_mx7())
max_ecc_strength_supported = 62;
else
max_ecc_strength_supported = 40;

2
drivers/net/fec_mxc.c
View File

@@ -566,7 +566,7 @@ static int fec_init(struct eth_device *dev, bd_t* bd)
/* Do not access reserved register for i.MX6UL */
if (!is_cpu_type(MXC_CPU_MX6UL)) {
if (!is_mx6ul()) {
/* clear MIB RAM */
for (i = mib_ptr; i <= mib_ptr + 0xfc; i += 4)
writel(0, i);