diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-17 09:53:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-17 09:53:57 -0400 |
| commit | 9de3126e80cdac7ee15b6671065a952184533dda (patch) | |
| tree | 202c407e31e0f7d60c508cdaadb4b2e6af764aae | |
| parent | b01ba776c9ae138732d85a543878d8456e0b4b30 (diff) | |
| parent | c6963fb88ffb60e42137dc60100ee1a7c6f91beb (diff) | |
| download | u-boot-9de3126e80cdac7ee15b6671065a952184533dda.tar.gz | |
Merge branch '2020-09-16-assorted-fixes'
- Assorted bug fixes
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | doc/board/emulation/qemu-arm.rst | 10 | ||||
| -rw-r--r-- | include/phy.h | 2 | ||||
| -rw-r--r-- | lib/fdtdec.c | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 101f4e185d..7e46470c70 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/doc/board/emulation/qemu-arm.rst b/doc/board/emulation/qemu-arm.rst index ca751d4af4..8d7fda10f1 100644 --- a/doc/board/emulation/qemu-arm.rst +++ b/doc/board/emulation/qemu-arm.rst @@ -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 diff --git a/include/phy.h b/include/phy.h index 1dbbf65111..cbdb10d6fc 100644 --- a/include/phy.h +++ b/include/phy.h @@ -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; } diff --git a/lib/fdtdec.c b/lib/fdtdec.c index d3b22ec323..5f41f58a63 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -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); |