November 2016 - U-Boot

[U-Boot] (no subject)
by Rick Bronson 25 Nov '16

25 Nov '16

Hi All, I've got nsupported RK3288 hardware running the latest git u-boot to SPL as explained in http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.rockchip. My goal is to run the mainline (ie. not Android) Linux kernel on this hardware and wondered: - Do I need to get the latest git u-boot to run before I can run the mainline kernel? Or can I use github.com/linux-rockchip/u-boot-rockchip.git, which I have running u-boot fully. - The device tree seems to be in two places, once via: resource_tool --image=resource2.img --pack linux/logo.bmp ${DTS}.dtb that gets put into the resource file and then again at the end of the kernel via CONFIG_ARM_APPENDED_DTB. Do I need both? When I do both I get things like: .... Unknow param: MACHINE_MODEL:rk30sdk! Unknow param: MACHINE_ID:007! .... Thanks much. Rick

1 0

[U-Boot] [PATCH 0/7] SF: Cadence QSPI driver fixes and clean up
by Phil Edworthy 25 Nov '16

25 Nov '16

This series has fixes, patches to clean the code up, and add support for specifying the sampling edge. Phil Edworthy (7): spi: cadence_qspi: Fix clearing of pol/pha bits spi: cadence_qspi: Fix baud rate calculation spi: cadence_qspi: Use #define for bits instead of bit shifts spi: cadence_qspi: Clean up the #define names spi: cadence_qspi: Remove returns from end of void functions spi: cadence_qspi: Fix CQSPI_CAL_DELAY calculation spi: cadence_qspi: Support specifying the sample edge used doc/device-tree-bindings/spi/spi-cadence.txt | 2 + drivers/spi/cadence_qspi.c | 10 +- drivers/spi/cadence_qspi.h | 3 +- drivers/spi/cadence_qspi_apb.c | 164 +++++++++++++-------------- 4 files changed, 88 insertions(+), 91 deletions(-) -- 2.5.0

4 14

[U-Boot] [PATCH] splash: add support for loading splash from a FIT image
by Tomas Melin 25 Nov '16

25 Nov '16

Enable support for loading a splash image from within a FIT image. The image is assumed to be generated with mkimage -E flag to hold the data external to the FIT. Signed-off-by: Tomas Melin <tomas.melin(a)vaisala.com> --- common/splash_source.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/splash.h | 1 + 2 files changed, 74 insertions(+) diff --git a/common/splash_source.c b/common/splash_source.c index 72df2c1..d72aee1 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -16,6 +16,7 @@ #include <sata.h> #include <bmp_layout.h> #include <fs.h> +#include <fdt_support.h> DECLARE_GLOBAL_DATA_PTR; @@ -295,6 +296,74 @@ static struct splash_location *select_splash_location( return NULL; } +#ifdef CONFIG_FIT +static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr) +{ + int res; + int node_offset; + int splash_offset; + int splash_size; + const fdt32_t *val; + struct image_header *img_header; + const u32 *fit_header; + u32 fit_size; + const size_t header_size = sizeof(struct image_header); + + /* Read in image header */ + res = splash_storage_read_raw(location, bmp_load_addr, header_size); + if (res < 0) + return res; + + img_header = (struct image_header*)bmp_load_addr; + fit_size = fdt_totalsize(img_header); + + fit_header = (const u32*)(bmp_load_addr + header_size); + /* Read in entire FIT */ + res = splash_storage_read_raw(location, (u32)fit_header, fit_size); + if (res < 0) + return res; + + res = fit_check_format(fit_header); + if (!res) { + printf("Could not find valid FIT-image\n"); + return -EINVAL; + } + + node_offset = fit_image_get_node(fit_header, location->name); + if (node_offset < 0) { + printf("Could not find splash image '%s' in FIT\n", + location->name); + return -ENOENT; + } + + val = fdt_getprop(fit_header, node_offset, "data-offset", NULL); + if (!val) { + printf("Could not find 'data-offset' property in FIT\n"); + return -ENOENT; + } + splash_offset = fdt32_to_cpu(*val); + + val = fdt_getprop(fit_header, node_offset, "data-size", NULL); + if (!val) { + printf("Could not find 'data-size' property in FIT\n"); + return -ENOENT; + } + splash_size = fdt32_to_cpu(*val); + + /* Align data offset to 4-byte boundrary */ + fit_size = fdt_totalsize(fit_header); + fit_size = (fit_size + 3) & ~3; + + /* Read in the splash data */ + location->offset = (location->offset + fit_size + splash_offset); + res = splash_storage_read_raw(location, bmp_load_addr , splash_size); + if (res < 0) + return res; + + return 0; +} +#endif /* CONFIG_FIT */ + /** * splash_source_load - load splash image from a supported location. * @@ -331,5 +400,9 @@ int splash_source_load(struct splash_location *locations, uint size) return splash_load_raw(splash_location, bmp_load_addr); else if (splash_location->flags == SPLASH_STORAGE_FS) return splash_load_fs(splash_location, bmp_load_addr); +#ifdef CONFIG_FIT + else if (splash_location->flags == SPLASH_STORAGE_FIT) + return splash_load_fit(splash_location, bmp_load_addr); +#endif return -EINVAL; } diff --git a/include/splash.h b/include/splash.h index 136eac7..af4e61f 100644 --- a/include/splash.h +++ b/include/splash.h @@ -35,6 +35,7 @@ enum splash_storage { enum splash_flags { SPLASH_STORAGE_RAW, SPLASH_STORAGE_FS, + SPLASH_STORAGE_FIT, }; struct splash_location { -- 2.1.4

