Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 08:27:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'tom' of git://git.denx.de/u-boot-x86

Browse source
This commit is contained in:
Tom Rini 2014-07-07 20:45:09 -04:00
commit 80a7cac033
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/README.generic-board
View file

@ -40,10 +40,11 @@ Supported Arcthitectures
------------------------ ------------------------
If you are unlucky then your architecture may not support generic board. 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 arc
arm arm
mips
powerpc powerpc
sandbox sandbox
x86 x86

4
tools/buildman/toolchain.py
View file

@ -66,7 +66,7 @@ class Toolchain:
Returns: Returns:
Priority of toolchain, 0=highest, 20=lowest. 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', '-none-linux-gnueabi', '-uclinux', '-none-eabi',
'-gentoo-linux-gnu', '-linux-gnueabi', '-le-linux', '-uclinux'] '-gentoo-linux-gnu', '-linux-gnueabi', '-le-linux', '-uclinux']
for prio in range(len(priority_list)): for prio in range(len(priority_list)):
@ -103,7 +103,7 @@ class Toolchains:
if not toolchains: if not toolchains:
print ("Warning: No tool chains - please add a [toolchain] section" print ("Warning: No tool chains - please add a [toolchain] section"
" to your buildman config file %s. See README for details" % " to your buildman config file %s. See README for details" %
config_fname) bsettings.config_fname)
for name, value in toolchains: for name, value in toolchains:
if '*' in value: if '*' in value:

4
tools/patman/gitutil.py
View file

@ -232,6 +232,10 @@ def ApplyPatches(verbose, args, start_point):
print stdout print stdout
return False return False
old_head = stdout.splitlines()[0] 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 # Checkout the required start point
cmd = ['git', 'checkout', 'HEAD~%d' % start_point] cmd = ['git', 'checkout', 'HEAD~%d' % start_point]