Hi Tom,
On Thu, May 9, 2013 at 8:09 PM, Tom Rini <tr...@ti.com> wrote:
>
> Some number of these changes haven't been posted to the list for review
> yet. I'm pretty sure. I don't recall seeing the CONFIG_CMD_SOFTSWITCH
> stuff go past, and you didn't document that new flag in the top-level
I just forward the former softswtich command patch to you which
include the definition of CONFIG_CMD_SOFTSWITCH. What else do you
think are missing?
> README. Also, you did a merge of your patman branch which means there's
> extra stuff in your commit messages.
Because this command is only implemented for blackfin by now. Should I
explan this limitation in the README as well?
>
> Please submit the new patches to the mailing list, and re-submit the
> pull request with everything else you do have ready. Thanks!
>
Yes, I just figured out my patman subfolder isn't equal to the
upstream master, but I didn't add any stuff except for doing rebase.
It looks some upstream patches may be lost during rebase. I will try
to redo rebase and re-submit the pull request.
The difference are as following:
diff -urN u-boot-blackfin/tools/patman/patman u-boot.up/tools/patman/patman
--- u-boot-blackfin/tools/patman/patman 2013-05-11 23:11:43.158054437 +0800
+++ u-boot.up/tools/patman/patman 2013-05-11 23:00:34.050736519 +0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Copyright (c) 2011 The Chromium OS Authors.
#
diff -urN u-boot-blackfin/tools/patman/patman.py
u-boot.up/tools/patman/patman.py
--- u-boot-blackfin/tools/patman/patman.py 2013-05-11 23:11:43.158054437 +0800
+++ u-boot.up/tools/patman/patman.py 2013-05-11 23:00:34.050736519 +0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Copyright (c) 2011 The Chromium OS Authors.
#
diff -urN u-boot-blackfin/tools/patman/series.py
u-boot.up/tools/patman/series.py
--- u-boot-blackfin/tools/patman/series.py 2013-05-11 23:11:43.158054437 +0800
+++ u-boot.up/tools/patman/series.py 2013-05-11 23:00:34.050736519 +0800
@@ -40,6 +40,7 @@
notes: List of lines in the notes
changes: (dict) List of changes for each version, The key is
the integer version number
+ allow_overwrite: Allow tags to overwrite an existing tag
"""
def __init__(self):
self.cc = []
@@ -49,6 +50,7 @@
self.cover = None
self.notes = []
self.changes = {}
+ self.allow_overwrite = False
# Written in MakeCcFile()
# key: name of patch file
@@ -72,7 +74,7 @@
"""
# If we already have it, then add to our list
name = name.replace('-', '_')
- if name in self:
+ if name in self and not self.allow_overwrite:
values = value.split(',')
values = [str.strip() for str in values]
if type(self[name]) != type([]):
Regards,
Sonic
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
