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

Tom Rini
2 parents fafee9edba 8708267f09
Showing 3 changed files Side-by-side Diff
doc/README.generic-board
tools/buildman/toolchain.py
tools/patman/gitutil.py
@@ -40,10 +40,11 @@
 ------------------------
  
 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
@@ -66,7 +66,7 @@
         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 @@
         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:
@@ -232,6 +232,10 @@
         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]
...	...	@@ -40,10 +40,11 @@
40	40	------------------------
41	41
42	42	If you are unlucky then your architecture may not support generic board.
43		-The following architectures are supported at the time of writing:
	43	+The following architectures are supported now:
44	44
45	45	arc
46	46	arm
	47	+ mips
47	48	powerpc
48	49	sandbox
49	50	x86
...	...	@@ -66,7 +66,7 @@
66	66	Returns:
67	67	Priority of toolchain, 0=highest, 20=lowest.
68	68	"""
69		- priority_list = ['-elf', '-unknown-linux-gnu', '-linux', '-elf',
	69	+ priority_list = ['-elf', '-unknown-linux-gnu', '-linux',
70	70	'-none-linux-gnueabi', '-uclinux', '-none-eabi',
71	71	'-gentoo-linux-gnu', '-linux-gnueabi', '-le-linux', '-uclinux']
72	72	for prio in range(len(priority_list)):
...	...	@@ -103,7 +103,7 @@
103	103	if not toolchains:
104	104	print ("Warning: No tool chains - please add a [toolchain] section"
105	105	" to your buildman config file %s. See README for details" %
106		- config_fname)
	106	+ bsettings.config_fname)
107	107
108	108	for name, value in toolchains:
109	109	if '*' in value:
...	...	@@ -232,6 +232,10 @@
232	232	print stdout
233	233	return False
234	234	old_head = stdout.splitlines()[0]
	235	+ if old_head == 'undefined':
	236	+ str = "Invalid HEAD '%s'" % stdout.strip()
	237	+ print col.Color(col.RED, str)
	238	+ return False
235	239
236	240	# Checkout the required start point
237	241	cmd = ['git', 'checkout', 'HEAD~%d' % start_point]