2 2

[U-Boot] [PATCH 0/3] mmc: sdhci: Add support for frequency constrained peripheral interfaces
by Stefan Herbrechtsmeier 25 Nov '16

25 Nov '16

The sdhci controller assumes that the base clock frequency is fully supported by the peripheral and doesn't support hardware limitations. Distinguish between base clock of the host controller and maximal supported peripheral clock frequency of the peripheral interface. This is needed for the zynq platform to support two sdhci ports with different IO routings. Stefan Herbrechtsmeier (3): mmc: sdhci: Distinguish between base clock and maximum peripheral frequency mmc: zynq: Determine base clock frequency via clock framework mmc: zynq: Add fdt max-frequency support arch/arm/mach-zynq/clk.c | 23 ++++++++++++++++++++ arch/arm/mach-zynq/include/mach/clk.h | 1 + drivers/mmc/atmel_sdhci.c | 7 ++++-- drivers/mmc/bcm2835_sdhci.c | 3 ++- drivers/mmc/ftsdc021_sdhci.c | 3 ++- drivers/mmc/kona_sdhci.c | 3 ++- drivers/mmc/msm_sdhci.c | 2 ++ drivers/mmc/mv_sdhci.c | 3 ++- drivers/mmc/pci_mmc.c | 1 + drivers/mmc/pic32_sdhci.c | 4 +++- drivers/mmc/rockchip_sdhci.c | 4 ++-- drivers/mmc/s5p_sdhci.c | 5 +++-- drivers/mmc/sdhci.c | 28 ++++++++++++------------ drivers/mmc/spear_sdhci.c | 3 ++- drivers/mmc/zynq_sdhci.c | 40 ++++++++++++++++++++++++++++++++++- include/sdhci.h | 13 ++++++------ 16 files changed, 111 insertions(+), 32 deletions(-) -- 2.7.4 Kommanditgesellschaft - Sitz: Detmold - Amtsgericht Lemgo HRA 2790 - Komplementärin: Weidmüller Interface Führungsgesellschaft mbH - Sitz: Detmold - Amtsgericht Lemgo HRB 3924; Geschäftsführer: José Carlos Álvarez Tobar, Elke Eckstein, Dr. Peter Köhler, Jörg Timmermann; USt-ID-Nr. DE124599660

3 7

Re: [U-Boot] [RFC PATCH 1/1] Read mmc device memory capacity from EXT_CSD if memory is addressed by sector
by Tomas Melin 25 Nov '16

25 Nov '16

Hi, We have successfully been using this patch to fix the problem mentioned in the original message. Could this be picked up upstream? BR, Tomas On Wed Feb 5 21:00:42 CET 2014, Frank Bormann wrote: >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 at 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 3

[U-Boot] [PATCH v2] mmc: add bkops-enable command
by Tomas Melin 25 Nov '16

25 Nov '16

