Merge tag 'u-boot-imx-20190110' of git://git.denx.de/u-boot-imx

Fixes for 2019.01

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644 (file)
index 0000000..23599b9
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,3 @@
+Please do not submit a Pull Request via github.  Our project makes use of
+mailing lists for patch submission and review.  For more details please
+see https://www.denx.de/wiki/U-Boot/Patches

diff --git a/Makefile b/Makefile
index 47589e47ac197de18c8a56664b1da776fb5a55ca..99cb9e434d155199c422fa228d73adbe5299627a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -938,7 +938,8 @@ ifneq ($(CONFIG_DM_USB)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy)
        @echo >&2 "===================================================="
 endif
 endif
-ifeq ($(CONFIG_LIBATA)$(CONFIG_DM_SCSI)$(CONFIG_MVSATA_IDE),y)
+ifeq ($(CONFIG_LIBATA)$(CONFIG_MVSATA_IDE),y)
+ifneq ($(CONFIG_DM_SCSI),y)
        @echo >&2 "===================== WARNING ======================"
        @echo >&2 "This board does not use CONFIG_DM_SCSI. Please update"
        @echo >&2 "the storage controller to use CONFIG_DM_SCSI before the v2019.07 release."
@@ -946,6 +947,27 @@ ifeq ($(CONFIG_LIBATA)$(CONFIG_DM_SCSI)$(CONFIG_MVSATA_IDE),y)
        @echo >&2 "See doc/driver-model/MIGRATION.txt for more info."
        @echo >&2 "===================================================="
 endif
+endif
+ifeq ($(CONFIG_PCI),y)
+ifneq ($(CONFIG_DM_PCI),y)
+       @echo >&2 "===================== WARNING ======================"
+       @echo >&2 "This board does not use CONFIG_DM_PCI Please update"
+       @echo >&2 "the board to use CONFIG_DM_PCI before the v2019.07 release."
+       @echo >&2 "Failure to update by the deadline may result in board removal."
+       @echo >&2 "See doc/driver-model/MIGRATION.txt for more info."
+       @echo >&2 "===================================================="
+endif
+endif
+ifneq ($(CONFIG_LCD)$(CONFIG_VIDEO),)
+ifneq ($(CONFIG_DM_VIDEO),y)
+       @echo >&2 "===================== WARNING ======================"
+       @echo >&2 "This board does not use CONFIG_DM_VIDEO Please update"
+       @echo >&2 "the board to use CONFIG_DM_VIDEO before the v2019.07 release."
+       @echo >&2 "Failure to update by the deadline may result in board removal."
+       @echo >&2 "See doc/driver-model/MIGRATION.txt for more info."
+       @echo >&2 "===================================================="
+endif
+endif
 ifeq ($(CONFIG_OF_EMBED),y)
        @echo >&2 "===================== WARNING ======================"
        @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only"

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 520ea8bed9c5611b07aaf7e8d4be419dd3a99cf0..d6b1629a00a605d88c11f7aabdf84757eaffa22d 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -875,7 +875,6 @@ config ARCH_SUNXI
        imply PRE_CONSOLE_BUFFER
        imply SPL_GPIO_SUPPORT
        imply SPL_LIBCOMMON_SUPPORT
-       imply SPL_LIBDISK_SUPPORT
        imply SPL_LIBGENERIC_SUPPORT
        imply SPL_MMC_SUPPORT if MMC
        imply SPL_POWER_SUPPORT

diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 0883b7ea7540eae0f7c943af4e7c2bdb3cce8b17..fc5b8f634d546dcc26503169a648d31127a95bb6 100644 (file)
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -13,7 +13,7 @@
 
 static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
-       *handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, len);
+       *handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, ROUND(len, ARCH_DMA_MINALIGN));
        return (void *)*handle;
 }
 

diff --git a/board/isee/igep003x/MAINTAINERS b/board/isee/igep003x/MAINTAINERS
index a74938a7d22167910726065dbbca028931ddad18..ba92e64e2a66a157898a410e72f6d39513536178 100644 (file)
--- a/board/isee/igep003x/MAINTAINERS
+++ b/board/isee/igep003x/MAINTAINERS
@@ -1,5 +1,5 @@
 IGEP003X BOARD
