diff --git a/doc/driver-model/README.txt b/doc/driver-model/README.txt index 0853477578..d6fa5c4857 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 diff --git a/doc/git-mailrc b/doc/git-mailrc index 75aa675c08..bf8f2a5b69 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 diff --git a/lib/Kconfig b/lib/Kconfig index a77bf1c688..622f3c26c3 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 diff --git a/lib/fdtdec.c b/lib/fdtdec.c index c373ddee35..a208589c48 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; diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 94ea5b5a1b..ca4334426b 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,