May 2014 - U-Boot

[U-Boot] [RFC PATCH 1/1] Read mmc device memory capacity from EXT_CSD if memory is addressed by sector
by Frank Bormann 23 May '14

23 May '14

Hello Everyone, I believe, there is a bug in the mmc driver code pertaining to how u-boot detects memory size of an mmc device. However, I am not 100% sure, my solution conforms to the JEDEC standard. So I am putting it up for discussion. Previously, sector count indicated by mmc devices in the EXT_CSD would only be used in u-boot if the size indicated is greater than 2 GB. This seems to be incorrect. I am working with a 4 GB Micron eMMC device that after partition configuration and setting the user data area to enhanced mode has a remaining capacity of less than 2 GB for the user data area. JESD84-B50 explicitly states in 6.2.4 that for these devices SEC_CNT from the EXT_CSD is still valid even if the memory size for that device has dropped below 2 GB by the partition configuration applied. The access mode bits from the OCR register seem to provide a better way to decide whether to use the CSD-based C_SIZE & C_MULT or the EXT_CSD-based SEC_CNT information when determining the device's capacity. In particular, this fixes a bug where u-boot SPL would assign 0 to mmc->block_dev.lba later on in the mmc_startup() function and subsequently fail to load u-boot from that mmc due to the original C_SIZE & C_MULT code assigning a 4 TB size to mmc->capacity, that incorrect capacity never being overwritten by the SEC_CNT capacity calculation (due to its size being less than 2 GB) and then finally lldiv(mmc->capacity, mmc->read_bl_len) exceeding the 32-bit result data type of mmc->block_dev.lba. Signed-off-by: Frank Bormann <fbormann(a)yahoo.com> --- drivers/mmc/mmc.c | 10 +++++----- include/mmc.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index c6a1c23..c5d1efc 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -935,19 +935,19 @@ static int mmc_startup(struct mmc *mmc) if (!IS_SD(mmc) && (mmc->version >= MMC_VERSION_4)) { /* check ext_csd version and capacity */ err = mmc_send_ext_csd(mmc, ext_csd); - if (!err && (ext_csd[EXT_CSD_REV] >= 2)) { + if (!err && (ext_csd[EXT_CSD_REV] >= 2) && + (mmc->ocr & OCR_ACCESS_MODE) == OCR_ACCESS_BY_SECTOR) { /* * According to the JEDEC Standard, the value of - * ext_csd's capacity is valid if the value is more - * than 2GB + * ext_csd's capacity is valid if the device addresses + * its memory by sector */ capacity = ext_csd[EXT_CSD_SEC_CNT] << 0 | ext_csd[EXT_CSD_SEC_CNT + 1] << 8 | ext_csd[EXT_CSD_SEC_CNT + 2] << 16 | ext_csd[EXT_CSD_SEC_CNT + 3] << 24; capacity *= MMC_MAX_BLOCK_LEN; - if ((capacity >> 20) > 2 * 1024) - mmc->capacity_user = capacity; + mmc->capacity_user = capacity; } switch (ext_csd[EXT_CSD_REV]) { diff --git a/include/mmc.h b/include/mmc.h index e1060b9..816b580 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -104,6 +104,7 @@ #define OCR_HCS 0x40000000 #define OCR_VOLTAGE_MASK 0x007FFF80 #define OCR_ACCESS_MODE 0x60000000 +#define OCR_ACCESS_BY_SECTOR (1 << 30) #define SECURE_ERASE 0x80000000

2 2

[U-Boot] [PATCH] common: fixed linker-list example
by Mateusz Zalega 23 May '14

23 May '14

Last argument shouldn't be there. Change-Id: Ie227f4bee2c542b15c1a7089894532366ec89a1d Signed-off-by: Mateusz Zalega <m.zalega(a)samsung.com> Acked-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)ti.com> --- Detached from earlier "DFU, MMC, Gadget, Goni, misc." series because of lack of relevance to other patches. There were no changes since the first version of this patch. --- include/linker_lists.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linker_lists.h b/include/linker_lists.h index 997d149..557e627 100644 --- a/include/linker_lists.h +++ b/include/linker_lists.h @@ -228,7 +228,7 @@ * and it's name. * * Example: - * ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub, cmd.sub) = { + * ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub) = { * .x = 3, * .y = 4, * }; -- 1.9.0

3 7

[U-Boot] [PATCH] Add board_mmc_init(...) function for init mmc1 only
by Hannes Petermaier 23 May '14

23 May '14

Since B&R boards uses only MMC-Controller #1, it only wastes time if we initialize #0 first to see that there is nothing. Cc: <trini(a)ti.com> Signed-off-by: Hannes Petermaier <oe5hpm(a)oevsv.at> --- board/BuR/common/common.c | 7 +++++++ include/configs/kwb.h | 2 +- include/configs/tseries.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index 4c926ce..25cbe62 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -19,6 +19,7 @@ #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/arch/sys_proto.h> +#include <asm/arch/mmc_host_def.h> #include <asm/io.h> #include <asm/gpio.h> #include <i2c.h> @@ -214,3 +215,9 @@ int board_eth_init(bd_t *bis) return rv; } #endif /* CONFIG_DRIVER_TI_CPSW */ +#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +int board_mmc_init(bd_t *bis) +{ + return omap_mmc_init(1, 0, 0, -1, -1); +} +#endif diff --git a/include/configs/kwb.h b/include/configs/kwb.h index 0f631c0..0860434 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -109,7 +109,7 @@ #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 8fb87ac..e550afa 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -237,7 +237,7 @@ #elif defined(CONFIG_EMMC_BOOT) #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -- 1.7.9.5

2 1

[U-Boot] [RFC] tools/env: add support for ubi volume chardev
by Daniel Golle 23 May '14

23 May '14

