Patch set updated for coreboot: c7166bd AMD Hudson: Move the combining firmware from Python to Makefile

[Zheng Bao]

Zheng Bao ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1417

-gerrit

commit c7166bd959b05113daded9350b5e392fd5430f3d
Author: zbao 
Date:   Tue Aug 7 19:29:33 2012 +0800

AMD Hudson: Move the combining firmware from Python to Makefile

Maybe sooner or later python is not a default tools to build coreboot.
    Most of the work is done by awk now. GNU extension of gawk is not used, isn't?
    expr, cat, awk, test, mv are the external tools.
    If XHCI or IMC firmware is not available and not defined, this script can skip
    integrating them.

Change-Id: I9944b22b0b755672a46d472c355d138abafd6393
    Signed-off-by: Zheng Bao 
    Signed-off-by: zbao 
---
 src/southbridge/amd/agesa/hudson/Makefile.inc  |   30 +++++++++++-
 src/southbridge/amd/agesa/hudson/hudson_fwm.py |   64 ------------------------
 2 files changed, 29 insertions(+), 65 deletions(-)

diff --git a/src/southbridge/amd/agesa/hudson/Makefile.inc b/src/southbridge/amd/agesa/hudson/Makefile.inc
index 19ffae1..094a342 100644
--- a/src/southbridge/amd/agesa/hudson/Makefile.inc
+++ b/src/southbridge/amd/agesa/hudson/Makefile.inc
@@ -15,7 +15,35 @@ romstage-y += early_setup.c
 ramstage-$(CONFIG_HAVE_ACPI_RESUME) += spi.c

$(obj)/hudson.bin:
-	python $(src)/southbridge/amd/agesa/hudson/hudson_fwm.py $(CONFIG_HUDSON_FWM_POSITION) $@ $(CONFIG_HUDSON_XHCI_FWM_FILE) $(CONFIG_HUDSON_IMC_FWM_FILE) ""
+	echo $(CONFIG_HUDSON_FWM_POSITION) | LC_ALL=C awk ' \
+	function cbstrtonum(str,    n,ret,i,c,k) \
+	{ \
+		str = substr(str, 3); \
+		n = length(str); \
+		ret = 0; \
+		for (i = 1; i <= n; i++) { \
+			c = substr(str, i, 1); \
+			c = tolower(c); \
+			k = index("123456789abcdef", c); \
+			ret = ret * 16 + k; \
+		} \
+		return ret; \
+	} \
+	function print_raw_32bit(number) \
+	{ \
+		printf ("%c%c%c%c", number % 0x100, number/0x100 % 0x100, number/0x10000 % 0x100, number/0x1000000); \
+	} \
+	{ #main \
+		print_raw_32bit(0x55AA55AA) \
+		print_raw_32bit(cbstrtonum($$1) + 65536) #imc \
+		print_raw_32bit(0)  #gec \
+		print_raw_32bit(cbstrtonum($$1) + 16) #xhci \
+	}' >  $@.tmp
+	[ -z $(CONFIG_HUDSON_XHCI_FWM_FILE) ] || cat $(CONFIG_HUDSON_XHCI_FWM_FILE) >> $@.tmp
+	expr 65536 - `ls -l $@.tmp | awk '{ print $$5 }'`  | LC_ALL=C awk '{for (i=0; i<$$1; i++) {printf "%c", 255}}' >> $@.tmp # fill stub
+	[ -z $(CONFIG_HUDSON_IMC_FWM_FILE) ] || cat $(CONFIG_HUDSON_IMC_FWM_FILE) >> $@.tmp
+	#TODO: GEC
+	mv -f $@.tmp $@

ifeq ($(CONFIG_HUDSON_FWM), y)
 cbfs-files-y += hudson/fwm
diff --git a/src/southbridge/amd/agesa/hudson/hudson_fwm.py b/src/southbridge/amd/agesa/hudson/hudson_fwm.py
deleted file mode 100644
index ad60b3b..0000000
--- a/src/southbridge/amd/agesa/hudson/hudson_fwm.py
+++ /dev/null
@@ -1,64 +0,0 @@
-import sys, os, re
-import struct
-from Queue import Queue
-
-def main(start_addr, file_name, xhci_name, imc_name, gec_name):
-	fwm_sig		= 0x55AA55AA # Hudson-2/3/4 firmware signature
-	fwm_header_len	= 0x10       # 55AA55AA, imc_off, gec_off, xhci_off
-
-	if not os.path.exists(xhci_name):
-		print "XHCI firmware %s does not exist\n" % xhci_name
-		sys.exit(1)
-	if not os.path.exists(imc_name):
-		print "IMC firmware %s does not exist\n" % imc_name
-		sys.exit(1)
-
-	f = open(file_name, "w")
-	print "write to file " + file_name
-
-	imc_offset	= 0x10000 # 64K Bytes offset, hardcoded
-	imc_addr	= start_addr + imc_offset; #startaddr + 0x10000
-	gec_offset	= 0 #TODO
-	gec_addr	= 0 #TODO
-	xhci_addr	= start_addr + fwm_header_len #ROMSIG take 0x10 bytes
-
-	format="I" # one unsigned integer
-	data=struct.pack(format, fwm_sig)
-	f.write(data)
-	data=struct.pack(format, imc_addr)
-	f.write(data)
-	data=struct.pack(format, gec_addr)
-	f.write(data)
-	data=struct.pack(format, xhci_addr)
-	f.write(data)
-
-	fwm_content = open(xhci_name).read()
-	f.write(fwm_content)
-
-	imc_content = open(imc_name).read()
-	f.seek(0)
-	f.seek(imc_offset)
-	f.write(imc_content)
-#	if os.path.exists(gec_name):
-#		gec_conent = open(gec_name).read()
-#		f.seek(0)
-#		f.seek(gec_offset)
-#		f.write(gec_content)
-
-	f.close()
-	print "done\n"
-
-
-if __name__ == '__main__':
-	if (len(sys.argv) < 6):
-		print "\nUsage: %s <rom_addr> <rom_file> <xhci_rom> <imc_rom> <gec_rom>\n" % sys.argv[0]
-		print "Example: %s 0xFFF20000 hudson.bin xhci.bin imc.bin gec.bin\n" % sys.argv[0]
-		sys.exit(1)
-	rom_addr = int(sys.argv[1], 16)
-	rom_file = sys.argv[2]
-	xhci_file = sys.argv[3]
-	imc_file = sys.argv[4]
-	gec_file = sys.argv[5]
-	print "%x %s %s %s %s" % (rom_addr, rom_file, xhci_file, imc_file, gec_file)
-
-	main(rom_addr, rom_file, xhci_file, imc_file, gec_file)