-M:     Enric Balletbo i Serra <[email protected]>
+M:     Javier Martínez Canillas <[email protected]>
 S:     Maintained
 F:     board/isee/igep003x/
 F:     include/configs/am335x_igep003x.h

diff --git a/doc/README.commands b/doc/README.commands
index 0ccadae0b718a65a736001255240f44ea82a6859..e03eb44187edd43ce495d374c8904b03036b0b57 100644 (file)
--- a/doc/README.commands
+++ b/doc/README.commands
@@ -67,7 +67,7 @@ This table has to be evaluated in the command function of the main command, e.g.
 Command function
 ----------------
 
-The commmand function pointer has to be of type
+The command function pointer has to be of type
 int (*cmd)(struct cmd_tbl_s *cmdtp, int flag, int argc, const char *argv[]);
 
 cmdtp:         Table entry describing the command (see above).

diff --git a/doc/driver-model/MIGRATION.txt b/doc/driver-model/MIGRATION.txt
index 183d7f52932306ce94235366573a2eedfdf83b01..957529202b5ea63b6eb54a73a0e27944f270e553 100644 (file)
--- a/doc/driver-model/MIGRATION.txt
+++ b/doc/driver-model/MIGRATION.txt
@@ -86,3 +86,21 @@ Partially converted:
 Jagan Teki <[email protected]>
 12/24/2018
 03/14/2018
+
+
+CONFIG_DM_PCI
+-------------
+Deadline: 2019.07
+
+The PCI subsystem has supported driver model since mid 2015. Maintainers should
+submit patches switching over to using CONFIG_DM_PCI and other base driver
+model options in time for inclusion in the 2019.07 release.
+
+
+CONFIG_DM_VIDEO
+---------------
+Deadline: 2019.07
+
+The video subsystem has supported driver model since early 2016. Maintainers
+should submit patches switching over to using CONFIG_DM_VIDEO and other base
+driver model options in time for inclusion in the 2019.07 release.

diff --git a/drivers/gpio/stm32f7_gpio.c b/drivers/gpio/stm32f7_gpio.c
index f160b4e68957fa36e3bfee629e8f086a30601828..5c9f2fe64d47c71b958d96326004f847ae1a41f7 100644 (file)
--- a/drivers/gpio/stm32f7_gpio.c
+++ b/drivers/gpio/stm32f7_gpio.c
@@ -19,6 +19,7 @@
 #define MODE_BITS_MASK                 3
 #define BSRR_BIT(gpio_pin, value)      BIT(gpio_pin + (value ? 0 : 16))
 