Hi! fw_printenv/fw_setenv in tools/env currently doesn't support readring/writing directly from UBI volumes, which is supported in U-Boot itself since commit 2b74433f365fa677a60431a80e524b5d8d04e995. At that time gluebi mtd devices were widely used though never meant to be more than a legacy-hack. Kconfig clearly states "Do not enable this unless you use legacy software." Using gluebi with fw_printenv/fw_setenv is also quite dangerous, as numbering (and thus device names) of gluebi-emulated mtd devices is not consistent. As of today, ubiblock provides a much more conveniant way to access squashfs filesystems in UBI volumes and was included in linux.git in commit 9d54c8a33eec78289b1b3f6e10874719c27ce0a7. Most likely this is going to further reduce the use-cases where gluebi is needed. ubiblock devices, however, are read-only and cannot be used for fw_setenv. In the attempt to build a legacy-free system without gluebi, I added support for reading/writing the U-Boot environment directly from/to a UBI volume character device using libubi from mtd-utils http://git.infradead.org/mtd-utils.git/tree/HEAD:/ubi-utils The library is currently used only internally by ubi-utils and thus not installed or available for linking right now. Can mtd-utils/ubi-utils be changed to install libubi.a and the required headers so U-Boot's env-tool could link it? If not, the remaining options are to either clone libubi (or the needed parts of it) into the U-Boot sources or directly call that bunch of ioctls in the tool without using libubi at all. Which of these options would be preferable? I'm also not clear about how to properly integrate that into U-Boot's build system and currently use an additional make variable which allows to select whether or not to build support for UBI volumes. I tried to implement this in a way that makes it easy to verify that the existing codepaths are not hurt in case UBI support is disabled. Thank you for your advise! Daniel -- Signed-off-by: Daniel Golle <daniel(a)makrotopia.org> --- tools/env/Makefile | 5 ++++ tools/env/fw_env.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 69 insertions(+), 10 deletions(-) diff --git a/tools/env/Makefile b/tools/env/Makefile index f5368bc..d006a93 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -20,6 +20,11 @@ ifeq ($(MTD_VERSION),old) HOST_EXTRACFLAGS += -DMTD_OLD endif +ifeq ($(UBI),y) +HOST_EXTRACFLAGS += -DUBI +HOST_LOADLIBES = "-lubi" +endif + always := fw_printenv hostprogs-y := fw_printenv_unstripped diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 30d5b03..5c0acd5 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -29,6 +29,9 @@ # include <mtd/mtd-user.h> #endif +#ifdef UBI +# include <libubi.h> +#endif #include "fw_env.h" #include <aes.h> @@ -809,6 +812,11 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, off_t top_of_range; /* end of the last block we may use */ loff_t blockstart; /* running start of the current block - MEMGETBADBLOCK needs 64 bits */ +#ifdef UBI + libubi_t *libubi = NULL;/* pointer to libubi struct */ +#else + void *libubi = NULL; +#endif int rc; /* @@ -914,7 +922,30 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, continue; } - if (mtd_type != MTD_ABSENT) { +#ifdef UBI + if (mtd_type == MTD_UBIVOLUME) { + struct ubi_vol_info volinfo; + libubi = libubi_open(); + if (libubi) + rc = !ubi_get_vol_info(libubi, + DEVNAME(dev_current), &volinfo); + if (libubi && !rc) { + erasesize = volinfo.leb_size; + int leb = blockstart / erasesize; + if (volinfo.type != UBI_STATIC_VOLUME) + rc = ubi_leb_change_start(libubi, fd, + leb, erasesize); + else + rc = ubi_update_start(libubi, fd, + erasesize); + } + if (libubi && rc) { + libubi_close(libubi); + libubi = NULL; + } + } +#endif + if (!libubi && mtd_type != MTD_ABSENT) { erase.start = blockstart; ioctl(fd, MEMUNLOCK, &erase); /* These do not need an explicit erase cycle */ @@ -931,7 +962,8 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, fprintf (stderr, "Seek error on %s: %s\n", DEVNAME (dev), strerror (errno)); - return -1; + processed = -1; + goto out; } #ifdef DEBUG @@ -941,10 +973,11 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, if (write (fd, data + processed, erasesize) != erasesize) { fprintf (stderr, "Write error on %s: %s\n", DEVNAME (dev), strerror (errno)); - return -1; + processed = -1; + goto out; } - if (mtd_type != MTD_ABSENT) + if (!libubi && mtd_type != MTD_ABSENT) ioctl(fd, MEMLOCK, &erase); processed += erasesize; @@ -955,6 +988,9 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, if (write_total > count) free (data); +out: + if (libubi) + libubi_close(libubi); return processed; } @@ -1066,12 +1102,8 @@ static int flash_read (int fd) if (S_ISCHR(st.st_mode)) { rc = ioctl(fd, MEMGETINFO, &mtdinfo); - if (rc < 0) { - fprintf(stderr, "Cannot get MTD information for %s\n", - DEVNAME(dev_current)); - return -1; - } - if (mtdinfo.type != MTD_NORFLASH && + if (!rc && + mtdinfo.type != MTD_NORFLASH && mtdinfo.type != MTD_NANDFLASH && mtdinfo.type != MTD_DATAFLASH && mtdinfo.type != MTD_UBIVOLUME) { @@ -1079,6 +1111,28 @@ static int flash_read (int fd) mtdinfo.type, DEVNAME(dev_current)); return -1; } +#ifdef UBI + if (rc) { + libubi_t *libubi; + struct ubi_vol_info volinfo; + libubi = libubi_open(); + if (!libubi) + return -ENOMEM; + + rc = ubi_get_vol_info(libubi, DEVNAME(dev_current), + &volinfo); + if (rc) { + libubi_close(libubi); + return -ENODEV; + } + memset(&mtdinfo, 0, sizeof(mtdinfo)); + mtdinfo.type = MTD_UBIVOLUME; + mtdinfo.size = volinfo.data_bytes; + mtdinfo.erasesize = volinfo.leb_size; + mtdinfo.writesize = volinfo.leb_size; + libubi_close(libubi); + } +#endif } else { memset(&mtdinfo, 0, sizeof(mtdinfo)); mtdinfo.type = MTD_ABSENT; -- 1.9.3

1 0

[U-Boot] [PATCHv5 00/14] mmc: exynos: code cleanup and support DDR mode
by Jaehoon Chung 23 May '14

23 May '14

If card and host are supported DDR mode, then it can be used the DDR mode. This patch-set has dependency about beomho's patch-set. (Based-on u-boot-samsung repository) It's result for loading image. sdhci controller ->5260488 bytes read in 259 ms (19.4 MiB/s) dwmmc controller without DDR mode -> 5260488 bytes read in 202 ms (24.8 MiB/s) dwmmc controller with DDR mode -> 5260488 bytes read in 118 ms (42.5 MiB/s) Download the 400M image with lthor. sdhci controller -> 59.4sec (Avg 6.95 MB/s) dwmmc controller without DDR mode -> 61.6sec (Avg 6.72MB/s) dwmmc controller with DDR mode -> 60.4sec (Avg 6.85MB/s) Beomho Seo (3): arm: exynos: pinmux: add sdmmc4 gpio configratuion arm: exynos: clock: Remove exynos4x12_set_mmc_clk function board: trats2: Enable device tree on Trats2 Jaehoon Chung (11): ARM: exynos: board: change the mmc/sd init sequence ARM: exynos: clock: modify the set_mmc_clk for exynos4 ARM: dts: exynos: rename from EXYNOS5_DWMMC to EXYNOS_DWMMC mmc: exynos_dw_mmc: restore the property into host mmc: remove the unnecessary define and fix the wrong bit control mmc: support the DDR mode for eMMC mmc: dw_mmc: support the DDR mode ARM: dts: exnyos: enable dw-mmc controller mmc: exynos_dw_mmc: enable the DDR mode ARM: exynos4: enable the dwmmc configuration mmc: s5p_sdhci: add the s5p_sdhci_core_init function arch/arm/cpu/armv7/exynos/clock.c | 45 ++----- arch/arm/cpu/armv7/exynos/pinmux.c | 35 ++++- arch/arm/dts/exynos4.dtsi | 8 ++ arch/arm/dts/exynos4412-trats2.dts | 12 ++ arch/arm/dts/exynos5.dtsi | 8 +- arch/arm/include/asm/arch-exynos/clk.h | 5 + board/samsung/common/board.c | 13 +- doc/device-tree-bindings/exynos/dwmmc.txt | 8 +- drivers/mmc/dw_mmc.c | 12 +- drivers/mmc/exynos_dw_mmc.c | 205 +++++++++++++++++++---------- drivers/mmc/mmc.c | 16 ++- drivers/mmc/s5p_sdhci.c | 42 +++--- include/configs/exynos4-dt.h | 3 + include/dwmmc.h | 5 + include/fdtdec.h | 2 +- include/mmc.h | 25 ++-- lib/fdtdec.c | 2 +- 17 files changed, 275 insertions(+), 171 deletions(-) -- 1.7.9.5

