diff options
| author | Tom Rini <trini@ti.com> | 2014-07-07 20:45:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-07 20:45:09 -0400 |
| commit | 80a7cac033082ec3e106cfcc736a126ec6547d85 (patch) | |
| tree | 5c6ee5b84444bba6183e3f2750298d121d371f7c | |
| parent | fafee9edba722dc99cfcfe0f0437e14452cda9aa (diff) | |
| parent | 8708267f09fa99be8c12e103f2cbdc14a43623cc (diff) | |
Merge branch 'tom' of git://git.denx.de/u-boot-x86
| -rw-r--r-- | doc/README.generic-board | 3 | ||||
| -rw-r--r-- | tools/buildman/toolchain.py | 4 | ||||
| -rw-r--r-- | tools/patman/gitutil.py | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/doc/README.generic-board b/doc/README.generic-board index 17da0b9f87..37c1b03ced 100644 --- a/doc/README.generic-board +++ b/doc/README.generic-board @@ -40,10 +40,11 @@ Supported Arcthitectures ------------------------ If you are unlucky then your architecture may not support generic board. -The following architectures are supported at the time of writing: +The following architectures are supported now: arc arm + mips powerpc sandbox x86 diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index b64338680e..1b9771f8e6 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -66,7 +66,7 @@ class Toolchain: Returns: Priority of toolchain, 0=highest, 20=lowest. """ - priority_list = ['-elf', '-unknown-linux-gnu', '-linux', '-elf', + priority_list = ['-elf', '-unknown-linux-gnu', '-linux', '-none-linux-gnueabi', '-uclinux', '-none-eabi', '-gentoo-linux-gnu', '-linux-gnueabi', '-le-linux', '-uclinux'] for prio in range(len(priority_list)): @@ -103,7 +103,7 @@ class Toolchains: if not toolchains: print ("Warning: No tool chains - please add a [toolchain] section" " to your buildman config file %s. See README for details" % - config_fname) + bsettings.config_fname) for name, value in toolchains: if '*' in value: diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 3ea256de2e..7b75c83a82 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -232,6 +232,10 @@ def ApplyPatches(verbose, args, start_point): print stdout return False old_head = stdout.splitlines()[0] + if old_head == 'undefined': + str = "Invalid HEAD '%s'" % stdout.strip() + print col.Color(col.RED, str) + return False # Checkout the required start point cmd = ['git', 'checkout', 'HEAD~%d' % start_point] |