+#ifndef CONFIG_SPL_BUILD
 /*
  * convert gpio offset to gpio index taking into account gpio holes
  * into gpio bank
@@ -145,23 +146,27 @@ static const struct dm_gpio_ops gpio_stm32_ops = {
        .set_value              = stm32_gpio_set_value,
        .get_function           = stm32_gpio_get_function,
 };
+#endif
 
 static int gpio_stm32_probe(struct udevice *dev)
 {
-       struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
        struct stm32_gpio_priv *priv = dev_get_priv(dev);
-       struct ofnode_phandle_args args;
        struct clk clk;
        fdt_addr_t addr;
-       const char *name;
        int ret;
-       int i;
 
        addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
        priv->regs = (struct stm32_gpio_regs *)addr;
+
+#ifndef CONFIG_SPL_BUILD
+       struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct ofnode_phandle_args args;
+       const char *name;
+       int i;
+
        name = dev_read_string(dev, "st,bank-name");
        if (!name)
                return -EINVAL;
@@ -171,6 +176,11 @@ static int gpio_stm32_probe(struct udevice *dev)
        ret = dev_read_phandle_with_args(dev, "gpio-ranges",
                                         NULL, 3, i, &args);
 
+       if (ret == -ENOENT) {
+               uc_priv->gpio_count = STM32_GPIOS_PER_BANK;
+               priv->gpio_range = GENMASK(STM32_GPIOS_PER_BANK - 1, 0);
+       }
+
        while (ret != -ENOENT) {
                priv->gpio_range |= GENMASK(args.args[2] + args.args[0] - 1,
                                    args.args[0]);
@@ -184,7 +194,7 @@ static int gpio_stm32_probe(struct udevice *dev)
        dev_dbg(dev, "addr = 0x%p bank_name = %s gpio_count = %d gpio_range = 0x%x\n",
                (u32 *)priv->regs, uc_priv->bank_name, uc_priv->gpio_count,
                priv->gpio_range);
-
+#endif
        ret = clk_get_by_index(dev, 0, &clk);
        if (ret < 0)
                return ret;
@@ -210,7 +220,9 @@ U_BOOT_DRIVER(gpio_stm32) = {
        .id     = UCLASS_GPIO,
        .of_match = stm32_gpio_ids,
        .probe  = gpio_stm32_probe,
+#ifndef CONFIG_SPL_BUILD
        .ops    = &gpio_stm32_ops,
+#endif
        .flags  = DM_UC_FLAG_SEQ_ALIAS,
        .priv_auto_alloc_size   = sizeof(struct stm32_gpio_priv),
 };

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index f5c821e308cba8331a8109a3e109cbf79c8ebfb9..d8581271321228d0634cdec5e5df31ffcc922a6c 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -2449,6 +2449,10 @@ static int mmc_startup(struct mmc *mmc)
        bdesc->revision[0] = 0;
 #endif
 
+#if !defined(CONFIG_DM_MMC) && (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT))
+       part_init(bdesc);
+#endif
+
        return 0;
 }
 

diff --git a/env/env.c b/env/env.c
index afed0f3c95c3c173edc30c2e7cb04ab351955504..003509d34240fcc3355c1c3901405eda49b1f508 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -71,6 +71,9 @@ static enum env_location env_locations[] = {
 #ifdef CONFIG_ENV_IS_IN_REMOTE
        ENVL_REMOTE,
 #endif
+#ifdef CONFIG_ENV_IS_IN_SATA
+       ENVL_ESATA,
+#endif
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
        ENVL_SPI_FLASH,
 #endif

diff --git a/env/sata.c b/env/sata.c
index 59aedf4d76644964a3b48aa31d5b47308de44df2..a2ff5c66f7c92b3c293303b9e48328030b18cf71 100644 (file)
--- a/env/sata.c
+++ b/env/sata.c
@@ -65,7 +65,7 @@ static int env_sata_save(void)
                return 1;
 
        printf("Writing to SATA(%d)...", env_sata);
-       if (write_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, &env_new)) {
+       if (write_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, (u_char *)env_new)) {
                puts("failed\n");
                return 1;
        }

diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h
index 86ff6d3ea7c64751576a69ba55c6bf55b09f9c76..05bdbbc23e47ecdc7c623bbb1a58fe2a3b757758 100644 (file)
--- a/include/environment/ti/boot.h
+++ b/include/environment/ti/boot.h
@@ -35,17 +35,12 @@
        "uuid_disk=${uuid_gpt_disk};" \
        "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \
        "name=bootloader,size=2048K,uuid=${uuid_gpt_bootloader};" \
-       "name=reserved,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \
+       "name=uboot-env,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \
        "name=misc,size=128K,uuid=${uuid_gpt_misc};" \
-       "name=efs,size=16M,uuid=${uuid_gpt_efs};" \
-       "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \
        "name=recovery,size=40M,uuid=${uuid_gpt_recovery};" \
        "name=boot,size=10M,uuid=${uuid_gpt_boot};" \
        "name=system,size=1024M,uuid=${uuid_gpt_system};" \
        "name=vendor,size=256M,uuid=${uuid_gpt_vendor};" \
-       "name=cache,size=256M,uuid=${uuid_gpt_cache};" \
-       "name=ipu1,size=1M,uuid=${uuid_gpt_ipu1};" \
-       "name=ipu2,size=1M,uuid=${uuid_gpt_ipu2};" \
        VBMETA_PART \
        "name=userdata,size=-,uuid=${uuid_gpt_userdata}"
 #endif /* PARTS_DEFAULT */