3 20

[U-Boot] [PATCH] powerpc/mpc85xx: Add workaround for DDR erratum A004508
by York Sun 22 May '14

22 May '14

When the DDR controller is initialized below a junction temperature of 0°C and then operated above a junction temperature of 65°C, the DDR controller may cause receive data errors, resulting ECC errors and/or corrupted data. This erratum applies to the following SoCs and their variants: MPC8536, MPC8569, MPC8572, P1010, P1020, P1021, P1022, P1023, P2020. Signed-off-by: York Sun <yorksun(a)freescale.com> --- arch/powerpc/cpu/mpc85xx/cmd_errata.c | 3 +++ arch/powerpc/include/asm/config_mpc85xx.h | 18 ++++++++++++++++++ drivers/ddr/fsl/ctrl_regs.c | 9 +++++++++ 3 files changed, 30 insertions(+) diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index 3d37a76..f69c834 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -231,6 +231,9 @@ static int do_errata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if ((SVR_MAJ(svr) == 1) || IS_SVR_REV(svr, 2, 0)) puts("Work-around for Erratum NMG ETSEC129 enabled\n"); #endif +#ifdef CONFIG_SYS_FSL_ERRATUM_A004508 + puts("Work-around for Erratum A004508 enabled\n"); +#endif #ifdef CONFIG_SYS_FSL_ERRATUM_A004510 puts("Work-around for Erratum A004510 enabled\n"); #endif diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 34fc8fb..c9fd2a5 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -38,6 +38,7 @@ #define CONFIG_SYS_PPC_E500_DEBUG_TLB 1 #define CONFIG_SYS_FSL_SEC_COMPAT 2 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #elif defined(CONFIG_MPC8540) @@ -122,6 +123,7 @@ #define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5 #define CONFIG_SYS_FSL_RMU #define CONFIG_SYS_FSL_SRIO_MSG_UNIT_NUM 2 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #elif defined(CONFIG_MPC8572) @@ -132,6 +134,7 @@ #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 #define CONFIG_SYS_FSL_ERRATUM_DDR_115 #define CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #elif defined(CONFIG_P1010) @@ -154,6 +157,7 @@ #define CONFIG_SYS_FSL_ERRATUM_IFC_A003399 #define CONFIG_SYS_FSL_ERRATUM_A005125 #define CONFIG_SYS_FSL_ERRATUM_I2C_A004447 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A007075 #define CONFIG_SYS_FSL_ERRATUM_A006261 #define CONFIG_SYS_FSL_A004447_SVR_REV 0x10 @@ -171,6 +175,7 @@ #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 #define CONFIG_SYS_FSL_ERRATUM_ELBC_A001 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 /* P1012 is single core version of P1021 */ @@ -188,6 +193,7 @@ #define QE_MURAM_SIZE 0x6000UL #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 /* P1013 is single core version of P1022 */ @@ -202,6 +208,7 @@ #define CONFIG_SYS_FSL_ERRATUM_ELBC_A001 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111 #define CONFIG_FSL_SATA_ERRATUM_A001 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #elif defined(CONFIG_P1014) @@ -219,6 +226,7 @@ #define CONFIG_SYS_FSL_ERRATUM_IFC_A002769 #define CONFIG_SYS_FSL_ERRATUM_P1010_A003549 #define CONFIG_SYS_FSL_ERRATUM_IFC_A003399 +#define CONFIG_SYS_FSL_ERRATUM_A004508 /* P1017 is single core version of P1023 */ #elif defined(CONFIG_P1017) @@ -234,6 +242,7 @@ #define CONFIG_SYS_FM_MURAM_SIZE 0x10000 #define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2" #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff600000 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #elif defined(CONFIG_P1020) @@ -246,6 +255,7 @@ #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 #define CONFIG_SYS_FSL_ERRATUM_ELBC_A001 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 @@ -264,6 +274,7 @@ #define QE_MURAM_SIZE 0x6000UL #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 @@ -278,6 +289,7 @@ #define CONFIG_SYS_FSL_ERRATUM_ELBC_A001 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111 #define CONFIG_FSL_SATA_ERRATUM_A001 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #elif defined(CONFIG_P1023) @@ -293,6 +305,7 @@ #define CONFIG_SYS_FM_MURAM_SIZE 0x10000 #define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2" #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff600000 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #define CONFIG_SYS_FSL_ERRATUM_I2C_A004447 #define CONFIG_SYS_FSL_A004447_SVR_REV 0x11 @@ -309,6 +322,7 @@ #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 #define CONFIG_SYS_FSL_ERRATUM_ELBC_A001 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 /* P1025 is lower end variant of P1021 */ @@ -326,6 +340,7 @@ #define QE_MURAM_SIZE 0x6000UL #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 /* P2010 is single core version of P2020 */ @@ -338,6 +353,7 @@ #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111 #define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #elif defined(CONFIG_P2020) @@ -353,8 +369,10 @@ #define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5 #define CONFIG_SYS_FSL_RMU #define CONFIG_SYS_FSL_SRIO_MSG_UNIT_NUM 2 +#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 + #elif defined(CONFIG_PPC_P2041) /* also supports P2040 */ #define CONFIG_SYS_FSL_QORIQ_CHASSIS1 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index 78e82bb..38654ff 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -2304,5 +2304,14 @@ compute_fsl_memctl_config_regs(const memctl_options_t *popts, ddr->debug[2] = 0x00000400; ddr->debug[4] = 0xff800000; #endif + + if ((ip_rev >= 0x40000) && (ip_rev < 0x40400)) { +#ifdef CONFIG_SYS_FSL_ERRATUM_A004508 + ddr->debug[2] |= 0x00000200; /* set bit 22 */ +#else + puts("Warning: Workaround for A004508 is not enabled.\n"); +#endif + } + return check_fsl_memctl_config_regs(ddr); } -- 1.7.9.5

