Merge branch '2020-09-16-assorted-fixes'

- Assorted bug fixes
This commit is contained in:
Tom Rini 2020-09-17 09:53:57 -04:00
commit 9de3126e80
4 changed files with 16 additions and 4 deletions

View file

@ -619,7 +619,7 @@ F: drivers/mtd/jedec_flash.c
CLOCK
M: Lukasz Majewski <lukma@denx.de>
S: Maintained
T: git git://git.denx.de/u-boot-dfu.git
T: git https://gitlab.denx.de/u-boot/custodians/u-boot-clk.git
F: drivers/clk/
F: drivers/clk/imx/
@ -983,6 +983,8 @@ F: include/spmi/
SQUASHFS
M: Joao Marcos Costa <joaomarcos.costa@bootlin.com>
R: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
R: Miquel Raynal <miquel.raynal@bootlin.com>
S: Maintained
F: fs/squashfs/
F: include/sqfs.h

View file

@ -80,3 +80,13 @@ can be enabled with the following command line parameters:
-drive if=none,file=disk.img,id=mydisk -device nvme,drive=mydisk,serial=foo
These have been tested in QEMU 2.9.0 but should work in at least 2.5.0 as well.
Debug UART
----------
The debug UART on the ARM virt board uses these settings::
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_PL010=y
CONFIG_DEBUG_UART_BASE=0x9000000
CONFIG_DEBUG_UART_CLOCK=0

View file

@ -205,7 +205,7 @@ static inline int phy_write(struct phy_device *phydev, int devad, int regnum,
{
struct mii_dev *bus = phydev->bus;
if (!bus || !bus->read) {
if (!bus || !bus->write) {
debug("%s: No bus configured\n", __func__);
return -1;
}

View file

@ -1101,7 +1101,7 @@ int fdtdec_setup_memory_banksize(void)
if (ret < 0) {
reg = 0;
mem = get_next_memory_node(mem);
if (ofnode_valid(mem))
if (!ofnode_valid(mem))
break;
ret = ofnode_read_resource(mem, reg++, &res);
@ -1146,7 +1146,7 @@ int fdtdec_setup_mem_size_base_lowest(void)
if (ret < 0) {
reg = 0;
mem = get_next_memory_node(mem);
if (ofnode_valid(mem))
if (!ofnode_valid(mem))
break;
ret = ofnode_read_resource(mem, reg++, &res);