diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/envcrc.c | 3 | ||||
| -rw-r--r-- | tools/patman/cros_subprocess.py | 4 | ||||
| -rw-r--r-- | tools/patman/gitutil.py | 4 | ||||
| -rw-r--r-- | tools/patman/series.py | 2 | ||||
| -rw-r--r-- | tools/patman/terminal.py | 2 | ||||
| -rw-r--r-- | tools/rkcommon.c | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/tools/envcrc.c b/tools/envcrc.c index 9577682828..4b3b828af0 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -33,9 +33,6 @@ # ifndef CONFIG_ENV_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE # endif -# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND) -# define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -# endif # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \ ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)) # define ENV_IS_EMBEDDED diff --git a/tools/patman/cros_subprocess.py b/tools/patman/cros_subprocess.py index 0f0d60dfb7..efd0a5aaf7 100644 --- a/tools/patman/cros_subprocess.py +++ b/tools/patman/cros_subprocess.py @@ -6,11 +6,11 @@ # Licensed to PSF under a Contributor Agreement. # See http://www.python.org/2.4/license for licensing details. -"""Subprocress execution +"""Subprocess execution This module holds a subclass of subprocess.Popen with our own required features, mainly that we get access to the subprocess output while it -is running rather than just at the end. This makes it easiler to show +is running rather than just at the end. This makes it easier to show progress information and filter output in real time. """ diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index dce7fa25b6..a2a225c6b9 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -23,7 +23,7 @@ def LogCmd(commit_range, git_dir=None, oneline=False, reverse=False, Args: commit_range: Range expression to use for log, None for none - git_dir: Path to git repositiory (None to use default) + git_dir: Path to git repository (None to use default) oneline: True to use --oneline, else False reverse: True to reverse the log (--reverse) count: Number of commits to list, or None for no limit @@ -166,7 +166,7 @@ def CountCommitsInRange(git_dir, range_expr): git_dir: Directory containing git repo range_expr: Range to check Return: - Number of patches that exist in the supplied rangem or None if none + Number of patches that exist in the supplied range or None if none were found """ pipe = [LogCmd(range_expr, git_dir=git_dir, oneline=True)] diff --git a/tools/patman/series.py b/tools/patman/series.py index 02a1113ad0..a15f7625ed 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -251,7 +251,7 @@ class Series(dict): cover_cc = [tools.FromUnicode(m) for m in cover_cc] cc_list = '\0'.join([tools.ToUnicode(x) for x in sorted(set(cover_cc + all_ccs))]) - print(cover_fname, cc_list.encode('utf-8'), file=fd) + print(cover_fname, cc_list, file=fd) fd.close() return fname diff --git a/tools/patman/terminal.py b/tools/patman/terminal.py index 4ceab189bf..7a3b658b00 100644 --- a/tools/patman/terminal.py +++ b/tools/patman/terminal.py @@ -128,7 +128,7 @@ class Color(object): return '' def Stop(self): - """Retruns a stop color code. + """Returns a stop color code. Returns: If color is enabled, returns an ANSI color reset sequence, diff --git a/tools/rkcommon.c b/tools/rkcommon.c index 831c2ad820..0d908daee8 100644 --- a/tools/rkcommon.c +++ b/tools/rkcommon.c @@ -67,11 +67,13 @@ struct spl_info { }; static struct spl_info spl_infos[] = { + { "px30", "RK33", 0x2800, false }, { "rk3036", "RK30", 0x1000, false }, { "rk3128", "RK31", 0x1800, false }, { "rk3188", "RK31", 0x8000 - 0x800, true }, { "rk322x", "RK32", 0x8000 - 0x1000, false }, { "rk3288", "RK32", 0x8000, false }, + { "rk3308", "RK33", 0x40000 - 0x1000, false}, { "rk3328", "RK32", 0x8000 - 0x1000, false }, { "rk3368", "RK33", 0x8000 - 0x1000, false }, { "rk3399", "RK33", 0x30000 - 0x2000, false }, |