From 38d1ab4a85a96be85c3731fd773594379a1f8359 Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Wed, 27 Jun 2018 14:38:57 +0100 Subject: git-mailrc: Replace tabs with spaces in alias entries patman's _ReadAliasFile only splits on spaces, not tabs, so the entries for dinh and maxime weren't being recognised as valid. I'll fix patman in a separate patch, but this makes all the entries consistent. Signed-off-by: Adam Sampson Reviewed-by: Simon Glass --- doc/git-mailrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index af8e3358a98..3a490beee29 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -20,7 +20,7 @@ alias alisonwang Alison Wang alias angelo_ts Angelo Dureghello alias bmeng Bin Meng alias danielschwierzeck Daniel Schwierzeck -alias dinh Dinh Nguyen +alias dinh Dinh Nguyen alias hs Heiko Schocher alias iwamatsu Nobuhiro Iwamatsu alias jaehoon Jaehoon Chung @@ -33,7 +33,7 @@ alias marex Marek Vasut alias mariosix Mario Six alias masahiro Masahiro Yamada alias mateusz Mateusz Kulikowski -alias maxime Maxime Ripard +alias maxime Maxime Ripard alias monstr Michal Simek alias prafulla Prafulla Wadaskar alias prom Minkyu Kang -- cgit v1.2.3 From b8a48fbca30523ec8d71795bffd2d54ce279f28d Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Wed, 27 Jun 2018 14:38:58 +0100 Subject: patman: Split alias entries on arbitrary whitespace Previously the first three words in a git-mailrc alias entry could only be separated by spaces. git-send-email and Mutt both allow arbitrary whitespace here. Signed-off-by: Adam Sampson Reviewed-by: Simon Glass --- tools/patman/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 94ea5b5a1b0..ca4334426ba 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -263,7 +263,7 @@ def _ReadAliasFile(fname): line = line.strip() if not line or line.startswith('#'): continue - words = line.split(' ', 2) + words = line.split(None, 2) if len(words) < 3 or words[0] != 'alias': if not bad_line: bad_line = "%s:%d:Invalid line '%s'" % (fname, linenum, -- cgit v1.2.3 From 09b8d67f31eccc90ec74729589194e619303ba77 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Fri, 6 Jul 2018 22:29:46 +1200 Subject: doc: driver-model: Fix typo Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- doc/driver-model/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/driver-model/README.txt b/doc/driver-model/README.txt index 0853477578a..d6fa5c48579 100644 --- a/doc/driver-model/README.txt +++ b/doc/driver-model/README.txt @@ -695,7 +695,7 @@ steps (see device_probe()): allocate it yourself in ofdata_to_platdata(). Note that it is preferable to do all the device tree decoding in ofdata_to_platdata() rather than in probe(). (Apart from the ugliness of mixing configuration and run-time - data, one day it is possible that U-Boot will cache platformat data for + data, one day it is possible that U-Boot will cache platform data for devices which are regularly de/activated). h. The device's probe() method is called. This should do anything that -- cgit v1.2.3 From 452bc121027df6bc5ad59e25db8c6b0a4ecbe8a4 Mon Sep 17 00:00:00 2001 From: Jens Wiklander Date: Fri, 13 Jul 2018 12:12:11 +0200 Subject: fdt: fix fdtdec_setup_memory_banksize() Prior to this patch is fdtdec_setup_memory_banksize() incorrectly ignoring the "status" field. This patch fixes that by testing the status with fdtdec_get_is_enabled() before using a memory node. Signed-off-by: Jens Wiklander Reviewed-by: Simon Glass --- lib/fdtdec.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index c373ddee358..a208589c48a 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1181,13 +1181,25 @@ int fdtdec_setup_mem_size_base(void) } #if defined(CONFIG_NR_DRAM_BANKS) + +static int get_next_memory_node(const void *blob, int startoffset) +{ + int mem = -1; + + do { + mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem, + "device_type", "memory", 7); + } while (!fdtdec_get_is_enabled(blob, mem)); + + return mem; +} + int fdtdec_setup_memory_banksize(void) { int bank, ret, mem, reg = 0; struct fdt_resource res; - mem = fdt_node_offset_by_prop_value(gd->fdt_blob, -1, "device_type", - "memory", 7); + mem = get_next_memory_node(gd->fdt_blob, -1); if (mem < 0) { debug("%s: Missing /memory node\n", __func__); return -EINVAL; @@ -1197,9 +1209,7 @@ int fdtdec_setup_memory_banksize(void) ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res); if (ret == -FDT_ERR_NOTFOUND) { reg = 0; - mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem, - "device_type", - "memory", 7); + mem = get_next_memory_node(gd->fdt_blob, mem); if (mem == -FDT_ERR_NOTFOUND) break; -- cgit v1.2.3 From ab948cd21d25ba2f54832fc98a59eea90e680eba Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 20 Jul 2018 11:04:09 +0900 Subject: fdt_support: make FDT_FIXUP_PARTITIONS depend on CMD_MTDPARTS fdt_fixup_mtdparts() calls mtdparts_init() and device_find(), which are defined in cmd/mtdparts.c The combination of FDT_FIXUP_PARTITIONS=y and CMD_MTDPARTS=n emits the following link error: common/fdt_support.c:903: undefined reference to `mtdparts_init' common/fdt_support.c:914: undefined reference to `device_find' Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass --- lib/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig b/lib/Kconfig index a77bf1c688a..622f3c26c33 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -334,7 +334,7 @@ config SPL_OF_LIBFDT config FDT_FIXUP_PARTITIONS bool "overwrite MTD partitions in DTS through defined in 'mtdparts'" depends on OF_LIBFDT - default n + depends on CMD_MTDPARTS help Allow overwriting defined partitions in the device tree blob using partition info defined in the 'mtdparts' environment -- cgit v1.2.3