diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-08 12:51:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-08 12:51:47 -0500 |
| commit | 2f4c9de3d00b09f74eaf9598ea4edbbc4f99b62d (patch) | |
| tree | 253415eae65bc1685bb8722dbd38b0697e7aa7b8 /drivers | |
| parent | 5e2338079d4497fe87db60b791203e760493780c (diff) | |
| parent | ca9d211e2c7801bc3e194d325ece0d3b583b32d2 (diff) | |
| download | u-boot-2f4c9de3d00b09f74eaf9598ea4edbbc4f99b62d.zip u-boot-2f4c9de3d00b09f74eaf9598ea4edbbc4f99b62d.tar.gz u-boot-2f4c9de3d00b09f74eaf9598ea4edbbc4f99b62d.tar.bz2 | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/mxc_gpio.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/mxs_nand_spl.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index c480eba..cfa620b 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -47,12 +47,12 @@ static unsigned long gpio_ports[] = { #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ defined(CONFIG_MX7) [4] = GPIO5_BASE_ADDR, -#ifndef CONFIG_MX6UL +#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) [5] = GPIO6_BASE_ADDR, #endif #endif #if defined(CONFIG_MX53) || defined(CONFIG_MX6) || defined(CONFIG_MX7) -#ifndef CONFIG_MX6UL +#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) [6] = GPIO7_BASE_ADDR, #endif #endif diff --git a/drivers/mtd/nand/mxs_nand_spl.c b/drivers/mtd/nand/mxs_nand_spl.c index b6c9208..910f76d 100644 --- a/drivers/mtd/nand/mxs_nand_spl.c +++ b/drivers/mtd/nand/mxs_nand_spl.c @@ -153,7 +153,6 @@ static int mxs_nand_init(void) nand_chip.numchips = 1; /* identify flash device */ - puts(": "); if (mxs_flash_ident(mtd)) { printf("Failed to identify\n"); return -1; @@ -167,7 +166,6 @@ static int mxs_nand_init(void) mtd->size = nand_chip.chipsize; nand_chip.scan_bbt(mtd); - printf("%llu MiB\n", (mtd->size / (1024 * 1024))); return 0; } |