leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2020-06-23-misc-minor-fixes'

Browse Source 
- Assorted minor fixes
This commit is contained in:
Tom Rini
2020-06-23 14:43:47 -04:00
parent 4ff63383e3 1c078ad7d9
commit 331c743810
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/booti.c
View File

@@ -141,7 +141,7 @@ static char booti_help_text[] =
"\tspecifying the size of a RAW initrd.\n" "\tspecifying the size of a RAW initrd.\n"
"\tCurrently only booting from gz, bz2, lzma and lz4 compression\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" "\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" "\tvariables beforehand.\n"
#if defined(CONFIG_OF_LIBFDT) #if defined(CONFIG_OF_LIBFDT)
"\tSince booting a Linux kernel requires a flat device-tree, a\n" "\tSince booting a Linux kernel requires a flat device-tree, a\n"

4
doc/board/sifive/fu540.rst
View File

@@ -27,7 +27,7 @@ Building
-------- --------
1. Add the RISC-V toolchain to your PATH. 1. Add the RISC-V toolchain to your PATH.
2. Setup ARCH & cross compilation enviornment variable: 2. Setup ARCH & cross compilation environment variable:
.. code-block:: none .. code-block:: none
@@ -217,7 +217,7 @@ Or if you want to use a compressed kernel image file such as Image.gz
=>setenv kernel_comp_addr_r 0x90000000 =>setenv kernel_comp_addr_r 0x90000000
=>setenv kernel_comp_size 0x500000 =>setenv kernel_comp_size 0x500000
By this time, correct kernel image is loaded and required enviornment variables By this time, correct kernel image is loaded and required environment variables
are set. You can proceed to load the ramdisk and device tree from the tftp server are set. You can proceed to load the ramdisk and device tree from the tftp server
as well. as well.

2
doc/device-tree-bindings/net/phy/atheros.txt
View File

@@ -23,7 +23,7 @@ Example:
ethernet-phy@0 { ethernet-phy@0 {
reg = <0>; reg = <0>;
qca-clk-out-frequency = <125000000>; qca,clk-out-frequency = <125000000>;
qca,keep-pll-enabled; qca,keep-pll-enabled;
vddio-supply = <&vddio>; vddio-supply = <&vddio>;

3
drivers/nvme/nvme.c
View File

@@ -466,6 +466,9 @@ int nvme_identify(struct nvme_dev *dev, unsigned nsid,
c.identify.cns = cpu_to_le32(cns); c.identify.cns = cpu_to_le32(cns);
invalidate_dcache_range(dma_addr,
dma_addr + sizeof(struct nvme_id_ctrl));
ret = nvme_submit_admin_cmd(dev, &c, NULL); ret = nvme_submit_admin_cmd(dev, &c, NULL);
if (!ret) if (!ret)
invalidate_dcache_range(dma_addr, invalidate_dcache_range(dma_addr,

4
include/linux/psci.h
View File

@@ -91,8 +91,8 @@
unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1,
unsigned long a2, unsigned long a3); unsigned long a2, unsigned long a3);
#else #else
unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, static inline unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1,
unsigned long a2, unsigned long a3) unsigned long a2, unsigned long a3)
{ {
return PSCI_RET_DISABLED; return PSCI_RET_DISABLED;
} }

2
include/zfs_common.h
View File

@@ -22,6 +22,8 @@
#ifndef __ZFS_COMMON__ #ifndef __ZFS_COMMON__
#define __ZFS_COMMON__ #define __ZFS_COMMON__
#include <part.h>
#define SECTOR_SIZE 0x200 #define SECTOR_SIZE 0x200
#define SECTOR_BITS 9 #define SECTOR_BITS 9