From a8a71c948836688d323fd3efe2afb07865f8b393 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 25 Aug 2020 09:01:41 +0300 Subject: [PATCH 1/6] MAINTAINERS: update clk entry git tree Signed-off-by: Baruch Siach --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 101f4e185d..87603d474f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -619,7 +619,7 @@ F: drivers/mtd/jedec_flash.c CLOCK M: Lukasz Majewski 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/ From 7def4e621b7c65b4a3740a554dcbc807e23b1c19 Mon Sep 17 00:00:00 2001 From: Thirupathaiah Annapureddy Date: Mon, 17 Aug 2020 17:31:08 -0700 Subject: [PATCH 2/6] include: phy: fix NULL pointer check in phy_write() phy_write() uses bus->write() instead of bus->read(). This means NULL pointer pre-check needs to happen on bus->write instead of bus->read. Signed-off-by: Thirupathaiah Annapureddy Reviewed-by: Michal Simek --- include/phy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 81d0cef3b268ccc4f1061a3e29850fbd23166d20 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 12 Sep 2020 12:42:52 +0200 Subject: [PATCH 3/6] lib: fdt: Fix fdtdec_setup_mem..() conversion to livetree API Repair incorrectly negated condition in the original patch which broke DT memory node parsing on everything which has more than one DT memory node, e.g. R-Car3. In case multiple valid memory nodes are present in the DT, the original patch would complete parsing cycle for the first memory node, then move on to the next one, identify it as a valid, and end the parsing. The fix is to invert the condition, to make the code behave as it did before the livetree conversion, so it would continue parsing the subsequent memory nodes as well. Fixes: c2f0950c33 ("lib: fdt: Convert fdtdes_setup_mem..() to livetree API") Signed-off-by: Marek Vasut Cc: Michal Simek Cc: Simon Glass Cc: Tom Rini Tested-by: Biju Das Reviewed-by: Michal Simek --- lib/fdtdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); From 42ef2edc85d04ef7ffd70606a024182380b7da0e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Sep 2020 13:52:39 +0200 Subject: [PATCH 4/6] MAINTAINERS: add myself as reviewer for SquashFS As I have followed the development of the SquashFS support in U-Boot as part of Joao Marcos work, it makes sense to get Cc'ed on contributions/bug reports related to the squashfs support. Signed-off-by: Thomas Petazzoni --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 87603d474f..fdbfd2bcf7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -983,6 +983,7 @@ F: include/spmi/ SQUASHFS M: Joao Marcos Costa +R: Thomas Petazzoni S: Maintained F: fs/squashfs/ F: include/sqfs.h From c4d0384a4ac492969e36b60813fec8bf25ddd725 Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Mon, 14 Sep 2020 17:44:36 +0200 Subject: [PATCH 5/6] MAINTAINERS: add myself as reviewer for SquashFS I also followed the development of the SquashFS support in U-Boot as part of Joao Marcos internship, so I would also appreciate receiving new contributions and bug reports related to this topic. Signed-off-by: Miquel Raynal --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index fdbfd2bcf7..7e46470c70 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -984,6 +984,7 @@ F: include/spmi/ SQUASHFS M: Joao Marcos Costa R: Thomas Petazzoni +R: Miquel Raynal S: Maintained F: fs/squashfs/ F: include/sqfs.h From c6963fb88ffb60e42137dc60100ee1a7c6f91beb Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 16 Sep 2020 00:17:55 +0200 Subject: [PATCH 6/6] doc: qemu: debug UART settings for QEMU ARM virt Provide the settings for the debug UART on the QEMU ARM virt board. Signed-off-by: Heinrich Schuchardt --- doc/board/emulation/qemu-arm.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) 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