Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 15:37:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
- 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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MAINTAINERS
View file

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

10
doc/board/emulation/qemu-arm.rst
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 -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. 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

2
include/phy.h
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; struct mii_dev *bus = phydev->bus;
if (!bus || !bus->read) { if (!bus || !bus->write) {
debug("%s: No bus configured\n", __func__); debug("%s: No bus configured\n", __func__);
return -1; return -1;
} }

4
lib/fdtdec.c
View file

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