1 0

[U-Boot] [GIT PULL] Fpga changes - next round
by Michal Simek 22 May '14

22 May '14

Hi Tom, here is the next round of fpga patches. Please pull them to your tree. Thanks, Michal [u-boot]$ ./tools/buildman/buildman -b fpga zynq x600 omap3_mvblx mt_ventoux iocon grsim grsim_leon2 coreboot balloon3 astro_mcf5373l alpr MVSMR MVBLM7 MVBC_P GEN860T matrix_vision -sSed Summary of 8 commits for 22 boards (4 threads, 1 job per thread) 01: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx m68k: + astro_mcf5373l powerpc: + alpr iocon +/mnt/disk/fpga/.bm-work/00/arch/m68k/cpu/mcf532x/cpu_init.c: In function 'cpu_init_f': +/mnt/disk/fpga/.bm-work/00/arch/m68k/cpu/mcf532x/cpu_init.c:211:10: warning: unused variable 'wdog' [-Wunused-variable] +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c: In function 'do_bootm_linux': +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:53:8: warning: unused variable 'rd_len' [-Wunused-variable] +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:99:12: warning: 'initrd_start' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:99:12: warning: 'initrd_end' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:99:12: warning: 'cmd_start' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:99:12: warning: 'cmd_end' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/mcf5373l.c: In function 'initdram': +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/mcf5373l.c:83:5: warning: pointer targets in passing argument 1 of 'get_ram_size' differ in signedness [-Wpointer-sign] +/mnt/disk/fpga/.bm-work/00/include/common.h:470:6: note: expected 'long int *' but argument is of type 'long unsigned int *' +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/fpga.c:168:2: warning: initialization from incompatible pointer type [enabled by default] +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/fpga.c:168:2: warning: (near initialization for 'altera_fns.write') [enabled by default] +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/fpga.c: In function 'astro5373l_altera_load': +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/fpga.c:196:20: warning: assignment from incompatible pointer type [enabled by default] +powerpc-unknown-linux-gnu-ld: section .bootpg [fffff000 -> fffff27f] overlaps section .reloc [ffffc600 -> fffff02b] +powerpc-unknown-linux-gnu-ld: u-boot: section .text vma 0xfffc0000 overlaps previous sections +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14b8 overlaps previous sections +powerpc-unknown-linux-gnu-ld: u-boot: section .reloc vma 0xffffc600 overlaps previous sections +powerpc-unknown-linux-gnu-ld: u-boot: section .bootpg vma 0xfffff000 overlaps previous sections +powerpc-unknown-linux-gnu-ld: u-boot: section .data vma 0xfffff02c overlaps previous sections +powerpc-unknown-linux-gnu-ld: u-boot: section .resetvec vma 0xfffffffc overlaps previous sections +powerpc-unknown-linux-gnu-ld: u-boot: section `.text' can't be allocated in segment 0 +LOAD: .u_boot_list .text .rodata .reloc .bootpg .data .resetvec +powerpc-unknown-linux-gnu-ld: final link failed: Bad value +make[1]: *** [u-boot] Error 1 +make: *** [sub-make] Error 2 +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff6ed0 overlaps previous sections +LOAD: .reloc .data .u_boot_list .text .rodata .resetvec 02: configs: iocom: Fix typo on CMD_FPGA command -powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff6ed0 overlaps previous sections +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff6dac overlaps previous sections 03: fpga: Guard the LOADMK functionality with CMD_FPGA_LOADMK powerpc: (for 6/8 boards) all -94.7 data -5.3 text -89.3 MERGERBOX : all -568 data -32 text -536 04: fpga: Define bitstream type based on command selection -powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14b8 overlaps previous sections +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14c0 overlaps previous sections powerpc: (for 6/8 boards) all +21.3 text +21.3 MVSMR : all +32 text +32 GEN860T : all +32 text +32 GEN860T_SC : all +32 text +32 MVBC_P : all +16 text +16 MVBLM7 : all +16 text +16 m68k: (for 1/1 boards) all +40.0 text +40.0 astro_mcf5373l : all +40 text +40 arm: (for 10/10 boards) all +33.2 bss +0.8 text +32.4 mt_ventoux : all +68 bss +32 text +36 zynq_microzed : all +64 bss +28 text +36 zynq_zc770_xm013: all +36 text +36 zynq_zc770_xm012: all +36 text +36 zynq_zc770_xm010: all +32 bss -4 text +36 x600 : all +32 text +32 zynq_zed : all +32 bss -4 text +36 zynq_zc70x : all +32 bss -4 text +36 omap3_mvblx : bss -8 text +8 balloon3 : bss -32 text +32 05: fpga: Add support to load partial bitstreams -powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14c0 overlaps previous sections +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14c8 overlaps previous sections powerpc: (for 6/8 boards) all +5.3 text +5.3 MERGERBOX : all +16 text +16 GEN860T : all +8 text +8 GEN860T_SC : all +8 text +8 arm: (for 10/10 boards) all +12.0 bss +4.0 text +8.0 omap3_mvblx : all +64 bss +56 text +8 zynq_zed : all +32 bss +24 text +8 zynq_zc770_xm013: all +8 text +8 zynq_zc770_xm012: all +8 text +8 x600 : all +8 text +8 zynq_zc770_xm010: bss -8 text +8 zynq_microzed : bss -8 text +8 mt_ventoux : bss -8 text +8 zynq_zc70x : bss -8 text +8 balloon3 : bss -8 text +8 06: fpga: zynqpl: Clean partial bitstream handling arm: (for 10/10 boards) all -43.2 rodata -21.6 text -21.6 zynq_zc770_xm010: all -72 rodata -36 text -36 zynq_zc770_xm013: all -72 rodata -36 text -36 zynq_microzed : all -72 rodata -36 text -36 zynq_zc770_xm012: all -72 rodata -36 text -36 zynq_zed : all -72 rodata -36 text -36 zynq_zc70x : all -72 rodata -36 text -36 07: zynq: Enable fpga loadp and loadbp commands arm: (for 10/10 boards) all +201.6 rodata +120.0 text +81.6 zynq_zc770_xm010: all +352 bss +16 rodata +200 text +136 zynq_zc70x : all +352 bss +16 rodata +200 text +136 zynq_zc770_xm013: all +336 rodata +200 text +136 zynq_zc770_xm012: all +336 rodata +200 text +136 zynq_microzed : all +320 bss -16 rodata +200 text +136 zynq_zed : all +320 bss -16 rodata +200 text +136 08: fpga: Added support to load bit stream from SD/MMC powerpc: (for 6/8 boards) all +2.0 data +2.0 MVSMR : all +4 data +4 GEN860T : all +4 data +4 GEN860T_SC : all +4 data +4 m68k: (for 1/1 boards) all +4.0 data +4.0 astro_mcf5373l : all +4 data +4 arm: (for 10/10 boards) all +776.0 bss -1.2 data +3.6 rodata +120.0 text +653.6 zynq_zc770_xm013: all +1368 data +4 rodata +200 text +1164 zynq_zc770_xm012: all +1368 data +4 rodata +200 text +1164 zynq_zc770_xm010: all +1256 data +4 rodata +200 text +1052 zynq_microzed : all +1256 data +4 rodata +200 text +1052 zynq_zed : all +1256 data +4 rodata +200 text +1052 zynq_zc70x : all +1256 data +4 rodata +200 text +1052 x600 : bss -4 data +4 mt_ventoux : bss -4 data +4 balloon3 : bss -4 data +4 The following changes since commit d7782d06534fe4fa47a49fa7c106de5ba85a9687: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-05-16 18:30:33 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git fpga for you to fetch changes up to 1a897668ac33c57ca76f47cb940ec32b405e90dd: fpga: Added support to load bit stream from SD/MMC (2014-05-20 15:23:46 +0200) ---------------------------------------------------------------- Michal Simek (5): configs: iocom: Fix typo on CMD_FPGA command fpga: Define bitstream type based on command selection fpga: Add support to load partial bitstreams fpga: zynqpl: Clean partial bitstream handling zynq: Enable fpga loadp and loadbp commands Siva Durga Prasad Paladugu (2): fpga: Guard the LOADMK functionality with CMD_FPGA_LOADMK fpga: Added support to load bit stream from SD/MMC README | 13 +++++++++++++ board/matrix_vision/common/mv_common.c | 2 +- common/cmd_fpga.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- drivers/fpga/fpga.c | 36 +++++++++++++++++++++++++++++++++--- drivers/fpga/spartan2.c | 3 ++- drivers/fpga/spartan3.c | 3 ++- drivers/fpga/virtex2.c | 3 ++- drivers/fpga/xilinx.c | 26 ++++++++++++++++++++++---- drivers/fpga/zynqpl.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------- include/configs/GEN860T.h | 1 + include/configs/MVBC_P.h | 1 + include/configs/MVBLM7.h | 1 + include/configs/MVSMR.h | 1 + include/configs/alpr.h | 1 + include/configs/astro_mcf5373l.h | 1 + include/configs/balloon3.h | 1 + include/configs/coreboot.h | 1 + include/configs/grsim.h | 1 + include/configs/grsim_leon2.h | 1 + include/configs/iocon.h | 3 ++- include/configs/mt_ventoux.h | 1 + include/configs/omap3_mvblx.h | 1 + include/configs/x600.h | 1 + include/configs/zynq-common.h | 4 ++++ include/fpga.h | 20 ++++++++++++++++++-- include/xilinx.h | 8 ++++++-- 26 files changed, 297 insertions(+), 33 deletions(-) -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

2 1

[U-Boot] [PULL] u-boot-usb/pr-15052014
by Marek Vasut 22 May '14

22 May '14

This applies _after_ my previous u-boot-usb/master PR please. The following changes since commit 2072e7262965bb48d7fffb1e283101e6ed8b21a8: mvtwsi: Remove unnecessary twsi_baud_rate and twsi_slave_address globals (2014-05-14 12:59:12 +0200) are available in the git repository at: git://git.denx.de/u-boot-usb.git pr-15052014 for you to fetch changes up to c8151b4a5de136ea2c2a0e6e9aec481810ee0460: dfu: mmc: Provide support for eMMC boot partition access (2014-05-15 00:24:24 +0200) ---------------------------------------------------------------- Heiko Schocher (2): musb-new, dfu: first send request answer then call completions dfu, nand: add medium specific polltimeout function Lukasz Majewski (1): dfu: mmc: Provide support for eMMC boot partition access Marek Vasut (1): Merge remote-tracking branch 'u-boot/master' into test Przemyslaw Marczak (2): drivers:dfu: dfu_flush(): add raw data flush to complete dfu write usb:gadget:f_thor: download_tail(): remove dfu_write with 0 size Rob Herring (1): arm: beagle: enable Android fastboot support Sebastian Siewior (2): image: add support for Android's boot image format usb/gadget: add the fastboot gadget Stephen Warren (15): usb: ci_udc: allow multiple buffer allocs per ep usb: ums: remove ci_udc special case usb: ums: add error handling for failed registration ums: support block devices not MMC devices ums: remove UMS_{NUM,START}_SECTORS + UMS_START_SECTOR ums: remove error-checking of MMC device size ums: remove ums_disk_init() ums: move IO support code to common location ums: use get_device() not find_mmc_device(); ums: move all variable declarations to the start of the block ums: allow the user to specify the device type usb: tegra: fix PHY selection code usb: tegra: refactor PHY type selection usb: tegra: support device mode usb: ci_udc: parse QTD before over-writing it README | 22 +++++ arch/arm/include/asm/arch-tegra/usb.h | 2 + board/samsung/common/Makefile | 1 - board/samsung/common/ums.c | 74 --------------- common/Makefile | 3 + common/cmd_bootm.c | 23 ++++- common/cmd_fastboot.c | 36 +++++++ common/cmd_usb_mass_storage.c | 91 +++++++++++++++--- common/image-android.c | 84 +++++++++++++++++ common/image.c | 20 +++- doc/README.android-fastboot | 91 ++++++++++++++++++ doc/README.android-fastboot-protocol | 170 +++++++++++++++++++++++++++++++++ drivers/dfu/dfu.c | 4 + drivers/dfu/dfu_mmc.c | 46 +++++++++ drivers/dfu/dfu_nand.c | 13 +++ drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/ci_udc.c | 182 +++++++++++++++++++++++------------ drivers/usb/gadget/ci_udc.h | 17 +++- drivers/usb/gadget/f_dfu.c | 10 +- drivers/usb/gadget/f_fastboot.c | 513 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/f_thor.c | 12 +-- drivers/usb/gadget/storage_common.c | 4 - drivers/usb/host/ehci-tegra.c | 165 ++++++++++++++++++++------------ drivers/usb/musb-new/musb_gadget_ep0.c | 8 +- include/android_image.h | 69 ++++++++++++++ include/configs/omap3_beagle.h | 10 ++ include/dfu.h | 4 + include/image.h | 13 +++ include/usb_mass_storage.h | 13 +-- 29 files changed, 1454 insertions(+), 247 deletions(-) delete mode 100644 board/samsung/common/ums.c create mode 100644 common/cmd_fastboot.c create mode 100644 common/image-android.c create mode 100644 doc/README.android-fastboot create mode 100644 doc/README.android-fastboot-protocol create mode 100644 drivers/usb/gadget/f_fastboot.c create mode 100644 include/android_image.h

2 1

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 22 May '14

22 May '14

I will have one more PR lined up later on after this is in. The following changes since commit 173d294b94cfec10063a5be40934d6d8fb7981ce: Merge branch 'serial' of git://www.denx.de/git/u-boot-microblaze (2014-05-06 14:55:45 -0400) are available in the git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to fc25fa27e5f439705e9ca42182014e2d75d9f0ae: dfu, nand: add medium specific polltimeout function (2014-05-08 10:38:30 +0200) ---------------------------------------------------------------- Heiko Schocher (2): musb-new, dfu: first send request answer then call completions dfu, nand: add medium specific polltimeout function Rob Herring (1): arm: beagle: enable Android fastboot support Sebastian Siewior (2): image: add support for Android's boot image format usb/gadget: add the fastboot gadget Stephen Warren (11): usb: ci_udc: allow multiple buffer allocs per ep usb: ums: remove ci_udc special case usb: ums: add error handling for failed registration ums: support block devices not MMC devices ums: remove UMS_{NUM,START}_SECTORS + UMS_START_SECTOR ums: remove error-checking of MMC device size ums: remove ums_disk_init() ums: move IO support code to common location ums: use get_device() not find_mmc_device(); ums: move all variable declarations to the start of the block ums: allow the user to specify the device type README | 22 +++++ board/samsung/common/Makefile | 1 - board/samsung/common/ums.c | 74 --------------- common/Makefile | 3 + common/cmd_bootm.c | 23 ++++- common/cmd_fastboot.c | 36 +++++++ common/cmd_usb_mass_storage.c | 91 +++++++++++++++--- common/image-android.c | 84 +++++++++++++++++ common/image.c | 20 +++- doc/README.android-fastboot | 91 ++++++++++++++++++ doc/README.android-fastboot-protocol | 170 +++++++++++++++++++++++++++++++++ drivers/dfu/dfu_nand.c | 13 +++ drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/ci_udc.c | 180 +++++++++++++++++++++++------------ drivers/usb/gadget/ci_udc.h | 17 +++- drivers/usb/gadget/f_dfu.c | 10 +- drivers/usb/gadget/f_fastboot.c | 513 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/storage_common.c | 4 - drivers/usb/musb-new/musb_gadget_ep0.c | 8 +- include/android_image.h | 69 ++++++++++++++ include/configs/omap3_beagle.h | 10 ++ include/dfu.h | 1 + include/image.h | 13 +++ include/usb_mass_storage.h | 13 +-- 24 files changed, 1289 insertions(+), 178 deletions(-) delete mode 100644 board/samsung/common/ums.c create mode 100644 common/cmd_fastboot.c create mode 100644 common/image-android.c create mode 100644 doc/README.android-fastboot create mode 100644 doc/README.android-fastboot-protocol create mode 100644 drivers/usb/gadget/f_fastboot.c create mode 100644 include/android_image.h

2 1

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 22 May '14

22 May '14

Hello Tom, The following changes since commit d7782d06534fe4fa47a49fa7c106de5ba85a9687: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-05-16 18:30:33 -0400) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to 05d134b084590684bcf4d832c0035952727b7cd9: Merge remote-tracking branch 'u-boot/master' (2014-05-20 10:05:42 +0200) Note: there still is a Zynq PR pending right now, but I wanted to get re-synchronized with mainline first; a further PR with Zynq and individual patches will arrive soon. ---------------------------------------------------------------- Akshay Saraswat (3): Exynos5: config: Enable FIT S5P: Exynos: Add GPIO pin numbering and rename definitions S5P: Exynos: Config: Enable GPIO CMD config Albert ARIBAUD (12): arm1136: move cache code from start.S to cache.c arm: move reset_cpu from start.S into cpu.c arm: pxa: move SP check from start.S to cpuinfo.c arm: remove unused _end_vect and _vectors_end symbols arm: move exception handling out of start.S files Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge remote-tracking branch 'u-boot-sh/rmobile' boards.cfg: reformat Merge remote-tracking branch 'u-boot/master' Ash Charles (1): am335x: pepper: Add Gumstix Pepper AM335x-based machine Belisko Marek (1): mtd: nand: omap_gpmc: Fix update of read_ecc in oob Christian Riesch (1): arm, davinci: Use CONFIG_SPL_PAD_TO for padding the SPL in an ais image Dmitry Lifshitz (3): ARM: OMAP5: add UART4 support ARM: OMAP5: Power: add LDO2 support for Palmas driver ARM: OMAP5: add CKO buffer control mask Egli, Samuel (7): siemens: cosmetic: remove unused and rename defines siemens: update DDR3 parameters for dxr2 siemens: add led cmd for flexible LED control siemens: change LED indication in DFU mode siemens: cosmetic: rename project_dir siemens:cosmetic, dxr2: rename dxr2 to draco siemens, draco: add new target Eric Benard (8): imx-common: add board_video_skip nitrogen6x: use common board_video_skip mx6sabresd: use common board_video_skip RiOTboard and MarSBoard: add new boards support imx-common/video: add detect_hdmi nitrogen6x: use common detect_hdmi mx6sabresd: use common detect_hdmi embest/mx6boards: use common detect_hdmi Eric Nelson (1): ARM: imx6: nitrogen6x: Enable CONFIG_SYS_GENERIC_BOARD Fabio Estevam (11): wandboard: Convert to generic board mx53loco: Convert to generic board mx6sabre_common: Convert to generic board mx53ard: Convert to generic board mx53smd: Convert to generic board mx53evk: Convert to generic board udoo: Convert to generic board hummingboard: Convert to generic board mx6slevk: Add SPI NOR flash support nitrogen6x: Fix the PAD settings for the ECSPI chipselect iomux-v3: Add support for mx6sl LVE bit Inha Song (1): samsung: misc: add env default option to lcd menu Jaehoon Chung (1): ARM: exynos: remove the unused code Khoronzhuk, Ivan (1): config: k2hk_evm: Add generic board support Marek Vasut (1): arm: mxs: Enable CONFIG_SYS_GENERIC_BOARD Mateusz Zalega (1): ARM: Samsung: s5p_goni: maintainer update Nobuhiro Iwamatsu (22): arm: rmobile: Coordinate the common part of the header file of r8a7790 and r8a7791 arm: rmobile: r8a779x: Fix L2 cache init and latency setting arm: rmobile: koelsch: Change name of structure arm: rmobile: koelsch: Remove NOR-Flash support arm: rmobile: lager: Change name of the structure arm: rmobile: lager: Remove NOR-Flash support arm: rmobile: Merge functions to get the CPU information of R8A7790 and R8A7791 arm: rmobile: Add 1 to value of the CPU revision in rmobile_get_cpu_rev_integer() arm: rmobile: Add rmobile_get_cpu_rev_fraction() for R-Car SoCs arm: rmobile: Add prototype for function to get the CPU information to rmobile.h arm: rmobile: Update print_cpuinfo function arm: rmobile: r8a7790: Add support ES2 revision arm: rmobile: r8a7791: Add support ES2 revision arm: rmobile: keolsch: Add support ES2 revision of R8A7791 arm: rmobile: lager: Update QoS initialization to version 0.955 arm: rmobile: koelsch: Update QoS initialization arm: rmobile: koelsch: Update calculation of CONFIG_SH_TMU_CLK_FREQ arm: rmobile: Add register infomation of PLL regsiter arm: rmobile: koelsch: Change to maximum CPU frequency arm: rmobile: lager: Update calculation of CONFIG_SH_TMU_CLK_FREQ arm: rmobile: lager: Change to maximum CPU frequency arm: rmobile: lager: Remove MACH_TYPE_LAGER and CONFIG_MACH_TYPE Otavio Salvador (2): wandboard: add Future Eletronics 7" WVGA LCD extension board wandboard: Pass video kernel arguments for HDMI and LCD Przemyslaw Marczak (4): samsung: misc: allows using environmental macros as args in menu commands samsung: misc: add gpt restore option to lcd menu samsung: misc: menu: increase delay in menu main loop samsung: misc: remove download mode info screen Robert Nelson (2): omap3_beagle: use omap3-beagle-xm-ab.dtb for the xM AB revision omap3_beagle: xM A/B validate new dtb exits in file system Stefano Babic (3): mx6: fix weird formatting in imx6q-sabreauto.dts Merge branch 'master' of git://git.denx.de/u-boot-arm Merge branch 'master' of git://git.denx.de/u-boot-arm Stephen Warren (10): ARM: tegra: set CONFIG_SYS_MMC_MAX_DEVICE ARM: tegra: fix CPU VDD comment in Tegra30 CPU init code ARM: tegra: allow pinmux mux option not to be set by init tables ARM: tegra: add GPIO initialization table function ARM: tegra: add function to enable input clamping on tristate ARM: tegra: make use of GPIO init table on Jetson TK1 ARM: tegra: clamp inputs on Jetson TK1 ARM: tegra: update Venice2 pinmux ARM: tegra: Venice2 pinmux spreadsheet updates ARM: tegra: use a CPU freq that all SKUs can support Thomas Diener (2): imx25: Add new hardware registers video: Add support for imx25 lcd controller Tim Harvey (10): ventana: fixed comments in eeprom header ventana: remove redundant include power: make pfuze100 be able to coexist with other pmics ventana: use non-generic pfuze100 init power: Add support for LTC3676 PMIC ventana: Add support for the LTC3676 PMIC imx6: ventana: fix system-serial dt property imx: ventana: Convert to generic board imx: ventana: add HDMI and LVDS display capability nand: remove CONFIG_SYS_NAND_PAGE_SIZE Yegor Yefremov (1): am33xx: add SSC enable macro Łukasz Majewski (2): trats2: config: fix: Set default console to ttySAC2 trats: config: fix: Set default console to ttySAC2 Makefile | 2 +- arch/arm/cpu/arm1136/start.S | 254 +------------- arch/arm/cpu/arm1176/start.S | 198 +---------- arch/arm/cpu/arm720t/start.S | 229 +------------ arch/arm/cpu/arm720t/tegra-common/cpu.c | 10 +- arch/arm/cpu/arm720t/tegra30/cpu.c | 23 +- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 3 +- arch/arm/cpu/arm920t/start.S | 216 +----------- arch/arm/cpu/arm926ejs/mxs/start.S | 92 +----- arch/arm/cpu/arm926ejs/spear/start.S | 27 +- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 1 + arch/arm/cpu/arm926ejs/start.S | 262 +-------------- arch/arm/cpu/arm946es/cpu.c | 13 + arch/arm/cpu/arm946es/start.S | 246 +------------- arch/arm/cpu/arm_intcm/start.S | 228 +------------ arch/arm/cpu/armv7/exynos/pinmux.c | 561 +++++++++++++++++-------------- arch/arm/cpu/armv7/rmobile/Makefile | 4 +- arch/arm/cpu/armv7/rmobile/cpu_info-r8a7791.c | 29 -- arch/arm/cpu/armv7/rmobile/{cpu_info-r8a7790.c => cpu_info-rcar.c} | 12 +- arch/arm/cpu/armv7/rmobile/cpu_info.c | 49 ++- arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S | 20 +- arch/arm/cpu/armv7/socfpga/lowlevel_init.S | 15 +- arch/arm/cpu/armv7/start.S | 253 +------------- arch/arm/cpu/armv7/zynq/u-boot.lds | 2 +- arch/arm/cpu/pxa/cpuinfo.c | 6 + arch/arm/cpu/pxa/start.S | 253 +------------- arch/arm/cpu/sa1100/cpu.c | 14 + arch/arm/cpu/sa1100/start.S | 225 +------------ arch/arm/cpu/tegra-common/pinmux-common.c | 19 ++ arch/arm/cpu/u-boot-spl.lds | 1 + arch/arm/cpu/u-boot.lds | 1 + arch/arm/dts/exynos4210-origen.dts | 4 +- arch/arm/dts/exynos4210-trats.dts | 6 +- arch/arm/dts/exynos4210-universal_c210.dts | 4 +- arch/arm/dts/exynos4412-trats2.dts | 4 +- arch/arm/dts/imx6q-sabreauto.dts | 10 +- arch/arm/imx-common/Makefile | 1 + arch/arm/imx-common/iomux-v3.c | 8 + arch/arm/imx-common/video.c | 65 ++++ arch/arm/include/asm/arch-am33xx/clock.h | 2 + arch/arm/include/asm/arch-exynos/cpu.h | 17 +- arch/arm/include/asm/arch-exynos/gpio.h | 1761 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- arch/arm/include/asm/arch-mx25/imx-regs.h | 175 ++++++++++ arch/arm/include/asm/arch-mx6/mx6sl_pins.h | 4 + arch/arm/include/asm/arch-omap5/clock.h | 3 + arch/arm/include/asm/arch-omap5/omap.h | 1 + arch/arm/include/asm/arch-rmobile/r8a7790.h | 609 +--------------------------------- arch/arm/include/asm/arch-rmobile/r8a7791.h | 626 +---------------------------------- arch/arm/include/asm/arch-rmobile/rcar-base.h | 637 +++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-rmobile/rmobile.h | 6 + arch/arm/include/asm/arch-s5pc1xx/gpio.h | 948 ++++++++++++++++++++++++++++++++++++++++++++-------- arch/arm/include/asm/arch-tegra/gpio.h | 20 ++ arch/arm/include/asm/arch-tegra/pinmux.h | 5 + arch/arm/include/asm/arch-tegra/tegra_mmc.h | 2 - arch/arm/include/asm/arch-tegra114/pinmux.h | 1 + arch/arm/include/asm/arch-tegra124/pinmux.h | 1 + arch/arm/include/asm/arch-tegra20/pinmux.h | 1 + arch/arm/include/asm/arch-tegra30/pinmux.h | 1 + arch/arm/include/asm/imx-common/iomux-v3.h | 5 + arch/arm/include/asm/imx-common/video.h | 24 ++ arch/arm/lib/Makefile | 2 +- arch/arm/lib/cache.c | 13 +- arch/arm/lib/vectors.S | 291 ++++++++++++++++ board/boundary/nitrogen6x/nitrogen6x.c | 69 +--- board/compulab/cm_t335/u-boot.lds | 1 + board/embest/mx6boards/Makefile | 9 + board/embest/mx6boards/mx6boards.c | 601 +++++++++++++++++++++++++++++++++ board/freescale/mx31ads/u-boot.lds | 1 + board/freescale/mx6sabresd/mx6sabresd.c | 67 +--- board/freescale/mx6slevk/mx6slevk.c | 20 ++ board/gateworks/gw_ventana/gw_ventana.c | 215 ++++++++++-- board/gateworks/gw_ventana/ventana_eeprom.h | 14 +- board/gumstix/pepper/Makefile | 13 + board/gumstix/pepper/board.c | 226 +++++++++++++ board/gumstix/pepper/board.h | 19 ++ board/gumstix/pepper/mux.c | 78 +++++ board/nvidia/jetson-tk1/jetson-tk1.c | 6 + board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 256 +++++++++----- board/nvidia/venice2/pinmux-config-venice2.h | 567 +++++++++++++++---------------- board/nvidia/venice2/venice2.c | 19 +- board/renesas/koelsch/koelsch.c | 194 +---------- board/renesas/koelsch/qos.c | 404 ++++++++++++++--------- board/renesas/lager/lager.c | 196 +---------- board/renesas/lager/qos.c | 236 ++++++------- board/samsung/arndale/arndale.c | 11 +- board/samsung/common/misc.c | 130 ++++---- board/samsung/goni/goni.c | 32 +- board/samsung/smdk5250/exynos5-dt.c | 20 +- board/samsung/smdk5250/smdk5250.c | 19 +- board/samsung/smdk5420/smdk5420.c | 15 +- board/samsung/smdkc100/smdkc100.c | 5 +- board/samsung/smdkv310/smdkv310.c | 19 +- board/samsung/trats/trats.c | 39 +-- board/samsung/trats2/trats2.c | 74 ++--- board/samsung/universal_c210/universal.c | 51 ++- board/siemens/common/board.c | 46 ++- board/siemens/{dxr2 => draco}/Makefile | 0 board/siemens/{dxr2 => draco}/board.c | 112 ++++--- board/siemens/{dxr2 => draco}/board.h | 26 +- board/siemens/{dxr2 => draco}/mux.c | 2 +- board/siemens/pxm2/board.c | 10 +- board/siemens/rut/board.c | 2 +- board/ti/am335x/u-boot.lds | 1 + board/wandboard/wandboard.c | 146 ++++++-- boards.cfg | 9 +- common/spl/spl_nand.c | 2 +- drivers/gpio/s5p_gpio.c | 204 ++++++++++-- drivers/gpio/tegra_gpio.c | 20 ++ drivers/mmc/tegra_mmc.c | 13 +- drivers/mtd/nand/omap_gpmc.c | 2 +- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_ltc3676.c | 32 ++ drivers/power/pmic/pmic_pfuze100.c | 2 +- drivers/video/Makefile | 1 + drivers/video/imx25lcdc.c | 121 +++++++ include/configs/beaver.h | 3 + include/configs/cardhu.h | 3 + include/configs/da850evm.h | 1 + include/configs/draco.h | 92 ++++++ include/configs/dxr2.h | 4 +- include/configs/embestmx6boards.h | 336 +++++++++++++++++++ include/configs/exynos5-dt.h | 2 + include/configs/gw_ventana.h | 20 ++ include/configs/hummingboard.h | 2 + include/configs/k2hk_evm.h | 1 + include/configs/koelsch.h | 36 +- include/configs/lager.h | 40 +-- include/configs/m28evk.h | 1 - include/configs/mx53ard.h | 2 + include/configs/mx53evk.h | 2 + include/configs/mx53loco.h | 2 + include/configs/mx53smd.h | 2 + include/configs/mx6sabre_common.h | 2 + include/configs/mx6sabresd.h | 1 + include/configs/mx6slevk.h | 12 + include/configs/mxs.h | 1 + include/configs/nitrogen6x.h | 2 + include/configs/omap3_beagle.h | 10 +- include/configs/pepper.h | 99 ++++++ include/configs/pxm2.h | 2 +- include/configs/s5p_goni.h | 4 +- include/configs/s5pc210_universal.h | 23 +- include/configs/siemens-am33x-common.h | 8 +- include/configs/smdk5250.h | 4 + include/configs/smdk5420.h | 4 + include/configs/smdkv310.h | 1 + include/configs/snow.h | 4 + include/configs/tegra-common.h | 7 + include/configs/trats.h | 17 +- include/configs/trats2.h | 17 +- include/configs/udoo.h | 2 + include/configs/wandboard.h | 38 ++- include/palmas.h | 4 + include/power/ltc3676_pmic.h | 51 +++ include/power/pfuze100_pmic.h | 1 + include/samsung/misc.h | 2 + 156 files changed, 7581 insertions(+), 6187 deletions(-) delete mode 100644 arch/arm/cpu/armv7/rmobile/cpu_info-r8a7791.c rename arch/arm/cpu/armv7/rmobile/{cpu_info-r8a7790.c => cpu_info-rcar.c} (50%) create mode 100644 arch/arm/imx-common/video.c create mode 100644 arch/arm/include/asm/arch-rmobile/rcar-base.h create mode 100644 arch/arm/include/asm/imx-common/video.h create mode 100644 arch/arm/lib/vectors.S create mode 100644 board/embest/mx6boards/Makefile create mode 100644 board/embest/mx6boards/mx6boards.c create mode 100644 board/gumstix/pepper/Makefile create mode 100644 board/gumstix/pepper/board.c create mode 100644 board/gumstix/pepper/board.h create mode 100644 board/gumstix/pepper/mux.c rename board/siemens/{dxr2 => draco}/Makefile (100%) rename board/siemens/{dxr2 => draco}/board.c (63%) rename board/siemens/{dxr2 => draco}/board.h (71%) rename board/siemens/{dxr2 => draco}/mux.c (99%) create mode 100644 drivers/power/pmic/pmic_ltc3676.c create mode 100644 drivers/video/imx25lcdc.c create mode 100644 include/configs/draco.h create mode 100644 include/configs/embestmx6boards.h create mode 100644 include/configs/pepper.h create mode 100644 include/power/ltc3676_pmic.h Amicalement, -- Albert.

2 1