March 2013 - U-Boot

[U-Boot] [PATCH v2 0/4] Tegra114: MMC: Add MMC driver for T114/Dalmore
by Tom Warren 19 Mar '13

19 Mar '13

This patchset adds SDMMC device-tree support to the Tegra114 dts files, and enables the Tegra MMC driver on Tegra114 Dalmore. Tested on my Dalmore E1611 board, eMMC and SD-Card work fine, can load a kernel off of a SD card OK, card detect works, and the env is now stored in eMMC (end of the 2nd 'boot' sector, same as Tegra20/30). Changes in v2: - Remove SDIOCFG_HSM define, unused - Remove I2C retries - Change CONFIG_ENV_OFFSET to match Dalmore's eMMC chip boot part size Tom Warren (4): Tegra114: fdt: Add SDMMC (sdhci) nodes for T114 boards (Dalmore for now) Tegra114: Dalmore: Add SDIO3 pad config to pinctrl_config table Tegra114: MMC: Add SD bus power-rail init routine Tegra114: MMC: Enable DT MMC driver support for Tegra114 Dalmore boards arch/arm/dts/tegra114.dtsi | 32 ++++++++++++ arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 6 +++ board/nvidia/dalmore/dalmore.c | 67 +++++++++++++++++++++++++ board/nvidia/dalmore/pinmux-config-dalmore.h | 6 +++ board/nvidia/dts/tegra114-dalmore.dts | 13 +++++ include/configs/dalmore.h | 12 ++++- 6 files changed, 135 insertions(+), 1 deletion(-) -- 1.8.1.5

2 5

[U-Boot] [PATCH v8] Addition of btrfs file-system to U-boot
by Adnan Ali 19 Mar '13

19 Mar '13

Adnan Ali (1): Introduced btrfs file-system with btrload command Makefile | 1 + common/Makefile | 1 + common/cmd_btr.c | 65 +++ fs/btrfs/Makefile | 51 ++ fs/btrfs/btrfs.c | 1352 ++++++++++++++++++++++++++++++++++++++++++++ fs/fs.c | 10 + include/btrfs.h | 416 ++++++++++++++ include/config_fallbacks.h | 4 + include/crc.h | 8 + include/fs.h | 1 + lib/Makefile | 1 + lib/crc32_c.c | 40 ++ 12 files changed, 1950 insertions(+) create mode 100644 common/cmd_btr.c create mode 100644 fs/btrfs/Makefile create mode 100644 fs/btrfs/btrfs.c create mode 100644 include/btrfs.h create mode 100644 lib/crc32_c.c -- 1.7.9.5

2 4

[U-Boot] [PATCH v3 01/15] fdt: Add fdtdec_get_addr_size() to read reg properties
by Simon Glass 19 Mar '13

19 Mar '13

It is common to have a "reg = <address size>" property in the FDT. Add a function to handle this, similar to the existing fdtdec_get_addr(); Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Fix new checkpatch check Changes in v2: None include/fdtdec.h | 15 +++++++++++++++ lib/fdtdec.c | 27 +++++++++++++++++++++------ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index 2189483..5ca84a0 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -38,11 +38,13 @@ */ #ifdef CONFIG_PHYS_64BIT typedef u64 fdt_addr_t; +typedef u64 fdt_size_t; #define FDT_ADDR_T_NONE (-1ULL) #define fdt_addr_to_cpu(reg) be64_to_cpu(reg) #define fdt_size_to_cpu(reg) be64_to_cpu(reg) #else typedef u32 fdt_addr_t; +typedef u32 fdt_size_t; #define FDT_ADDR_T_NONE (-1U) #define fdt_addr_to_cpu(reg) be32_to_cpu(reg) #define fdt_size_to_cpu(reg) be32_to_cpu(reg) @@ -200,6 +202,19 @@ fdt_addr_t fdtdec_get_addr(const void *blob, int node, const char *prop_name); /** + * Look up an address property in a node and return it as an address. + * The property must hold one address with a length. This is only tested + * on 32-bit machines. + * + * @param blob FDT blob + * @param node node to examine + * @param prop_name name of property to find + * @return address, if found, or FDT_ADDR_T_NONE if not + */ +fdt_addr_t fdtdec_get_addr_size(const void *blob, int node, + const char *prop_name, fdt_size_t *sizep); + +/** * Look up a 32-bit integer property in a node and return it. The property * must have at least 4 bytes of data. The value of the first cell is * returned. diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 43f29f5..cffba94 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -68,25 +68,40 @@ const char *fdtdec_get_compatible(enum fdt_compat_id id) return compat_names[id]; } -fdt_addr_t fdtdec_get_addr(const void *blob, int node, - const char *prop_name) +fdt_addr_t fdtdec_get_addr_size(const void *blob, int node, + const char *prop_name, fdt_size_t *sizep) { const fdt_addr_t *cell; int len; debug("%s: %s: ", __func__, prop_name); cell = fdt_getprop(blob, node, prop_name, &len); - if (cell && (len == sizeof(fdt_addr_t) || - len == sizeof(fdt_addr_t) * 2)) { + if (cell && ((!sizep && len == sizeof(fdt_addr_t)) || + len == sizeof(fdt_addr_t) * 2)) { fdt_addr_t addr = fdt_addr_to_cpu(*cell); - - debug("%p\n", (void *)addr); + if (sizep) { + const fdt_size_t *size; + + size = (fdt_size_t *)((char *)cell + + sizeof(fdt_addr_t)); + *sizep = fdt_size_to_cpu(*size); + debug("addr=%p, size=%p\n", (void *)addr, + (void *)*sizep); + } else { + debug("%p\n", (void *)addr); + } return addr; } debug("(not found)\n"); return FDT_ADDR_T_NONE; } +fdt_addr_t fdtdec_get_addr(const void *blob, int node, + const char *prop_name) +{ + return fdtdec_get_addr_size(blob, node, prop_name, NULL); +} + s32 fdtdec_get_int(const void *blob, int node, const char *prop_name, s32 default_val) { -- 1.8.1.3

1 1

[U-Boot] [PATCH] powerpc/corenet: Add workaround for ELBC multi-bit ECC error
by Shaohui Xie 19 Mar '13

19 Mar '13

NAND operations in condition like below will result ELBC internal multi-bit ECC error, DCFG will send this error to MPIC to report it as an error interrupt (Interrupt 0), which causes call trace in kernel, so software should disable the DCFG not to send the ELBC ECC error by setting bit 15 in the register at DCSRBASE + 0x0002_0520. This won't inhibit the reporting of LTESR[PAR]. This workaround is enabled on P2041/P3041/P50x0. steps to reproduce the issue: 1. power cycle the board 2. use following command to do NAND test: flashcp -v file-jffs2 /dev/mtdx The 'mtdx' should be a NAND partition, the file 'file-jffs2' should be page aligned. Signed-off-by: Shaohui Xie <Shaohui.Xie(a)freescale.com> --- Sorry! I have to resent since I still cannot find the patch in patch work. arch/powerpc/cpu/mpc85xx/cmd_errata.c | 3 +++ arch/powerpc/cpu/mpc85xx/cpu_init.c | 10 ++++++++++ arch/powerpc/include/asm/config_mpc85xx.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index 5d72f4c..671c205 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -227,6 +227,9 @@ static int do_errata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_SYS_FSL_ERRATUM_NMG_LBC103 puts("Work-around for Erratum NMG_LBC103 enabled\n"); #endif +#ifdef CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC + puts("Work-around for Erratum ELBC MULTIBIT ECC enabled\n"); +#endif #ifdef CONFIG_SYS_FSL_ERRATUM_NMG_ETSEC129 if ((SVR_MAJ(svr) == 1) || IS_SVR_REV(svr, 2, 0)) puts("Work-around for Erratum NMG ETSEC129 enabled\n"); diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index de9d916..c43be5e 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -592,6 +592,16 @@ skip_l2: } } #endif +#ifdef CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC + /* + * On P2041/P3041/P50x0, NAND operations will result internal multi-bit + * ECC error, which causes call trace in kernel, so software should + * disable the ECC error reported from eLBC by setting bit 15 in + * the register at DCSRBASE + 0x0002_0520. + */ +#define DCFG_ECC (CONFIG_SYS_DCSRBAR + 0x20520) + setbits_be32((void *)DCFG_ECC, 1 << (31 - 15)); +#endif #ifdef CONFIG_SYS_LBC_LCRR /* diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index d57c178..926316d 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -345,6 +345,7 @@ #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 #define CONFIG_SYS_FSL_ERRATUM_SRIO_A004034 #define CONFIG_SYS_FSL_ERRATUM_A004849 +#define CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC #elif defined(CONFIG_PPC_P3041) #define CONFIG_SYS_FSL_QORIQ_CHASSIS1 @@ -377,6 +378,7 @@ #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 #define CONFIG_SYS_FSL_ERRATUM_SRIO_A004034 #define CONFIG_SYS_FSL_ERRATUM_A004849 +#define CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC #elif defined(CONFIG_PPC_P4080) /* also supports P4040 */ #define CONFIG_SYS_FSL_QORIQ_CHASSIS1 @@ -451,6 +453,7 @@ #define CONFIG_SYS_FSL_ERRATUM_A004510_SVR_REV 0x10 #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xc0000000 #define CONFIG_SYS_FSL_ERRATUM_SRIO_A004034 +#define CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC #elif defined(CONFIG_PPC_P5040) #define CONFIG_SYS_PPC64 @@ -480,6 +483,7 @@ #define CONFIG_SYS_FSL_ERRATUM_A004510 #define CONFIG_SYS_FSL_ERRATUM_A004510_SVR_REV 0x10 #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 +#define CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC #elif defined(CONFIG_BSC9131) #define CONFIG_MAX_CPUS 1 -- 1.8.0

1 0

[U-Boot] [PATCH] powerpc/corenet: Add workaround for ELBC multi-bit ECC error
by Shaohui Xie 19 Mar '13

19 Mar '13

