Merge branch '2020-06-15-misc-bugfixes'

- Assorted bug fixes

diff --git a/Kconfig b/Kconfig
index 0e7ccc0..8f3fba0 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -146,7 +146,7 @@ config SYS_MALLOC_F_LEN
        default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
                           ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \
                           ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \
-                          ARCH_LS1046A)
+                          ARCH_LS1046A || ARCH_QEMU)
        default 0x400
        help
          Before relocation, memory is very limited on many platforms. Still,

diff --git a/board/freescale/p1010rdb/README.P1010RDB-PA b/board/freescale/p1010rdb/README.P1010RDB-PA
index 46c6123..0cb950d 100644 (file)
--- a/board/freescale/p1010rdb/README.P1010RDB-PA
+++ b/board/freescale/p1010rdb/README.P1010RDB-PA
@@ -88,7 +88,7 @@ Note: 1 stands for 'on', 0 stands for 'off'
 Setting of hwconfig
 ===================
 If FlexCAN or TDM is needed, please set "fsl_p1010mux:tdm_can=can" or
-"fsl_p1010mux:tdm_can=tdm" explicitly in u-booot prompt as below for example:
+"fsl_p1010mux:tdm_can=tdm" explicitly in u-boot prompt as below for example:
 setenv hwconfig "fsl_p1010mux:tdm_can=tdm;usb1:dr_mode=host,phy_type=utmi"
 By default, don't set fsl_p1010mux:tdm_can, in this case, spi chip selection
 is set to spi-flash instead of to SLIC/TDM/DAC and tdm_can_sel is set to TDM

diff --git a/cmd/mmc.c b/cmd/mmc.c
index 97e5d91..1c252e0 100644 (file)
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -1004,7 +1004,7 @@ U_BOOT_CMD(
        "mmc part - lists available partition on current mmc device\n"
        "mmc dev [dev] [part] - show or set current mmc device [partition]\n"
        "mmc list - lists available devices\n"
-       "mmc wp - power on write protect booot partitions\n"
+       "mmc wp - power on write protect boot partitions\n"
 #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
        "mmc hwpartition [args...] - does hardware partitioning\n"
        "  arguments (sizes in 512-byte blocks):\n"

diff --git a/env/Kconfig b/env/Kconfig
index ca7fef6..38e7fad 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -562,7 +562,7 @@ config ENV_UBI_VID_OFFSET
          UBI VID offset for environment. If 0, no custom VID offset is used.
 
 config SYS_RELOC_GD_ENV_ADDR
-       bool "Relocate gd->en_addr"
+       bool "Relocate gd->env_addr"
        help
          Relocate the early env_addr pointer so we know it is not inside
          the binary. Some systems need this and for the rest, it doesn't hurt.

diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index e59b576..457d4cc 100644 (file)
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -156,8 +156,9 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob)
        /* optee inserts its memory regions as reserved-memory nodes */
        nodeoffset = fdt_subnode_offset(old_blob, 0, "reserved-memory");
        if (nodeoffset >= 0) {
-               subnode = fdt_first_subnode(old_blob, nodeoffset);
-               while (subnode >= 0) {
+               for (subnode = fdt_first_subnode(old_blob, nodeoffset);
+                    subnode >= 0;
+                    subnode = fdt_next_subnode(old_blob, subnode)) {
                        const char *name = fdt_get_name(old_blob,
                                                        subnode, NULL);
                        if (!name)
@@ -197,8 +198,6 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob)
                                if (ret < 0)
                                        return ret;
                        }
-
-                       subnode = fdt_next_subnode(old_blob, subnode);
                }
        }
 

diff --git a/lib/strto.c b/lib/strto.c
index 3d77115..c00bb58 100644 (file)
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -22,25 +22,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
                                *base = 16;
                        else
                                *base = 8;
-               } else {
-                       int i = 0;
-                       char var;
-
+               } else
                        *base = 10;
-
-                       do {
-                               var = tolower(s[i++]);
-                               if (var >= 'a' && var <= 'f') {
-                                       *base = 16;
-                                       break;
-                               }
-
-                               if (!(var >= '0' && var <= '9'))
-                                       break;
-                       } while (var);
-               }
        }
-
        if (*base == 16 && s[0] == '0' && tolower(s[1]) == 'x')
                s += 2;
        return s;