GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2020-03-27-master-imports'

Browse source 
- Update a few MAINTAINERS entries
- cache alignment fix in ext4 code
- Two small test fixes
This commit is contained in:
Tom Rini 2020-03-27 17:54:38 -04:00
commit 350c44dfb9
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
MAINTAINERS
View file

@ -527,6 +527,13 @@ M: Simon Glass <sjg@chromium.org>
S: Maintained S: Maintained
F: tools/binman/ F: tools/binman/
BTRFS
M: Marek Behun <marek.behun@nic.cz>
S: Maintained
F: cmd/btrfs.c
F: fs/btrfs/
F: include/btrfs.h
BUILDMAN BUILDMAN
M: Simon Glass <sjg@chromium.org> M: Simon Glass <sjg@chromium.org>
S: Maintained S: Maintained
@ -937,6 +944,7 @@ T: git https://gitlab.denx.de/u-boot/custodians/u-boot-usb.git
F: drivers/usb/ F: drivers/usb/
F: common/usb.c F: common/usb.c
F: common/usb_kbd.c F: common/usb_kbd.c
F: include/usb.h
USB xHCI USB xHCI
M: Bin Meng <bmeng.cn@gmail.com> M: Bin Meng <bmeng.cn@gmail.com>

2
fs/ext4/ext4fs.c
View file

@ -288,7 +288,7 @@ int ext_cache_read(struct ext_block_cache *cache, lbaint_t block, int size)
if (cache->buf && cache->block == block && cache->size == size) if (cache->buf && cache->block == block && cache->size == size)
return 1; return 1;
ext_cache_fini(cache); ext_cache_fini(cache);
cache->buf = malloc(size); cache->buf = memalign(ARCH_DMA_MINALIGN, size);
if (!cache->buf) if (!cache->buf)
return 0; return 0;
if (!ext4fs_devread(block, 0, size, cache->buf)) { if (!ext4fs_devread(block, 0, size, cache->buf)) {

2
test/compression.c
View file

@ -451,7 +451,7 @@ static int compress_using_none(struct unit_test_state *uts,
} }
/** /**
* run_bootm_test() - Run tests on the bootm decopmression function * run_bootm_test() - Run tests on the bootm decompression function
* *
* @comp_type: Compression type to test * @comp_type: Compression type to test
* @compress: Our function to compress data * @compress: Our function to compress data

4
test/py/tests/test_mmc_rd.py
View file

@ -56,7 +56,7 @@ env__mmc_dev_configs = (
'info_mode': ???, 'info_mode': ???,
'info_buswidth': ???. 'info_buswidth': ???.
}, },
} )
# Configuration data for test_mmc_rd; defines regions of the MMC (entire # Configuration data for test_mmc_rd; defines regions of the MMC (entire
# devices, or ranges of sectors) which can be read: # devices, or ranges of sectors) which can be read:
@ -210,7 +210,7 @@ def test_mmc_info(u_boot_console, env__mmc_dev_config):
assert good_response in response assert good_response in response
good_response = "Bus Speed: %s" % info_speed good_response = "Bus Speed: %s" % info_speed
assert good_response in response assert good_response in response
good_response = "Mode : %s" % info_mode good_response = "Mode: %s" % info_mode
assert good_response in response assert good_response in response
good_response = "Bus Width: %s" % info_buswidth good_response = "Bus Width: %s" % info_buswidth
assert good_response in response assert good_response in response