NAND operations in condition like below will result ELBC internal multi-bit ECC error, DCFG will send this error to MPIC to report it as an error interrupt (Interrupt 0), which causes call trace in kernel, so software should disable the DCFG not to send the ELBC ECC error by setting bit 15 in the register at DCSRBASE + 0x0002_0520. This won't inhibit the reporting of LTESR[PAR]. This workaround is enabled on P2041/P3041/P50x0. steps to reproduce the issue: 1. power cycle the board 2. use following command to do NAND test: flashcp -v file-jffs2 /dev/mtdx The 'mtdx' should be a NAND partition, the file 'file-jffs2' should be page aligned. Signed-off-by: Shaohui Xie <Shaohui.Xie(a)freescale.com> --- resent due to patch work did not capture the patch. arch/powerpc/cpu/mpc85xx/cmd_errata.c | 3 +++ arch/powerpc/cpu/mpc85xx/cpu_init.c | 10 ++++++++++ arch/powerpc/include/asm/config_mpc85xx.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index 5d72f4c..671c205 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -227,6 +227,9 @@ static int do_errata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_SYS_FSL_ERRATUM_NMG_LBC103 puts("Work-around for Erratum NMG_LBC103 enabled\n"); #endif +#ifdef CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC + puts("Work-around for Erratum ELBC MULTIBIT ECC enabled\n"); +#endif #ifdef CONFIG_SYS_FSL_ERRATUM_NMG_ETSEC129 if ((SVR_MAJ(svr) == 1) || IS_SVR_REV(svr, 2, 0)) puts("Work-around for Erratum NMG ETSEC129 enabled\n"); diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index de9d916..c43be5e 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -592,6 +592,16 @@ skip_l2: } } #endif +#ifdef CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC + /* + * On P2041/P3041/P50x0, NAND operations will result internal multi-bit + * ECC error, which causes call trace in kernel, so software should + * disable the ECC error reported from eLBC by setting bit 15 in + * the register at DCSRBASE + 0x0002_0520. + */ +#define DCFG_ECC (CONFIG_SYS_DCSRBAR + 0x20520) + setbits_be32((void *)DCFG_ECC, 1 << (31 - 15)); +#endif #ifdef CONFIG_SYS_LBC_LCRR /* diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index d57c178..926316d 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -345,6 +345,7 @@ #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 #define CONFIG_SYS_FSL_ERRATUM_SRIO_A004034 #define CONFIG_SYS_FSL_ERRATUM_A004849 +#define CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC #elif defined(CONFIG_PPC_P3041) #define CONFIG_SYS_FSL_QORIQ_CHASSIS1 @@ -377,6 +378,7 @@ #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 #define CONFIG_SYS_FSL_ERRATUM_SRIO_A004034 #define CONFIG_SYS_FSL_ERRATUM_A004849 +#define CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC #elif defined(CONFIG_PPC_P4080) /* also supports P4040 */ #define CONFIG_SYS_FSL_QORIQ_CHASSIS1 @@ -451,6 +453,7 @@ #define CONFIG_SYS_FSL_ERRATUM_A004510_SVR_REV 0x10 #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xc0000000 #define CONFIG_SYS_FSL_ERRATUM_SRIO_A004034 +#define CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC #elif defined(CONFIG_PPC_P5040) #define CONFIG_SYS_PPC64 @@ -480,6 +483,7 @@ #define CONFIG_SYS_FSL_ERRATUM_A004510 #define CONFIG_SYS_FSL_ERRATUM_A004510_SVR_REV 0x10 #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 +#define CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC #elif defined(CONFIG_BSC9131) #define CONFIG_MAX_CPUS 1 -- 1.8.0

1 0

[U-Boot] [PATCH v3 03/15] spi: Use spi_alloc_slave() in each SPI driver
by Simon Glass 19 Mar '13

19 Mar '13