Add new command that provides possibility to enable the background operations handshake functionality (BKOPS_EN, EXT_CSD byte [163]) on eMMC devices. This is an optional feature of eMMCs, the setting is write-once. The command must be explicitly taken into use with CONFIG_CMD_BKOPS_ENABLE. Signed-off-by: Tomas Melin <tomas.melin(a)vaisala.com> --- cmd/Kconfig | 7 +++++++ cmd/mmc.c | 32 ++++++++++++++++++++++++++++++++ drivers/mmc/mmc.c | 32 ++++++++++++++++++++++++++++++++ include/mmc.h | 6 ++++++ 4 files changed, 77 insertions(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index e339d86..8286d15 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -550,6 +550,13 @@ config SYS_AMBAPP_PRINT_ON_STARTUP help Show AMBA Plug-n-Play information on startup. +config CMD_BKOPS_ENABLE + bool "mmc bkops enable" + depends on CMD_MMC + default n + help + Enable background operations handshake on device. + config CMD_BLOCK_CACHE bool "blkcache - control and stats for block cache" depends on BLOCK_CACHE diff --git a/cmd/mmc.c b/cmd/mmc.c index b2761e9..b8dcc26 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -729,6 +729,31 @@ static int do_mmc_setdsr(cmd_tbl_t *cmdtp, int flag, return ret; } +#ifdef CONFIG_CMD_BKOPS_ENABLE +static int do_mmc_bkops_enable(cmd_tbl_t *cmdtp, int flag, + int argc, char * const argv[]) +{ + int dev; + struct mmc *mmc; + + if (argc != 2) + return CMD_RET_USAGE; + + dev = simple_strtoul(argv[1], NULL, 10); + + mmc = init_mmc_device(dev, false); + if (!mmc) + return CMD_RET_FAILURE; + + if (IS_SD(mmc)) { + puts("BKOPS_EN only exists on eMMC\n"); + return CMD_RET_FAILURE; + } + + return mmc_set_bkops_enable(mmc); +} +#endif + static cmd_tbl_t cmd_mmc[] = { U_BOOT_CMD_MKENT(info, 1, 0, do_mmcinfo, "", ""), U_BOOT_CMD_MKENT(read, 4, 1, do_mmc_read, "", ""), @@ -749,6 +774,9 @@ static cmd_tbl_t cmd_mmc[] = { U_BOOT_CMD_MKENT(rpmb, CONFIG_SYS_MAXARGS, 1, do_mmcrpmb, "", ""), #endif U_BOOT_CMD_MKENT(setdsr, 2, 0, do_mmc_setdsr, "", ""), +#ifdef CONFIG_CMD_BKOPS_ENABLE + U_BOOT_CMD_MKENT(bkops-enable, 2, 0, do_mmc_bkops_enable, "", ""), +#endif }; static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -813,6 +841,10 @@ U_BOOT_CMD( "mmc rpmb counter - read the value of the write counter\n" #endif "mmc setdsr <value> - set DSR register value\n" +#ifdef CONFIG_CMD_BKOPS_ENABLE + "mmc bkops-enable <dev> - enable background operations handshake on device\n" + " WARNING: This is a write-once setting.\n" +#endif ); /* Old command kept for compatibility. Same as 'mmc info' */ diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 0cec02c..d40d13f 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1810,3 +1810,35 @@ int mmc_initialize(bd_t *bis) mmc_do_preinit(); return 0; } + +#ifdef CONFIG_CMD_BKOPS_ENABLE +int mmc_set_bkops_enable(struct mmc *mmc) +{ + int err; + ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN); + + err = mmc_send_ext_csd(mmc, ext_csd); + if (err) { + puts("Could not get ext_csd register values\n"); + return err; + } + + if (!(ext_csd[EXT_CSD_BKOPS_SUPPORT] & 0x1)) { + puts("Background operations not supported on device\n"); + return -EMEDIUMTYPE; + } + + if (ext_csd[EXT_CSD_BKOPS_EN] & 0x1) { + puts("Background operations already enabled\n"); + return 0; + } + + err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BKOPS_EN, 1); + if (err) { + puts("Failed to enable background operations\n"); + return err; + } + + return 0; +} +#endif diff --git a/include/mmc.h b/include/mmc.h index 5ef37d3..2c677f7 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -175,6 +175,7 @@ #define EXT_CSD_MAX_ENH_SIZE_MULT 157 /* R */ #define EXT_CSD_PARTITIONING_SUPPORT 160 /* RO */ #define EXT_CSD_RST_N_FUNCTION 162 /* R/W */ +#define EXT_CSD_BKOPS_EN 163 /* R/W */ #define EXT_CSD_WR_REL_PARAM 166 /* R */ #define EXT_CSD_WR_REL_SET 167 /* R/W */ #define EXT_CSD_RPMB_MULT 168 /* RO */ @@ -189,6 +190,7 @@ #define EXT_CSD_HC_WP_GRP_SIZE 221 /* RO */ #define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */ #define EXT_CSD_BOOT_MULT 226 /* RO */ +#define EXT_CSD_BKOPS_SUPPORT 502 /* RO */ /* * EXT_CSD field definitions @@ -541,6 +543,10 @@ int mmc_rpmb_read(struct mmc *mmc, void *addr, unsigned short blk, unsigned short cnt, unsigned char *key); int mmc_rpmb_write(struct mmc *mmc, void *addr, unsigned short blk, unsigned short cnt, unsigned char *key); +#ifdef CONFIG_CMD_BKOPS_ENABLE +int mmc_set_bkops_enable(struct mmc *mmc); +#endif + /** * Start device initialization and return immediately; it does not block on * polling OCR (operation condition register) status. Then you should call -- 2.1.4

2 2

[U-Boot] [RFC PATCH 0/7] FPGA changes
by Chris Packham 25 Nov '16

25 Nov '16

Patches 1-3,5-6 are moving existing options to Kconfig. I haven't touched all the boards that use these options so they are still present in the whitelist. Hopefully someone more familiar with the zynq boards can build on top of these. Patches 4 and 7 are the functional changes I actually want to introduce. We have some boards where the FPGA images require the reverse bitstream mode. I think this may be some setting in the Xilinx tools but it seems to be permanently set in the images coming out of our hardware team. Chris Packham (7): fpga: CONFIG_SYS_FPGA_PROG_FEEDBACK -> CONFIG_FPGA_PROG_FEEDBACK fpga: add Kconfig support for Xilinx Spartan devices Move CONFIG_FPGA_SPARTAN options to defconfig fpga/spartan3: make output quieter fpga: add Kconfig for CONFIG_FPGA_PROG_FEEDBACK Move FPGA_PROG_FEEDBACK to defconfig fpga/spartan3: add reverse bitstream mode README | 2 +- board/astro/mcf5373l/fpga.c | 4 ++-- configs/PMC440_defconfig | 3 +++ configs/apf27_defconfig | 3 +++ configs/astro_mcf5373l_defconfig | 3 +++ configs/mt_ventoux_defconfig | 3 +++ configs/x600_defconfig | 2 ++ drivers/fpga/ACEX1K.c | 8 ++++---- drivers/fpga/Kconfig | 24 ++++++++++++++++++++++++ drivers/fpga/cyclon2.c | 10 +++++----- drivers/fpga/spartan2.c | 22 +++++++++++----------- drivers/fpga/spartan3.c | 32 ++++++++++++++++++++++---------- drivers/fpga/virtex2.c | 18 +++++++++--------- include/configs/M54455EVB.h | 2 +- include/configs/PMC440.h | 4 ---- include/configs/apf27.h | 6 ------ include/configs/astro_mcf5373l.h | 4 ---- include/configs/mt_ventoux.h | 5 ----- include/configs/x600.h | 3 --- scripts/config_whitelist.txt | 2 +- 20 files changed, 94 insertions(+), 66 deletions(-) -- 2.10.2

3 20

[U-Boot] [PATCH] Read mmc device memory capacity from EXT_CSD if memory is addressed by sector
by Tomas Melin 25 Nov '16

25 Nov '16

From: Frank Bormann <fbormann(a)yahoo.com> 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.1.4

1 0

[U-Boot] [PATCH] mmc: s5p_sdhci: fix to check proper pinmux id
by Seung-Woo Kim 25 Nov '16

25 Nov '16

At sdhci_get_config(), there was wrong condition to check pimux id, so this patch fixes to check proper pinmux id. Signed-off-by: Seung-Woo Kim <sw0312.kim(a)samsung.com> --- drivers/mmc/s5p_sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index b329bef..ac737e0 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -152,7 +152,7 @@ static int sdhci_get_config(const void *blob, int node, struct sdhci_host *host) /* Get device id */ dev_id = pinmux_decode_periph_id(blob, node); - if (dev_id < PERIPH_ID_SDMMC0 && dev_id > PERIPH_ID_SDMMC3) { + if (dev_id < PERIPH_ID_SDMMC0 || dev_id > PERIPH_ID_SDMMC3) { debug("MMC: Can't get device id\n"); return -EINVAL; } -- 1.7.9.5

2 3

[U-Boot] [PATCH v2 0/3] ARM: ti: DFU environment consolidation + AM57x DFU
by Sekhar Nori 25 Nov '16

25 Nov '16

This patch series consolidates DFU environment variables into newly created include/environment/ti/dfu.h Then goes on to add DFU support for AM57x GP EVM. Build tested using the following buildman commands: $ tools/buildman/buildman -j 16 -b dfu -c 3 -o test am33xx $ tools/buildman/buildman -j 16 -b dfu -c 3 -o test omap v1 submission here: https://www.mail-archive.com/u-boot@lists.denx.de/msg222838.html Sekhar Nori (3): board: ti: am57xx-evm: fix build warnings ARM: ti: consolidate dfu environment variables ARM: am57xx_evm: enable DFU support board/ti/am57xx/board.c | 20 ----------- configs/am57xx_evm_defconfig | 12 +++++++ configs/am57xx_hs_evm_defconfig | 12 +++++++ include/configs/am335x_evm.h | 33 +----------------- include/configs/am43xx_evm.h | 34 ++----------------- include/configs/am57xx_evm.h | 8 +++++ include/configs/dra7xx_evm.h | 51 ++-------------------------- include/configs/omap5_uevm.h | 37 ++------------------ include/environment/ti/dfu.h | 75 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 114 insertions(+), 168 deletions(-) create mode 100644 include/environment/ti/dfu.h -- 2.9.0

2 5