diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-30 11:43:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-30 11:43:18 -0400 |
| commit | 5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035 (patch) | |
| tree | d04c64ec751e7adf24de995ce0fa7eabc88865bc /cmd | |
| parent | 6b3c74428a3faca92701843c954b717e8d186b17 (diff) | |
| parent | e35c2a8fdd41a34c06c409ce700c5d5591429367 (diff) | |
| download | u-boot-5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035.tar.gz | |
Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot-mips into next
- net: pcnet: cleanup and add DM support
- Makefile: add rule to build an endian-swapped U-Boot image
used by MIPS Malta EL variants
- CI: add Qemu tests for MIPS Malta
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootefi.c | 3 | ||||
| -rw-r--r-- | cmd/booti.c | 2 | ||||
| -rw-r--r-- | cmd/mmc.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index ac713cad1b..8269153973 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -189,7 +189,8 @@ static void efi_carve_out_dt_rsv(void *fdt) if (nodeoffset >= 0) { subnode = fdt_first_subnode(fdt, nodeoffset); while (subnode >= 0) { - fdt_addr_t fdt_addr, fdt_size; + fdt_addr_t fdt_addr; + fdt_size_t fdt_size; /* check if this subnode has a reg property */ fdt_addr = fdtdec_get_addr_size_auto_parent( diff --git a/cmd/booti.c b/cmd/booti.c index ae37975494..af0603b96e 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -141,7 +141,7 @@ static char booti_help_text[] = "\tspecifying the size of a RAW initrd.\n" "\tCurrently only booting from gz, bz2, lzma and lz4 compression\n" "\ttypes are supported. In order to boot from any of these compressed\n" - "\timages, user have to set kernel_comp_addr_r and kernel_comp_size enviornment\n" + "\timages, user have to set kernel_comp_addr_r and kernel_comp_size environment\n" "\tvariables beforehand.\n" #if defined(CONFIG_OF_LIBFDT) "\tSince booting a Linux kernel requires a flat device-tree, a\n" @@ -8,6 +8,7 @@ #include <blk.h> #include <command.h> #include <console.h> +#include <memalign.h> #include <mmc.h> #include <part.h> #include <sparse_format.h> @@ -56,7 +57,8 @@ static void print_mmcinfo(struct mmc *mmc) if (!IS_SD(mmc) && mmc->version >= MMC_VERSION_4_41) { bool has_enh = (mmc->part_support & ENHNCD_SUPPORT) != 0; bool usr_enh = has_enh && (mmc->part_attr & EXT_CSD_ENH_USR); - u8 wp, ext_csd[MMC_MAX_BLOCK_LEN]; + ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN); + u8 wp; int ret; #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING) |