Rather than each driver having its own way to allocate a SPI slave, use the new allocation function everywhere. This will make it easier to extend the interface without breaking drivers. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Rebase to master Changes in v2: - Use spi_alloc_slave() in bfin_spi6xx.c - Use spi_alloc_slave() in exynos_spi.c drivers/spi/altera_spi.c | 4 +--- drivers/spi/andes_spi.c | 4 +--- drivers/spi/armada100_spi.c | 4 +--- drivers/spi/atmel_spi.c | 4 +--- drivers/spi/bfin_spi.c | 4 +--- drivers/spi/bfin_spi6xx.c | 4 +--- drivers/spi/cf_qspi.c | 4 +--- drivers/spi/cf_spi.c | 4 +--- drivers/spi/davinci_spi.c | 4 +--- drivers/spi/exynos_spi.c | 4 +--- drivers/spi/fsl_espi.c | 4 +--- drivers/spi/kirkwood_spi.c | 5 +---- drivers/spi/mpc52xx_spi.c | 5 +---- drivers/spi/mpc8xxx_spi.c | 5 +---- drivers/spi/mxc_spi.c | 4 +--- drivers/spi/mxs_spi.c | 4 +--- drivers/spi/oc_tiny_spi.c | 5 +---- drivers/spi/omap3_spi.c | 27 ++++++++++++++------------- drivers/spi/sh_spi.c | 4 +--- drivers/spi/soft_spi.c | 4 +--- drivers/spi/tegra_slink.c | 4 +--- drivers/spi/tegra_spi.c | 4 +--- drivers/spi/xilinx_spi.c | 4 +--- 23 files changed, 36 insertions(+), 83 deletions(-) diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 138d6f4..b53607a 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -83,12 +83,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - altspi = malloc(sizeof(*altspi)); + altspi = spi_alloc_slave(struct altera_spi_slave, bus, cs); if (!altspi) return NULL; - altspi->slave.bus = bus; - altspi->slave.cs = cs; altspi->base = altera_spi_base_list[bus]; debug("%s: bus:%i cs:%i base:%lx\n", __func__, bus, cs, altspi->base); diff --git a/drivers/spi/andes_spi.c b/drivers/spi/andes_spi.c index fdde139..c56377b 100644 --- a/drivers/spi/andes_spi.c +++ b/drivers/spi/andes_spi.c @@ -53,12 +53,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - ds = malloc(sizeof(*ds)); + ds = spi_alloc_slave(struct andes_spi_slave, bus, cs); if (!ds) return NULL; - ds->slave.bus = bus; - ds->slave.cs = cs; ds->regs = (struct andes_spi_regs *)CONFIG_SYS_SPI_BASE; /* diff --git a/drivers/spi/armada100_spi.c b/drivers/spi/armada100_spi.c index 7384c9c..afdbe05 100644 --- a/drivers/spi/armada100_spi.c +++ b/drivers/spi/armada100_spi.c @@ -120,12 +120,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, { struct armd_spi_slave *pss; - pss = malloc(sizeof(*pss)); + pss = spi_alloc_slave(struct armd_spi_slave, bus, cs); if (!pss) return NULL; - pss->slave.bus = bus; - pss->slave.cs = cs; pss->spi_reg = (struct ssp_reg *)SSP_REG_BASE(CONFIG_SYS_SSP_PORT); pss->cr0 = SSCR0_MOTO | SSCR0_DATASIZE(DEFAULT_WORD_LEN) | SSCR0_SSE; diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index ce7d460..f4b1bad 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -84,12 +84,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (mode & SPI_CPOL) csrx |= ATMEL_SPI_CSRx_CPOL; - as = malloc(sizeof(struct atmel_spi_slave)); + as = spi_alloc_slave(struct atmel_spi_slave, bus, cs); if (!as) return NULL; - as->slave.bus = bus; - as->slave.cs = cs; as->regs = regs; as->mr = ATMEL_SPI_MR_MSTR | ATMEL_SPI_MR_MODFDIS #if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9M10G45) diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c index e080bec..ab2e8b9 100644 --- a/drivers/spi/bfin_spi.c +++ b/drivers/spi/bfin_spi.c @@ -182,12 +182,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, default: return NULL; } - bss = malloc(sizeof(*bss)); + bss = spi_alloc_slave(struct bfin_spi_slave, bus, cs); if (!bss) return NULL; - bss->slave.bus = bus; - bss->slave.cs = cs; bss->mmr_base = (void *)mmr_base; bss->ctl = SPE | MSTR | TDBR_CORE; if (mode & SPI_CPHA) bss->ctl |= CPHA; diff --git a/drivers/spi/bfin_spi6xx.c b/drivers/spi/bfin_spi6xx.c index fde3447..c25c4a9 100644 --- a/drivers/spi/bfin_spi6xx.c +++ b/drivers/spi/bfin_spi6xx.c @@ -178,12 +178,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; } - bss = malloc(sizeof(*bss)); + bss = spi_alloc_slave(struct bfin_spi_slave, bus, cs); if (!bss) return NULL; - bss->slave.bus = bus; - bss->slave.cs = cs; bss->regs = (struct bfin_spi_regs *)reg_base; bss->control = SPI_CTL_EN | SPI_CTL_MSTR; if (mode & SPI_CPHA) diff --git a/drivers/spi/cf_qspi.c b/drivers/spi/cf_qspi.c index 72dd1a5..a37ac4e 100644 --- a/drivers/spi/cf_qspi.c +++ b/drivers/spi/cf_qspi.c @@ -120,13 +120,11 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - dev = malloc(sizeof(struct cf_qspi_slave)); + dev = spi_alloc_slave(struct cf_qspi_slave, bus, cs); if (!dev) return NULL; /* Initialize to known value */ - dev->slave.bus = bus; - dev->slave.cs = cs; dev->regs = (qspi_t *)MMAP_QSPI; dev->qmr = 0; dev->qwr = 0; diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index a883da9..afe7917 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -330,12 +330,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - cfslave = malloc(sizeof(struct cf_spi_slave)); + cfslave = spi_alloc_slave(struct cf_spi_slave, bus, cs); if (!cfslave) return NULL; - cfslave->slave.bus = bus; - cfslave->slave.cs = cs; cfslave->baudrate = max_hz; /* specific setup */ diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 13aca52..74792af 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -44,12 +44,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - ds = malloc(sizeof(*ds)); + ds = spi_alloc_slave(struct davinci_spi_slave, bus, cs); if (!ds) return NULL; - ds->slave.bus = bus; - ds->slave.cs = cs; ds->regs = (struct davinci_spi_regs *)CONFIG_SYS_SPI_BASE; ds->freq = max_hz; diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index be60ada..51b3d30 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -89,15 +89,13 @@ struct spi_slave *spi_setup_slave(unsigned int busnum, unsigned int cs, return NULL; } - spi_slave = malloc(sizeof(*spi_slave)); + spi_slave = spi_alloc_slave(struct exynos_spi_slave, busnum, cs); if (!spi_slave) { debug("%s: Could not allocate spi_slave\n", __func__); return NULL; } bus = &spi_bus[busnum]; - spi_slave->slave.bus = busnum; - spi_slave->slave.cs = cs; spi_slave->regs = bus->regs; spi_slave->mode = mode; spi_slave->periph_id = bus->periph_id; diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index eb99e90..28609ee 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -79,12 +79,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - fsl = malloc(sizeof(struct fsl_spi_slave)); + fsl = spi_alloc_slave(struct fsl_spi_slave, bus, cs); if (!fsl) return NULL; - fsl->slave.bus = bus; - fsl->slave.cs = cs; fsl->mode = mode; fsl->max_transfer_length = ESPI_MAX_DATA_TRANSFER_LEN; diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index de81064..caa91e3 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -49,13 +49,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - slave = malloc(sizeof(struct spi_slave)); + slave = spi_alloc_slave_base(bus, cs); if (!slave) return NULL; - slave->bus = bus; - slave->cs = cs; - writel(~KWSPI_CSN_ACT | KWSPI_SMEMRDY, &spireg->ctrl); /* calculate spi clock prescaller using max_hz */ diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c index 3e96b3f..4b50bca 100644 --- a/drivers/spi/mpc52xx_spi.c +++ b/drivers/spi/mpc52xx_spi.c @@ -48,13 +48,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, { struct spi_slave *slave; - slave = malloc(sizeof(struct spi_slave)); + slave = spi_alloc_slave_base(bus, cs); if (!slave) return NULL; - slave->bus = bus; - slave->cs = cs; - return slave; } diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 4e46041..6b0e3b4 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -45,13 +45,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - slave = malloc(sizeof(struct spi_slave)); + slave = spi_alloc_slave_base(bus, cs); if (!slave) return NULL; - slave->bus = bus; - slave->cs = cs; - /* * TODO: Some of the code in spi_init() should probably move * here, or into spi_claim_bus() below. diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index 859c43f..d792d8d 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -408,7 +408,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (bus >= ARRAY_SIZE(spi_bases)) return NULL; - mxcs = calloc(sizeof(struct mxc_spi_slave), 1); + mxcs = spi_alloc_slave(struct mxc_spi_slave, bus, cs); if (!mxcs) { puts("mxc_spi: SPI Slave not allocated !\n"); return NULL; @@ -424,8 +424,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, cs = ret; - mxcs->slave.bus = bus; - mxcs->slave.cs = cs; mxcs->base = spi_bases[bus]; ret = spi_cfg_mxc(mxcs, cs, max_hz, mode); diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index ffa3c1d..aa999f9 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -77,15 +77,13 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; } - mxs_slave = calloc(sizeof(struct mxs_spi_slave), 1); + mxs_slave = spi_alloc_slave(struct mxs_spi_slave, bus, cs); if (!mxs_slave) return NULL; if (mxs_dma_init_channel(MXS_DMA_CHANNEL_AHB_APBH_SSP0 + bus)) goto err_init; - mxs_slave->slave.bus = bus; - mxs_slave->slave.cs = cs; mxs_slave->max_khz = max_hz / 1000; mxs_slave->mode = mode; mxs_slave->regs = mxs_ssp_regs_by_bus(bus); diff --git a/drivers/spi/oc_tiny_spi.c b/drivers/spi/oc_tiny_spi.c index fc01fb8..6f7b1ed 100644 --- a/drivers/spi/oc_tiny_spi.c +++ b/drivers/spi/oc_tiny_spi.c @@ -90,13 +90,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs) || gpio_request(cs, "tiny_spi")) return NULL; - tiny_spi = malloc(sizeof(*tiny_spi)); + tiny_spi = spi_alloc_slave(struct tiny_spi_slave, bus, cs); if (!tiny_spi) return NULL; - memset(tiny_spi, 0, sizeof(*tiny_spi)); - tiny_spi->slave.bus = bus; - tiny_spi->slave.cs = cs; tiny_spi->host = &tiny_spi_host_list[bus]; tiny_spi->mode = mode & (SPI_CPOL | SPI_CPHA); tiny_spi->flg = mode & SPI_CS_HIGH ? 1 : 0; diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 344d5b8..80a4e47 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -80,12 +80,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, unsigned int max_hz, unsigned int mode) { struct omap3_spi_slave *ds; - - ds = malloc(sizeof(struct omap3_spi_slave)); - if (!ds) { - printf("SPI error: malloc of SPI structure failed\n"); - return NULL; - } + struct mcspi *regs; /* * OMAP3 McSPI (MultiChannel SPI) has 4 busses (modules) @@ -98,21 +93,21 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, switch (bus) { case 0: - ds->regs = (struct mcspi *)OMAP3_MCSPI1_BASE; + regs = (struct mcspi *)OMAP3_MCSPI1_BASE; break; #ifdef OMAP3_MCSPI2_BASE case 1: - ds->regs = (struct mcspi *)OMAP3_MCSPI2_BASE; + regs = (struct mcspi *)OMAP3_MCSPI2_BASE; break; #endif #ifdef OMAP3_MCSPI3_BASE case 2: - ds->regs = (struct mcspi *)OMAP3_MCSPI3_BASE; + regs = (struct mcspi *)OMAP3_MCSPI3_BASE; break; #endif #ifdef OMAP3_MCSPI4_BASE case 3: - ds->regs = (struct mcspi *)OMAP3_MCSPI4_BASE; + regs = (struct mcspi *)OMAP3_MCSPI4_BASE; break; #endif default: @@ -120,7 +115,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, Supported busses 0 - 3\n", bus); return NULL; } - ds->slave.bus = bus; if (((bus == 0) && (cs > 3)) || ((bus == 1) && (cs > 1)) || @@ -130,19 +124,26 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, on bus %i\n", cs, bus); return NULL; } - ds->slave.cs = cs; if (max_hz > OMAP3_MCSPI_MAX_FREQ) { printf("SPI error: unsupported frequency %i Hz. \ Max frequency is 48 Mhz\n", max_hz); return NULL; } - ds->freq = max_hz; if (mode > SPI_MODE_3) { printf("SPI error: unsupported SPI mode %i\n", mode); return NULL; } + + ds = spi_alloc_slave(struct omap3_spi_slave, bus, cs); + if (!ds) { + printf("SPI error: malloc of SPI structure failed\n"); + return NULL; + } + + ds->regs = regs; + ds->freq = max_hz; ds->mode = mode; return &ds->slave; diff --git a/drivers/spi/sh_spi.c b/drivers/spi/sh_spi.c index e944b23..744afe3 100644 --- a/drivers/spi/sh_spi.c +++ b/drivers/spi/sh_spi.c @@ -103,12 +103,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - ss = malloc(sizeof(struct spi_slave)); + ss = spi_alloc_slave(struct sh_spi, bus, cs); if (!ss) return NULL; - ss->slave.bus = bus; - ss->slave.cs = cs; ss->regs = (struct sh_spi_regs *)CONFIG_SH_SPI_BASE; /* SPI sycle stop */ diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 13df8cb..a1b84b6 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -73,12 +73,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - ss = malloc(sizeof(struct soft_spi_slave)); + ss = spi_alloc_slave(struct soft_spi_slave, bus, cs); if (!ss) return NULL; - ss->slave.bus = bus; - ss->slave.cs = cs; ss->mode = mode; /* TODO: Use max_hz to limit the SCK rate */ diff --git a/drivers/spi/tegra_slink.c b/drivers/spi/tegra_slink.c index 2c41fab..9da5877 100644 --- a/drivers/spi/tegra_slink.c +++ b/drivers/spi/tegra_slink.c @@ -81,13 +81,11 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; } - spi = malloc(sizeof(struct tegra_spi_slave)); + spi = spi_alloc_slave(struct tegra_spi_slave, bus, cs); if (!spi) { printf("SPI error: malloc of SPI structure failed\n"); return NULL; } - spi->slave.bus = bus; - spi->slave.cs = cs; spi->ctrl = &spi_ctrls[bus]; if (!spi->ctrl) { printf("SPI error: could not find controller for bus %d\n", diff --git a/drivers/spi/tegra_spi.c b/drivers/spi/tegra_spi.c index ce19095..05027af 100644 --- a/drivers/spi/tegra_spi.c +++ b/drivers/spi/tegra_spi.c @@ -81,13 +81,11 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; } - spi = malloc(sizeof(struct tegra_spi_slave)); + spi = spi_alloc_slave(struct tegra_spi_slave, bus, cs); if (!spi) { printf("SPI error: malloc of SPI structure failed\n"); return NULL; } - spi->slave.bus = bus; - spi->slave.cs = cs; #ifdef CONFIG_OF_CONTROL int node = fdtdec_next_compatible(gd->fdt_blob, 0, COMPAT_NVIDIA_TEGRA20_SFLASH); diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index db01cc2..a82b056 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -85,14 +85,12 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; } - xilspi = malloc(sizeof(*xilspi)); + xilspi = spi_alloc_slave(struct xilinx_spi_slave, bus, cs); if (!xilspi) { printf("XILSPI error: %s: malloc of SPI structure failed\n", __func__); return NULL; } - xilspi->slave.bus = bus; - xilspi->slave.cs = cs; xilspi->regs = (struct xilinx_spi_reg *)xilinx_spi_base_list[bus]; xilspi->freq = max_hz; xilspi->mode = mode; -- 1.8.1.3

1 0

[U-Boot] [RFC PATCH 0/44] RFC: Verified boot implementation based on FIT
by Simon Glass 18 Mar '13

18 Mar '13

This series implemented a verified boot system based around FIT images as discussed on the U-Boot mailing list, including on this thread: http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/147830 RSA is used to implement the encryption. Images are signed by mkimage using private keys created by the user. Public keys are written into U-Boot control FDT (CONFIG_OF_CONTROL) for access by bootm etc. at run-time. The control FDT must be stored in a secure place where it cannot be changed after manufacture. Some notes are provided in the documentaion on how this can be achieved. When images are loaded, they are verified with the public keys. Some minor restructuring of the image code is included in this series, since we now support signatures as well as hashes. It is important to have a test framework for this series. For this, sandbox is used, and a script is provided which signs images and gets sandbox to load them using a script, to check that all is well. So some of the patches here release to adding image support for sandbox. This series is not quite in final form since it still needs rollback support, using a TPM or some other mechanism to make sure that an attacker cannot boot your system with an old image that has been compromised. Also a few more tests are needed to check that image corruption has the desired effect, some proofreading is required, another review of error checking, etc. This series relies on two previous series: sandbox filesystem and sandbox memory. Without these, it is (at best) not possible to run the verified boot test on sandbox. This series and its dependencies are available at: http://git.denx.de/u-boot-x86.git in the branch 'vboot'. Comments welcome. Simon Glass (44): sandbox: config: Enable CONFIG_FIT and CONFIG_CMD_FIT bootstage: Don't build for HOSTCC mkimage: Move ARRAY_SIZE to header file libfdt: Add fdt_next_subnode() to permit easy subnode iteration image: Move timestamp #ifdefs to header file image: Export fit_check_ramdisk() image: Split FIT code into new image-fit.c image: Move HOSTCC image code to tools/ image: Split hash node processing into its own function image: Convert fit_image_hash_set_value() to static, and rename image: Rename fit_image_check_hashes() to fit_image_verify() image: Move hash checking into its own functions image: Move error! string to common place image: Export fit_conf_get_prop_node() image: Rename fit_add_hashes() to fit_add_verification_data() image: Rename hash printing to fit_image_print_verification_data() sandbox: Add CONFIG_OF_HOSTFILE to read FDT from host file fdt: Add a parameter to fdt_valid() Add getenv_hex() to return an environment variable as hex fdt: Allow fdt command to check and update control FDT sandbox: fdt: Support fdt command for sandbox env: Fix minor comment typos in cmd_nvedit fdt: Skip checking FDT if the pointer is NULL Revert "fdt- Tell the FDT library where the device tree is" Add stdarg to vsprintf.h Add minor updates to README.fdt-control hash: Add a way to calculate a hash for any algortihm sandbox: config: Enable FIT signatures with RSA sandbox: Provide a way to map from host RAM to U-Boot RAM sandbox: image: Add support for booting images in sandbox image: Add signing infrastructure image: Support signing of images image: Verify signatures in FIT images image: Add RSA support for image signing mkimage: Put FIT loading in function and tidy error handling mkimage: Add -k option to specify key directory mkimage: Add -K to write public keys to an FDT blob mkimage: Add -F option to modify an existing .fit file mkimage: Add -c option to specify a comment for key signing mkimage: Add -r option to specify keys that must be verified libfdt: Add fdt_find_regions() image: Add support for signing of FIT configurations Add verified boot information and test WIP: sandbox: config: Add test config for verified boot Makefile | 1 + README | 15 + arch/sandbox/cpu/cpu.c | 5 + arch/sandbox/cpu/start.c | 7 + arch/sandbox/include/asm/io.h | 2 + arch/sandbox/include/asm/state.h | 1 + arch/sandbox/lib/board.c | 42 +- common/Makefile | 2 + common/cmd_bootm.c | 37 +- common/cmd_fdt.c | 83 ++- common/cmd_fpga.c | 2 +- common/cmd_nvedit.c | 19 +- common/cmd_source.c | 2 +- common/cmd_ximg.c | 2 +- common/hash.c | 22 + common/image-fit.c | 1544 +++++++++++++++++++++++++++++++++++ common/image-sig.c | 407 +++++++++ common/image.c | 1677 +------------------------------------- common/main.c | 8 - common/update.c | 2 +- config.mk | 1 + doc/README.fdt-control | 13 +- doc/mkimage.1 | 73 ++- doc/uImage.FIT/sign-configs.its | 45 + doc/uImage.FIT/sign-images.its | 42 + doc/uImage.FIT/signature.txt | 376 +++++++++ doc/uImage.FIT/verified-boot.txt | 104 +++ include/bootstage.h | 5 +- include/common.h | 18 + include/configs/sandbox.h | 20 +- include/hash.h | 15 + include/image.h | 213 +++++- include/libfdt.h | 81 ++ include/rsa.h | 108 +++ include/vsprintf.h | 2 + lib/fdtdec.c | 3 +- lib/libfdt/fdt.c | 12 + lib/libfdt/fdt_wip.c | 129 +++ lib/rsa/Makefile | 46 + lib/rsa/rsa-sign.c | 454 +++++++++++ lib/rsa/rsa-verify.c | 374 +++++++++ test/vboot/.gitignore | 3 + test/vboot/sandbox-kernel.dts | 7 + test/vboot/sandbox-u-boot.dts | 7 + test/vboot/sign-configs.its | 45 + test/vboot/sign-images.its | 42 + test/vboot/vboot_test.sh | 122 +++ tools/Makefile | 21 +- tools/aisimage.c | 1 - tools/fit_image.c | 134 ++- tools/image-host.c | 727 +++++++++++++++++ tools/mkimage.c | 27 +- tools/mkimage.h | 6 + 53 files changed, 5386 insertions(+), 1770 deletions(-) create mode 100644 common/image-fit.c create mode 100644 common/image-sig.c create mode 100644 doc/uImage.FIT/sign-configs.its create mode 100644 doc/uImage.FIT/sign-images.its create mode 100644 doc/uImage.FIT/signature.txt create mode 100644 doc/uImage.FIT/verified-boot.txt create mode 100644 include/rsa.h create mode 100644 lib/rsa/Makefile create mode 100644 lib/rsa/rsa-sign.c create mode 100644 lib/rsa/rsa-verify.c create mode 100644 test/vboot/.gitignore create mode 100644 test/vboot/sandbox-kernel.dts create mode 100644 test/vboot/sandbox-u-boot.dts create mode 100644 test/vboot/sign-configs.its create mode 100644 test/vboot/sign-images.its create mode 100755 test/vboot/vboot_test.sh create mode 100644 tools/image-host.c -- 1.7.7.3

2 73

[U-Boot] [RFC] Kbuild support for ARM FIT images
by Joel A Fernandes 18 Mar '13

18 Mar '13

Hello, I've been spinning some work-in-progress patches for FIT build support in the kernel. With the move to multiplatform support on OMAP, I feel it is a good time to add FIT support, also looking at the proliferating number of dtbs, as it is a nice way Currently the following is what I envision the way it will work: - New "uImage-fit" target in $(boot)/ which is made to depend on "dtbs" target - Changes to dtbs target to output a $(srctree)/.tmp_list_dtbs listing the full paths to all the dtbs built - A new script "mkfitsrc.sh" that spits out an ITS to $(srctree)/.tmp_its . The above tmp file is passed - For each dtb, a new "device tree" node is created in the ITS - For each dtb, a new "configuration" node is created in the ITS - mkimage is called on the ITS sources to output the kernel image. (TODO: to use mkuboot.sh) I have yet to do some boot time tests, as I don't have my board now and don't want to post something that doesn't work. But all this has been build-tested. Any comments on this approach? Is it better to merge mkfitsrc.sh with mkuboot.sh? Regards, Joel

13 53

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 18 Mar '13

18 Mar '13

Hello Tom, Here is a PR for ARM. Note that doc/README.scrapyard will need a manual merge resolution due to ARM tree having a commit that reorders the headers and reformats the lines while mainline has a commit adding two new entries still in the older format. The following changes since commit fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to b27673ccbd3d5435319b5c09c3e7061f559f925d: Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' (2013-03-15 20:50:43 +0100) ---------------------------------------------------------------- Albert ARIBAUD (9): Merge 'u-boot-microblaze/mainline/arm' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master' arm: omap: map u_boot_lists section to .sram Remove linker lists (LGAs) from SPL linker scripts arm: make __bss_start and __bss_end__ compiler-generated Refactor linker-generated arrays Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' Benoît Thébaudeau (6): imx: mx6q DDR3 init: Fix tMRD imx: mx6q DDR3 init: Fix tXPR imx: mx6q DDR3 init: Fix SDE_to_RST imx: mx6q DDR3 init: Fix RST_to_CKE imx: mx6q DDR3 init: Fix MR0.PPD imx: mx6q DDR3 init: Benefit from available CL = 7 Bo Shen (3): ARM: atmel: add at91sam9g20ek_2mmc nand boot support ARM: at91: change nand flash table ARM: at91sam9x5: Using CPU string directly Chase Maupin (3): am335x_evm: Add NAND environment variables am335x_evm: Add SPI environment variables am335x_evm: Add NET environment variables Enric Balletbo i Serra (7): OMAP3: igep00x0: use official board names. OMAP3: igep00x0: add missing include mach-types.h OMAP3: igep00x0: Add new IGEP COM PROTON. SPL: ONENAND: Fix some ONENAND related defines. SPL: ONENAND: Fix onenand_spl_load_image implementation. SPL: ONENAND: Support SPL to boot u-boot from OneNAND. OMAP3: Initialize gpmc if SPL_ONENAND_SUPPORT is enabled. Eric Nelson (8): i.MX6Q: mx6qsabre*: Configure to allow CONFIG_SYS_ALT_MEMTEST i.MX6: mx6qsabrelite: indent with tabs i.MX6: consolidate pad names for multi-CPU boards i.MX6: crm_regs: define CCM_CCGRx for use in board config files i.MX6: crm_regs: define IOMUXC_GPR4/6/7 i.MX6DL: define IOMUX pads NANDF_CS1-3 for use as GPIO i.MX6: Add DDR controller registers Add Boundary Devices Nitrogen6X boards Fabio Estevam (6): mx6: Disable Power Down Bit of watchdog mx23evk: Remove CONFIG_SYS_BAUDRATE_TABLE mx23evk: Turn on caches common: cmd_sata: Fix usage text for 'sata init' mx6: Provide a structure for accessing HDMI registers nitrogen6x: Fix RAM size variable Fadil Berisha (2): mxs: timrot: Add support to i.MX23 mxs: timrot: Rename local macros Howard Gray (1): omap3: mvblx: change console to ttyO0 and make silent by default. Ilya Yanok (4): spl: support for booting via usbeth am33xx: support for booting via usbeth am335x_evm: enable support for booting via USB doc/SPL/README.am335x-network: Document using ethernet (and USB) SPL Jesse Gilles (1): ARM: sam9x5: fix ethernet pins in MII mode Lars Poeschel (1): am33xx: pcm051: Remove wp pin mux for sd-card Lokesh Vutla (13): ARM: OMAP4+: emif: Detect SDRAM from SDRAM config register ARM: OMAP4+: Cleanup emif specific files ARM: OMAP4+: Make control module register structure generic ARM: OMAP5: Clean up iosettings code ARM: OMAP5: Add DDR changes required for OMAP543X ES2.0 SOCs ARM: OMAP5: srcomp: enable slew rate compensation cells after powerup arm: dra7xx: clock: Add the prcm changes arm: dra7xx: clock: Add the dplls data arm: dra7xx: Add control module changes arm: dra7xx: Add DDR related data for DRA752 ES1.0 arm: dra7xx: Add board files for DRA7XX socs arm: dra7xx: Add dra7xx_evm build support arm: dra7xx: Add silicon id support for DRA752 soc Lucas Stach (7): tegra: usb: set USB_PORTS_MAX to correct value tegra: usb: make controller init functions more self contained tegra: usb: remove unneeded function parameter tegra: usb: move controller init into start_port tegra: usb: various small cleanups tegra: usb: move implementation into right directory tegra: usb: move [start|stop]_port into ehci_hcd_[init|stop] Marek Vasut (7): mxs: Reset the EMI block on mx23 mxs: mmc: spi: dma: Better wrap the MXS differences mxs: spi: Fix the MXS SPI for mx23 mxs: spi: Remove CONFIG_MXS_SPI_DMA_ENABLE mxs: Squash the header file usage in ehci-mxs mxs: Make ehci-mxs multiport capable mxs: m28: Enable power to USB port 0 Mark Jackson (1): Allow AM33xx boards to setup GPMC chipselects. Michael Jones (2): omap3: mvblx: select fpgafilename according to orientation omap3: mvblx: pass FPGA version to the kernel Michal Simek (3): xilinx: zynq: Enable DCC and create new zynq_dcc board arm: zynq: Add SLCR support with system reset arm: zynq: Add lowlevel initialization to C Mugunthan V N (1): am335x: cpsw: optimize cpsw_send to increase network performance Nicolas Ferre (2): arm: at91/configs: add libfdt to configuration arm: at91/configs: add bootz to configuration Nikita Kiryanov (14): omap: consolidate common mmc definitions omap_hsmmc: fix out of bounds array access omap_hsmmc: introduce omap_hsmmc_data struct omap_hsmmc: implement driver check for card detection cm-t35: implement board specific card detect check mmc: add support for write protection omap_hsmmc: add driver check for write protection omap3: add useful dss defines omap3: allow dynamic selection of gfx_format lcd: add option for board specific splash screen preparation cm-t35: add support for dvi displays cm-t35: add support for user defined lcd parameters lcd: implement a callback for splashimage cm_t35: prevent splashimage from being set to a bad value Otavio Salvador (11): build: imx: Fix 'u-boot.imx' build without full OBJTREE reference mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to CONFIG_SPL_MXS_PSWITCH_WAIT mx23: Document the tRAS lockout setting in memory initialization mx23evk: Adjust DRAM control register to use full 128MB of RAM led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set mxs: Fix iomux.h to not break build during assembly stage mx23_olinuxino: Add support for status LED mx23evk: Enable USB support mx23_olinuxino: Enable USB support mx23_olinuxino: Add ethernet support mx23_olinuxino: Fix warning for implicit declaration SRICHARAN R (6): ARM: OMAP4+: Change the PRCM structure prototype common for all Socs ARM: OMAP4+: Cleanup the clocks layer ARM: OMAP4+: Clean up the pmic code ARM: OMAP5: Add silicon id support for ES2.0 revision. ARM: OMAP5: clock: Add the prcm register changes required for ES2.0 ARM: OMAP4/5: clocks: Add the required OPP settings as per the latest addendum Stefano Babic (3): Merge branch 'master' of git://git.denx.de/u-boot-arm Merge branch 'master' of git://git.denx.de/u-boot-arm USB: drop unneeded header in ehci-mx6 Stephen Warren (8): ARM: mx6: use common CPU errata config options ARM: implement some Cortex-A9 errata workarounds ARM: tegra: enable some CPU errata workarounds ARM: tegra: implement WAR for Tegra114 CPU reset vector ARM: tegra: make bounce buffer option common disk: define HAVE_BLOCK_DEVICE in a common place disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART ARM: tegra: enable a common set of disk-related commands everywhere Tom Rini (9): am335x evm: Add am335x_evm_spiboot target am335x_evm: Never set CONFIG_EXTRA_ENV_SETTINGS in SPL am335x_evm: Add am335x_evm_usbspl build target am33xx: Update DDR3 EMIF configuration sequence am335x_evm: Enable CONFIG_CMD_BOOTZ omap5_evm: Enable CONFIG_CMD_BOOTZ omap3_beagle: Enable CONFIG_CMD_BOOTZ omap4_common: Enable CONFIG_CMD_BOOTZ Merge u-boot/master into u-boot-ti/master Tom Warren (27): Tegra114: I2C: Take DVFS out of reset to allow I2C5 (PWR_I2C) to work Tegra: I2C: Add T114 clock support to tegra_i2c driver Tegra114: fdt: Update DT files with I2C info for T114/Dalmore Tegra114: I2C: Enable I2C driver on Dalmore E1611 eval board Tegra: fdt: Change /include/ to #include for C preprocessor Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files Tegra: MMC: Add DT support to MMC driver for all T20 boards Tegra: fdt: Remove memreserve line from Cardhu/Seaboard DT files Tegra30: fdt: Sync DT nodes with kernel DT files (I2C, SPI, GPIO, clock) Tegra: Add twarren as maintainer for Tegra30 and Tegra114 SoCs Tegra: Remove unused CONFIG_SYS_CPU_OSC_FREQUENCY define Tegra114: fdt: Sync DT nodes with kernel DT files (GPIO, tegra_car) Tegra30: Cardhu: Remove unneeded cardhu.c.mmc file Tegra114: pinmux: Update pinmux tables & code, fix a bug w/SDMMC3 init Tegra30: Cardhu: Add pad config tables/code based on pinmux code Tegra30: fdt: Add SDMMC (sdhci) nodes for T30 boards (Cardhu for now) Tegra: MMC: Added/update SDMMC registers/base addresses for T20/T30 Tegra30: MMC: Add SD bus power-rail and SDMMC pad init routines mmc: Tegra: Add SD bus power/voltage function and MMC pad init call. Tegra30: mmc: Add Tegra30 SDMMC compatible entry to fdtdec & driver Tegra30: MMC: Enable DT MMC driver support for Tegra30 Cardhu boards Tegra114: pinmux: Fix bad CAM_MCLK func 3 table entry Tegra114: Fix/update GP padcfg register struct Tegra114: Dalmore: Always use DEFAULT instead of DISABLE for lock bits Tegra114: fdt: Move aliases from dtsi to dts file as per other Tegras Tegra114: Dalmore: Add pad config tables/code based on pinmux code Tomas Novotny (2): da8xx: ea20: Add the configuration define for the exact SoC variant da8xx: Add the missing pinmux for da830 to the gpio driver Wolfgang Denk (2): README.scrapyard: add missing commit IDs ARM: ns9750dev: remove remainders of dead board fabio.estevam(a)freescale.com (1): nitrogen: Use unsigned long to specify the total RAM size robertcnelson(a)gmail.com (2): beagle: expansion boards: retry i2c_read with 16bit addressing beagle: expansion boards: add LSR COM6L adapter .gitignore | 1 - MAINTAINERS | 11 + Makefile | 17 +- README | 29 ++ arch/arm/cpu/arm1136/mx35/generic.c | 2 +- arch/arm/cpu/arm720t/tegra114/cpu.c | 37 ++- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 2 +- arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 30 +- arch/arm/cpu/arm926ejs/config.mk | 2 +- arch/arm/cpu/arm926ejs/mxs/clock.c | 3 +- arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 16 +- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- arch/arm/cpu/arm926ejs/mxs/timer.c | 39 ++- arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 6 - arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 6 - arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/am33xx/board.c | 4 +- arch/arm/cpu/armv7/am33xx/ddr.c | 12 +- arch/arm/cpu/armv7/am33xx/u-boot-spl.lds | 67 +++++ arch/arm/cpu/armv7/config.mk | 2 +- arch/arm/cpu/armv7/mx6/Makefile | 1 - arch/arm/cpu/armv7/mx6/soc.c | 16 + arch/arm/cpu/armv7/omap-common/boot-common.c | 7 +- arch/arm/cpu/armv7/omap-common/clocks-common.c | 312 ++++++++++++++------ arch/arm/cpu/armv7/omap-common/emif-common.c | 73 ++--- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 23 +- arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 4 - arch/arm/cpu/armv7/omap-common/vc.c | 11 +- arch/arm/cpu/armv7/omap3/board.c | 6 +- arch/arm/cpu/armv7/omap4/Makefile | 3 +- arch/arm/cpu/armv7/omap4/clocks.c | 517 -------------------------------- arch/arm/cpu/armv7/omap4/hw_data.c | 491 ++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/omap4/hwinit.c | 36 +-- arch/arm/cpu/armv7/omap4/prcm-regs.c | 315 ++++++++++++++++++++ arch/arm/cpu/armv7/omap4/sdram_elpida.c | 34 ++- arch/arm/cpu/armv7/omap5/Makefile | 3 +- arch/arm/cpu/armv7/omap5/clocks.c | 494 ------------------------------- arch/arm/cpu/armv7/omap5/hw_data.c | 596 +++++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/omap5/hwinit.c | 292 ++++++++++++------ arch/arm/cpu/armv7/omap5/prcm-regs.c | 958 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/omap5/sdram.c | 214 +++++++++++--- arch/arm/cpu/armv7/start.S | 19 ++ arch/arm/cpu/armv7/tegra20/Makefile | 1 - arch/arm/cpu/armv7/tegra20/usb.c | 567 ----------------------------------- arch/arm/cpu/armv7/zynq/Makefile | 1 + arch/arm/cpu/armv7/zynq/cpu.c | 28 +- arch/arm/cpu/armv7/zynq/slcr.c | 63 ++++ arch/arm/cpu/ixp/u-boot.lds | 14 +- arch/arm/cpu/tegra114-common/pinmux.c | 410 ++++++++++++++++++++------ arch/arm/cpu/tegra30-common/pinmux.c | 190 +++++++++++- arch/arm/cpu/u-boot-spl.lds | 93 ++++++ arch/arm/cpu/u-boot.lds | 14 +- arch/arm/dts/tegra114.dtsi | 75 ++++- arch/arm/dts/tegra20.dtsi | 18 +- arch/arm/dts/tegra30.dtsi | 124 +++++--- arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 140 +-------- arch/arm/include/asm/arch-am33xx/spl.h | 1 + arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 + arch/arm/include/asm/arch-at91/at91sam9x5.h | 6 - arch/arm/include/asm/arch-davinci/gpio.h | 7 +- arch/arm/include/asm/arch-mx35/spl.h | 2 +- arch/arm/include/asm/arch-mx6/crm_regs.h | 12 + arch/arm/include/asm/arch-mx6/imx-regs.h | 8 + arch/arm/include/asm/arch-mx6/iomux.h | 5 + arch/arm/include/asm/arch-mx6/mx6-ddr.h | 85 ++++++ arch/arm/include/asm/arch-mx6/mx6-pins.h | 31 ++ arch/arm/include/asm/arch-mx6/mx6dl-ddr.h | 71 +++++ arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 193 ++++++------ arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 69 +++++ arch/arm/include/asm/arch-mx6/mx6q_pins.h | 1671 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/mx6x_pins.h | 1671 ------------------------------------------------------------------------------------------------------- arch/arm/include/asm/arch-mx6/mxc_hdmi.h | 1083 ++++++++++++++++++++++++++++++++++--------------------------------- arch/arm/include/asm/arch-mxs/dma.h | 19 +- arch/arm/include/asm/arch-mxs/imx-regs.h | 2 + arch/arm/include/asm/arch-mxs/iomux.h | 5 + arch/arm/include/asm/arch-mxs/regs-ssp.h | 26 ++ arch/arm/include/asm/arch-mxs/regs-timrot.h | 101 +++++++ arch/arm/include/asm/arch-omap3/dss.h | 31 ++ arch/arm/include/asm/arch-omap3/mmc_host_def.h | 139 +-------- arch/arm/include/asm/arch-omap3/spl.h | 2 +- arch/arm/include/asm/arch-omap4/clocks.h | 562 +++-------------------------------- arch/arm/include/asm/arch-omap4/mmc_host_def.h | 140 +-------- arch/arm/include/asm/arch-omap4/omap.h | 34 +-- arch/arm/include/asm/arch-omap4/spl.h | 2 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap5/clocks.h | 539 ++------------------------------- arch/arm/include/asm/arch-omap5/mmc_host_def.h | 140 +-------- arch/arm/include/asm/arch-omap5/mux_dra7xx.h | 344 +++++++++++++++++++++ arch/arm/include/asm/arch-omap5/mux_omap5.h | 8 - arch/arm/include/asm/arch-omap5/omap.h | 125 +++----- arch/arm/include/asm/arch-omap5/spl.h | 2 +- arch/arm/include/asm/arch-omap5/sys_proto.h | 10 +- arch/arm/include/asm/arch-tegra/mmc.h | 2 +- arch/arm/include/asm/arch-tegra/tegra_i2c.h | 6 + arch/arm/include/asm/arch-tegra/tegra_mmc.h | 48 ++- arch/arm/include/asm/{arch-tegra20 => arch-tegra}/usb.h | 22 -- arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 34 ++- arch/arm/include/asm/arch-tegra114/pinmux.h | 246 ++++++++-------- arch/arm/include/asm/arch-tegra20/tegra.h | 1 - arch/arm/include/asm/arch-tegra30/gp_padctrl.h | 6 + arch/arm/include/asm/arch-tegra30/pinmux.h | 67 ++++- arch/arm/include/asm/arch-tegra30/tegra.h | 2 + arch/arm/include/asm/arch-zynq/hardware.h | 85 ++++++ arch/arm/{cpu/armv7/mx6/lowlevel_init.S => include/asm/arch-zynq/sys_proto.h} | 27 +- arch/arm/include/asm/armv7.h | 1 + arch/arm/include/asm/emif.h | 20 +- arch/arm/include/asm/omap_common.h | 523 ++++++++++++++++++++++++++++++++ arch/arm/include/asm/omap_mmc.h | 168 +++++++++++ arch/arm/lib/Makefile | 1 + arch/arm/lib/bss.c | 39 +++ arch/avr32/cpu/u-boot.lds | 2 +- arch/blackfin/cpu/u-boot.lds | 2 +- arch/microblaze/cpu/u-boot.lds | 2 +- arch/mips/cpu/u-boot.lds | 2 +- arch/nds32/cpu/n1213/u-boot.lds | 2 +- arch/nios2/cpu/u-boot.lds | 2 +- arch/powerpc/cpu/74xx_7xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc512x/u-boot.lds | 2 +- arch/powerpc/cpu/mpc5xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds | 2 +- arch/powerpc/cpu/mpc5xxx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc8220/u-boot.lds | 2 +- arch/powerpc/cpu/mpc824x/u-boot.lds | 2 +- arch/powerpc/cpu/mpc8260/u-boot.lds | 2 +- arch/powerpc/cpu/mpc83xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 2 +- arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 2 +- arch/powerpc/cpu/mpc85xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc86xx/u-boot.lds | 2 +- arch/powerpc/cpu/ppc4xx/u-boot.lds | 2 +- arch/sandbox/cpu/u-boot.lds | 2 +- arch/sh/cpu/sh2/u-boot.lds | 2 +- arch/sh/cpu/sh3/u-boot.lds | 2 +- arch/sh/cpu/sh4/u-boot.lds | 2 +- arch/x86/cpu/u-boot.lds | 2 +- board/BuS/eb_cpu5282/u-boot.lds | 2 +- board/LEOX/elpt860/u-boot.lds | 2 +- board/RPXClassic/u-boot.lds | 2 +- board/RPXClassic/u-boot.lds.debug | 2 +- board/RPXlite/u-boot.lds | 2 +- board/RPXlite/u-boot.lds.debug | 2 +- board/RPXlite_dw/u-boot.lds | 2 +- board/RPXlite_dw/u-boot.lds.debug | 2 +- board/RRvision/u-boot.lds | 2 +- board/actux1/u-boot.lds | 24 +- board/actux2/u-boot.lds | 24 +- board/actux3/u-boot.lds | 18 +- board/adder/u-boot.lds | 2 +- board/ait/cam_enc_4xx/u-boot-spl.lds | 4 - board/altera/nios2-generic/u-boot.lds | 2 +- board/amcc/acadia/u-boot-nand.lds | 2 +- board/amcc/bamboo/u-boot-nand.lds | 2 +- board/amcc/canyonlands/u-boot-nand.lds | 2 +- board/amcc/kilauea/u-boot-nand.lds | 2 +- board/amcc/sequoia/u-boot-nand.lds | 2 +- board/amcc/sequoia/u-boot-ram.lds | 2 +- board/astro/mcf5373l/u-boot.lds | 2 +- board/atmel/at91sam9260ek/at91sam9260ek.c | 7 +- board/avionic-design/common/tamonten.c | 19 +- board/avionic-design/dts/tegra20-medcom-wide.dts | 3 +- board/avionic-design/dts/tegra20-plutux.dts | 3 +- board/avionic-design/dts/tegra20-tamonten.dtsi | 489 ++++++++++++++++++++++++++++++ board/avionic-design/dts/tegra20-tec.dts | 3 +- board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg | 58 ++++ board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg | 58 ++++ board/boundary/nitrogen6x/6x_bootscript.txt | 63 ++++ board/boundary/nitrogen6x/6x_bootscript_android.txt | 64 ++++ board/boundary/nitrogen6x/6x_bootscript_android_recovery.txt | 64 ++++ board/boundary/nitrogen6x/6x_upgrade.txt | 45 +++ board/boundary/nitrogen6x/800mhz_2x128mx16.cfg | 58 ++++ board/boundary/nitrogen6x/800mhz_2x256mx16.cfg | 58 ++++ board/boundary/nitrogen6x/800mhz_4x128mx16.cfg | 57 ++++ board/boundary/nitrogen6x/800mhz_4x256mx16.cfg | 58 ++++ board/boundary/nitrogen6x/Makefile | 41 +++ board/boundary/nitrogen6x/README | 92 ++++++ board/boundary/nitrogen6x/clocks.cfg | 46 +++ board/boundary/nitrogen6x/ddr-setup.cfg | 112 +++++++ board/boundary/nitrogen6x/nitrogen6dl.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6q.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6q2g.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6s.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6s1g.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6x.c | 895 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/cm_t35/Makefile | 1 + board/cm_t35/cm_t35.c | 16 +- board/cm_t35/display.c | 428 +++++++++++++++++++++++++++ board/cobra5272/u-boot.lds | 2 +- board/cogent/u-boot.lds | 2 +- board/cogent/u-boot.lds.debug | 2 +- board/comelit/dig297/dig297.c | 3 +- board/compal/dts/tegra20-paz00.dts | 21 +- board/compal/paz00/paz00.c | 26 +- board/compulab/dts/tegra20-trimslice.dts | 16 +- board/compulab/trimslice/trimslice.c | 23 +- board/corscience/tricorder/tricorder.c | 2 +- board/cray/L1/u-boot.lds.debug | 2 +- board/dave/PPChameleonEVB/u-boot.lds | 2 +- board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 5 - board/davinci/da8xxevm/u-boot-spl-hawk.lds | 5 - board/denx/m28evk/m28evk.c | 4 + board/dvlhost/u-boot.lds | 18 +- board/eltec/mhpc/u-boot.lds | 2 +- board/eltec/mhpc/u-boot.lds.debug | 2 +- board/emk/top860/u-boot.lds | 2 +- board/ep88x/u-boot.lds | 2 +- board/esd/dasa_sim/u-boot.lds | 2 +- board/esd/pmc440/u-boot-nand.lds | 2 +- board/esd/tasreg/u-boot.lds | 2 +- board/esteem192e/u-boot.lds | 2 +- board/evb64260/u-boot.lds | 2 +- board/fads/u-boot.lds | 2 +- board/flagadm/u-boot.lds | 2 +- board/flagadm/u-boot.lds.debug | 2 +- board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg | 10 +- board/freescale/m5208evbe/u-boot.lds | 2 +- board/freescale/m52277evb/u-boot.lds | 2 +- board/freescale/m5235evb/u-boot.lds | 2 +- board/freescale/m5249evb/u-boot.lds | 2 +- board/freescale/m5253demo/u-boot.lds | 2 +- board/freescale/m5253evbe/u-boot.lds | 2 +- board/freescale/m5271evb/u-boot.lds | 2 +- board/freescale/m5272c3/u-boot.lds | 2 +- board/freescale/m5275evb/u-boot.lds | 2 +- board/freescale/m5282evb/u-boot.lds | 2 +- board/freescale/m53017evb/u-boot.lds | 2 +- board/freescale/m5329evb/u-boot.lds | 2 +- board/freescale/m5373evb/u-boot.lds | 2 +- board/freescale/m54418twr/u-boot.lds | 2 +- board/freescale/m54451evb/u-boot.lds | 2 +- board/freescale/m54455evb/u-boot.lds | 2 +- board/freescale/m547xevb/u-boot.lds | 2 +- board/freescale/m548xevb/u-boot.lds | 2 +- board/freescale/mx23evk/spl_boot.c | 10 + board/freescale/mx31ads/u-boot.lds | 16 +- board/freescale/mx6qarm2/mx6qarm2.c | 78 ++--- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 60 ++-- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 292 +++++++++--------- board/freescale/mx6qsabresd/mx6qsabresd.c | 102 +++---- board/gaisler/gr_cpci_ax2000/u-boot.lds | 2 +- board/gaisler/gr_ep2s60/u-boot.lds | 2 +- board/gaisler/gr_xc3s_1500/u-boot.lds | 2 +- board/gaisler/grsim/u-boot.lds | 2 +- board/gaisler/grsim_leon2/u-boot.lds | 2 +- board/gen860t/u-boot-flashenv.lds | 2 +- board/gen860t/u-boot.lds | 2 +- board/genietv/u-boot.lds | 2 +- board/genietv/u-boot.lds.debug | 2 +- board/hermes/u-boot.lds | 2 +- board/hermes/u-boot.lds.debug | 2 +- board/htkw/mcx/mcx.c | 3 +- board/hymod/u-boot.lds | 2 +- board/hymod/u-boot.lds.debug | 2 +- board/icu862/u-boot.lds | 2 +- board/icu862/u-boot.lds.debug | 2 +- board/idmr/u-boot.lds | 2 +- board/ip860/u-boot.lds | 2 +- board/ip860/u-boot.lds.debug | 2 +- board/isee/igep00x0/igep00x0.c | 3 +- board/isee/igep00x0/igep00x0.h | 7 +- board/ivm/u-boot.lds | 2 +- board/ivm/u-boot.lds.debug | 2 +- board/korat/u-boot-F7FC.lds | 2 +- board/kup/kup4k/u-boot.lds | 2 +- board/kup/kup4k/u-boot.lds.debug | 2 +- board/kup/kup4x/u-boot.lds | 2 +- board/kup/kup4x/u-boot.lds.debug | 2 +- board/logicpd/am3517evm/am3517evm.c | 3 +- board/logicpd/omap3som/omap3logic.c | 2 +- board/logicpd/zoom1/zoom1.c | 3 +- board/logicpd/zoom2/zoom2.c | 3 +- board/lwmon/u-boot.lds | 2 +- board/lwmon/u-boot.lds.debug | 2 +- board/manroland/uc100/u-boot.lds | 2 +- board/matrix_vision/mvblx/fpga.c | 14 +- board/matrix_vision/mvblx/mvblx.c | 4 +- board/matrix_vision/mvblx/sys_eeprom.c | 24 ++ board/matrix_vision/mvsmr/u-boot.lds | 2 +- board/mbx8xx/u-boot.lds | 2 +- board/mbx8xx/u-boot.lds.debug | 2 +- board/mousse/u-boot.lds | 2 +- board/mpl/pip405/u-boot.lds.debug | 2 +- board/mvblue/u-boot.lds | 2 +- board/netphone/u-boot.lds | 2 +- board/netphone/u-boot.lds.debug | 2 +- board/netta/u-boot.lds | 2 +- board/netta/u-boot.lds.debug | 2 +- board/netta2/u-boot.lds | 2 +- board/netta2/u-boot.lds.debug | 2 +- board/netvia/u-boot.lds | 2 +- board/netvia/u-boot.lds.debug | 2 +- board/nokia/rx51/rx51.c | 4 +- board/ns9750dev/config.mk | 16 - board/ns9750dev/flash.c | 474 ----------------------------- board/ns9750dev/led.c | 46 --- board/ns9750dev/lowlevel_init.S | 298 ------------------- board/ns9750dev/ns9750dev.c | 125 -------- board/nvidia/cardhu/cardhu.c | 57 +++- board/nvidia/cardhu/cardhu.c.mmc | 151 ---------- board/nvidia/cardhu/pinmux-config-cardhu.h | 21 +- board/nvidia/common/board.c | 56 +++- board/nvidia/dalmore/dalmore.c | 3 + board/nvidia/dalmore/pinmux-config-dalmore.h | 475 ++++++++++++++++++----------- board/nvidia/dts/tegra114-dalmore.dts | 35 ++- board/nvidia/dts/tegra20-harmony.dts | 20 +- board/nvidia/dts/tegra20-seaboard.dts | 15 +- board/nvidia/dts/tegra20-ventana.dts | 17 +- board/nvidia/dts/tegra20-whistler.dts | 15 +- board/nvidia/dts/tegra30-cardhu.dts | 23 +- board/nvidia/harmony/harmony.c | 26 +- board/nvidia/seaboard/seaboard.c | 25 +- board/nvidia/whistler/whistler.c | 30 +- board/nx823/u-boot.lds | 2 +- board/nx823/u-boot.lds.debug | 2 +- board/olimex/mx23_olinuxino/mx23_olinuxino.c | 13 + board/olimex/mx23_olinuxino/spl_boot.c | 8 + board/openrisc/openrisc-generic/u-boot.lds | 2 +- board/overo/overo.c | 3 +- board/pandora/pandora.c | 3 +- board/phytec/pcm051/mux.c | 1 - board/quantum/u-boot.lds | 2 +- board/r360mpi/u-boot.lds | 2 +- board/rbc823/u-boot.lds | 2 +- board/renesas/sh7752evb/u-boot.lds | 2 +- board/renesas/sh7757lcr/u-boot.lds | 2 +- board/rsdproto/u-boot.lds | 2 +- board/samsung/smdk5250/smdk5250-uboot-spl.lds | 2 +- board/samsung/smdk6400/u-boot-nand.lds | 2 +- board/sandburst/karef/u-boot.lds.debug | 2 +- board/sandburst/metrobox/u-boot.lds.debug | 2 +- board/sandpoint/u-boot.lds | 2 +- board/sixnet/u-boot.lds | 2 +- board/snmc/qs850/u-boot.lds | 2 +- board/snmc/qs860t/u-boot.lds | 2 +- board/spc1920/u-boot.lds | 2 +- board/spd8xx/u-boot.lds | 2 +- board/spd8xx/u-boot.lds.debug | 2 +- board/stx/stxxtc/u-boot.lds | 2 +- board/stx/stxxtc/u-boot.lds.debug | 2 +- board/svm_sc8xx/u-boot.lds | 2 +- board/technexion/twister/twister.c | 2 +- board/teejet/mt_ventoux/mt_ventoux.c | 4 +- board/ti/am335x/board.c | 40 +-- board/ti/am3517crane/am3517crane.c | 3 +- board/ti/beagle/beagle.c | 17 +- board/ti/beagle/beagle.h | 6 +- board/{ns9750dev => ti/dra7xx}/Makefile | 22 +- board/ti/dra7xx/evm.c | 103 +++++++ board/ti/dra7xx/mux_data.h | 47 +++ board/ti/evm/evm.c | 3 +- board/ti/omap5_evm/evm.c | 4 +- board/ti/panda/panda.c | 3 +- board/ti/sdp3430/sdp.c | 3 +- board/ti/sdp4430/sdp.c | 4 +- board/timll/devkit8000/devkit8000.c | 3 +- board/toradex/colibri_t20_iris/colibri_t20_iris.c | 11 +- board/toradex/dts/tegra20-colibri_t20_iris.dts | 9 +- board/tqc/tqm8xx/u-boot.lds | 2 +- board/v37/u-boot.lds | 2 +- board/vpac270/u-boot-spl.lds | 4 - board/w7o/u-boot.lds.debug | 2 +- board/xes/xpedite1000/u-boot.lds.debug | 2 +- boards.cfg | 12 + common/cmd_help.c | 2 +- common/cmd_led.c | 6 +- common/cmd_mmc.c | 7 + common/cmd_sata.c | 2 +- common/lcd.c | 41 +++ common/spl/Makefile | 1 + common/spl/spl.c | 10 + common/spl/spl_onenand.c | 47 +++ config.mk | 2 - disk/part.c | 10 - disk/part_amiga.c | 6 +- disk/part_dos.c | 7 +- disk/part_efi.c | 8 +- disk/part_iso.c | 7 +- disk/part_mac.c | 7 +- doc/README.commands | 18 +- doc/README.displaying-bmps | 27 ++ doc/README.ns9750dev | 36 --- doc/README.scrapyard | 161 +++++----- doc/SPL/README.am335x-network | 92 ++++++ doc/driver-model/UDM-serial.txt | 2 +- drivers/gpio/da8xx_gpio.c | 137 ++++++++- drivers/i2c/tegra_i2c.c | 42 ++- drivers/mmc/arm_pl180_mmci.c | 1 + drivers/mmc/bfin_sdh.c | 1 + drivers/mmc/davinci_mmc.c | 1 + drivers/mmc/fsl_esdhc.c | 1 + drivers/mmc/ftsdc010_esdhc.c | 1 + drivers/mmc/gen_atmel_mci.c | 1 + drivers/mmc/mmc.c | 17 ++ drivers/mmc/mmc_spi.c | 1 + drivers/mmc/mxcmmc.c | 1 + drivers/mmc/mxsmmc.c | 21 +- drivers/mmc/omap_hsmmc.c | 103 +++++-- drivers/mmc/sdhci.c | 1 + drivers/mmc/sh_mmcif.c | 1 + drivers/mmc/tegra_mmc.c | 227 ++++++++++---- drivers/mtd/onenand/onenand_spl.c | 14 +- drivers/net/cpsw.c | 20 +- drivers/serial/Makefile | 1 - drivers/serial/ns9750_serial.c | 218 -------------- drivers/serial/serial.c | 2 - drivers/spi/mxs_spi.c | 39 ++- drivers/usb/host/ehci-mx6.c | 1 - drivers/usb/host/ehci-mxs.c | 155 +++++----- drivers/usb/host/ehci-tegra.c | 546 +++++++++++++++++++++++++++++++++- drivers/video/omap3_dss.c | 2 +- dts/Makefile | 3 +- helper.mk | 64 ---- include/command.h | 2 +- include/config_fallbacks.h | 11 + include/configs/am335x_evm.h | 85 +++++- include/configs/apx4devkit.h | 3 +- include/configs/at91rm9200ek.h | 3 + include/configs/at91sam9260ek.h | 23 +- include/configs/at91sam9261ek.h | 19 +- include/configs/at91sam9263ek.h | 20 +- include/configs/at91sam9m10g45ek.h | 17 +- include/configs/at91sam9rlek.h | 3 + include/configs/at91sam9x5ek.h | 12 +- include/configs/cardhu.h | 12 +- include/configs/cm_t35.h | 9 + include/configs/colibri_t20_iris.h | 6 - include/configs/dalmore.h | 9 + include/configs/dra7xx_evm.h | 36 +++ include/configs/ea20.h | 1 + include/configs/harmony.h | 8 - include/configs/igep00x0.h | 7 +- include/configs/m28evk.h | 5 +- include/configs/medcom-wide.h | 5 - include/configs/mx23_olinuxino.h | 64 +++- include/configs/mx23evk.h | 14 +- include/configs/mx28evk.h | 4 +- include/configs/mx6_common.h | 23 ++ include/configs/mx6qarm2.h | 3 + include/configs/mx6qsabre_common.h | 4 + include/configs/mx6qsabrelite.h | 4 + include/configs/nitrogen6x.h | 285 ++++++++++++++++++ include/configs/ns9750dev.h | 187 ------------ include/configs/omap3_beagle.h | 3 +- include/configs/omap3_mvblx.h | 25 +- include/configs/omap4_common.h | 2 +- include/configs/omap5_common.h | 262 ++++++++++++++++ include/configs/omap5_evm.h | 240 +-------------- include/configs/paz00.h | 8 - include/configs/pcm051.h | 2 +- include/configs/plutux.h | 5 - include/configs/sc_sps_1.h | 3 +- include/configs/seaboard.h | 8 - include/configs/tec.h | 5 - include/configs/tegra-common.h | 23 +- include/configs/tegra114-common.h | 3 + include/configs/tegra20-common.h | 12 +- include/configs/tegra30-common.h | 6 + include/configs/trimslice.h | 8 - include/configs/ventana.h | 8 - include/configs/whistler.h | 8 - include/configs/zynq.h | 5 + include/env_callback.h | 9 +- include/fdtdec.h | 3 + include/lcd.h | 1 + include/linker_lists.h | 252 ++++++++++++---- include/mmc.h | 2 + include/ns9750_bbus.h | 125 -------- include/ns9750_mem.h | 172 ----------- include/ns9750_ser.h | 202 ------------- include/ns9750_sys.h | 215 -------------- include/spl.h | 3 + lib/fdtdec.c | 3 + nand_spl/board/freescale/mpc8536ds/Makefile | 7 +- nand_spl/board/freescale/mpc8569mds/Makefile | 7 +- nand_spl/board/freescale/mpc8572ds/Makefile | 7 +- nand_spl/board/freescale/mx31pdk/Makefile | 7 +- nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 +- nand_spl/board/freescale/p1010rdb/Makefile | 7 +- nand_spl/board/freescale/p1023rds/Makefile | 7 +- nand_spl/board/freescale/p1_p2_rdb/Makefile | 7 +- nand_spl/board/karo/tx25/Makefile | 7 +- nand_spl/board/karo/tx25/u-boot.lds | 2 +- nand_spl/board/samsung/smdk6400/u-boot.lds | 2 +- spl/.gitignore | 1 - spl/Makefile | 10 +- 486 files changed, 15587 insertions(+), 10406 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/u-boot-spl.lds delete mode 100644 arch/arm/cpu/armv7/omap4/clocks.c create mode 100644 arch/arm/cpu/armv7/omap4/hw_data.c create mode 100644 arch/arm/cpu/armv7/omap4/prcm-regs.c delete mode 100644 arch/arm/cpu/armv7/omap5/clocks.c create mode 100644 arch/arm/cpu/armv7/omap5/hw_data.c create mode 100644 arch/arm/cpu/armv7/omap5/prcm-regs.c delete mode 100644 arch/arm/cpu/armv7/tegra20/usb.c create mode 100644 arch/arm/cpu/armv7/zynq/slcr.c create mode 100644 arch/arm/cpu/u-boot-spl.lds create mode 100644 arch/arm/include/asm/arch-mx6/mx6-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6-pins.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6q-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6q_pins.h delete mode 100644 arch/arm/include/asm/arch-mx6/mx6x_pins.h create mode 100644 arch/arm/include/asm/arch-omap5/mux_dra7xx.h rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/usb.h (89%) create mode 100644 arch/arm/include/asm/arch-zynq/hardware.h rename arch/arm/{cpu/armv7/mx6/lowlevel_init.S => include/asm/arch-zynq/sys_proto.h} (54%) create mode 100644 arch/arm/include/asm/omap_mmc.h create mode 100644 arch/arm/lib/bss.c create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi create mode 100644 board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/6x_bootscript.txt create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android.txt create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android_recovery.txt create mode 100644 board/boundary/nitrogen6x/6x_upgrade.txt create mode 100644 board/boundary/nitrogen6x/800mhz_2x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_2x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_4x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_4x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/Makefile create mode 100644 board/boundary/nitrogen6x/README create mode 100644 board/boundary/nitrogen6x/clocks.cfg create mode 100644 board/boundary/nitrogen6x/ddr-setup.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6dl.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6dl2g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6q.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6q2g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6s.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6s1g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6x.c create mode 100644 board/cm_t35/display.c delete mode 100644 board/ns9750dev/config.mk delete mode 100644 board/ns9750dev/flash.c delete mode 100644 board/ns9750dev/led.c delete mode 100644 board/ns9750dev/lowlevel_init.S delete mode 100644 board/ns9750dev/ns9750dev.c delete mode 100644 board/nvidia/cardhu/cardhu.c.mmc rename board/{ns9750dev => ti/dra7xx}/Makefile (74%) create mode 100644 board/ti/dra7xx/evm.c create mode 100644 board/ti/dra7xx/mux_data.h create mode 100644 common/spl/spl_onenand.c create mode 100644 doc/README.displaying-bmps delete mode 100644 doc/README.ns9750dev create mode 100644 doc/SPL/README.am335x-network delete mode 100644 drivers/serial/ns9750_serial.c delete mode 100644 helper.mk create mode 100644 include/configs/dra7xx_evm.h create mode 100644 include/configs/mx6_common.h create mode 100644 include/configs/nitrogen6x.h delete mode 100644 include/configs/ns9750dev.h create mode 100644 include/configs/omap5_common.h delete mode 100644 include/ns9750_bbus.h delete mode 100644 include/ns9750_mem.h delete mode 100644 include/ns9750_ser.h delete mode 100644 include/ns9750_sys.h Amicalement, -- Albert.

2 5

[U-Boot] [PATCH 0/5] Make iim support common to mpc and imx
by Benoît Thébaudeau 18 Mar '13

18 Mar '13

Hi all, The subject says everything. ;) Best regards, Benoît

5 37