mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-25 08:31:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2021-01-04-minor-fixes'

Browse Source 
- Assorted fixes
This commit is contained in:
Tom Rini 2021-01-04 09:11:35 -05:00
commit 2e57549a9c
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -30,6 +30,7 @@ Jagan Teki <jaganna@xilinx.com>
Jagan Teki <jagannadh.teki@gmail.com> Jagan Teki <jagannadh.teki@gmail.com>
Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com> Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org> Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
Markus Klotzbuecher <mk@denx.de> Markus Klotzbuecher <mk@denx.de>
Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com> Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com> Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>

5
cmd/ubi.c
View File

@ -264,6 +264,11 @@ static int ubi_rename_vol(char *oldname, char *newname)
return ENODEV; return ENODEV;
} }
if (!ubi_check(newname)) {
printf("%s: volume %s already exist\n", __func__, newname);
return EINVAL;
}
printf("Rename UBI volume %s to %s\n", oldname, newname); printf("Rename UBI volume %s to %s\n", oldname, newname);
if (ubi->ro_mode) { if (ubi->ro_mode) {

7
doc/android/boot-image.rst
View File

@ -30,9 +30,10 @@ next image headers:
v2, v1 and v0 formats are backward compatible. v2, v1 and v0 formats are backward compatible.
Android Boot Image format is represented by :c:type:`struct andr_img_hdr` in The Android Boot Image format is represented by
U-Boot, and can be seen in ``include/android_image.h``. U-Boot supports booting :c:type:`struct andr_img_hdr <andr_img_hdr>` in U-Boot, and can be seen in
Android Boot Image and also has associated command ``include/android_image.h``. U-Boot supports booting Android Boot Image and also
has associated command
Booting Booting
------- -------

8
drivers/nvme/nvme.h
View File

@ -535,28 +535,20 @@ struct nvme_completion {
*/ */
static inline u64 nvme_readq(__le64 volatile *regs) static inline u64 nvme_readq(__le64 volatile *regs)
{ {
#if BITS_PER_LONG == 64
return readq(regs);
#else
__u32 *ptr = (__u32 *)regs; __u32 *ptr = (__u32 *)regs;
u64 val_lo = readl(ptr); u64 val_lo = readl(ptr);
u64 val_hi = readl(ptr + 1); u64 val_hi = readl(ptr + 1);
return val_lo + (val_hi << 32); return val_lo + (val_hi << 32);
#endif
} }
static inline void nvme_writeq(const u64 val, __le64 volatile *regs) static inline void nvme_writeq(const u64 val, __le64 volatile *regs)
{ {
#if BITS_PER_LONG == 64
writeq(val, regs);
#else
__u32 *ptr = (__u32 *)regs; __u32 *ptr = (__u32 *)regs;
u32 val_lo = lower_32_bits(val); u32 val_lo = lower_32_bits(val);
u32 val_hi = upper_32_bits(val); u32 val_hi = upper_32_bits(val);
writel(val_lo, ptr); writel(val_lo, ptr);
writel(val_hi, ptr + 1); writel(val_hi, ptr + 1);
#endif
} }
struct nvme_bar { struct nvme_bar {

2
drivers/usb/Kconfig
View File

@ -60,7 +60,7 @@ config DM_USB_GADGET
mode) mode)
config SPL_DM_USB_GADGET config SPL_DM_USB_GADGET
bool "Enable driver model for USB Gadget in sPL" bool "Enable driver model for USB Gadget in SPL"
depends on SPL_DM_USB depends on SPL_DM_USB
help help
Enable driver model for USB Gadget in SPL Enable driver model for USB Gadget in SPL