Revert "util/spd_tools: output binaries instead of hexdumps"

This reverts commit f23794cf04030bb8d1d7ebe0a3634dffd092e2f7.

Reason for revert: This change breaks compatibility if the changes
in CB:44775 are not also included. CB:44775 is still under discussion,
so revert this change to make spd_tools usable again.

Signed-off-by: Rob Barnes <robbarnes@google.com>
Change-Id: I5840a1b895dcbc8b91c76d8b60df2f95b93a4370
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44999
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 13 insertions, 8 deletions

diff --git a/util/spd_tools/lp4x/gen_spd.go b/util/spd_tools/lp4x/gen_spd.go
index 17388336d1..e63ca8df6f 100644
--- a/util/spd_tools/lp4x/gen_spd.go
+++ b/util/spd_tools/lp4x/gen_spd.go
@@ -3,7 +3,6 @@
 package main
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -638,14 +637,20 @@ func getSPDByte(index int, memAttribs *memAttributes) byte {
 	return e.constVal
 }
 
-func createSPD(memAttribs *memAttributes) bytes.Buffer {
-	var spd bytes.Buffer
+func createSPD(memAttribs *memAttributes) string {
+	var s string
 
 	for i := 0; i < 512; i++ {
-		spd.WriteByte(getSPDByte(i, memAttribs))
+		b := getSPDByte(i, memAttribs)
+
+		if (i + 1) % 16 == 0 {
+			s += fmt.Sprintf("%02X\n", b)
+		} else {
+			s += fmt.Sprintf("%02X ", b)
+		}
 	}
 
-	return spd
+	return s
 }
 
 func dedupeMemoryPart(dedupedParts []*memPart, memPart *memPart) bool {
@@ -660,9 +665,9 @@ func dedupeMemoryPart(dedupedParts []*memPart, memPart *memPart) bool {
 }
 
 func generateSPD(memPart *memPart, SPDId int, SPDDirName string) {
-	spd := createSPD(&memPart.Attribs)
-	memPart.SPDFileName = fmt.Sprintf("lp4x-spd-%d.bin", SPDId)
-	ioutil.WriteFile(filepath.Join(SPDDirName, memPart.SPDFileName), spd.Bytes(), 0644)
+	s := createSPD(&memPart.Attribs)
+	memPart.SPDFileName = fmt.Sprintf("lp4x-spd-%d.hex", SPDId)
+	ioutil.WriteFile(filepath.Join(SPDDirName, memPart.SPDFileName), []byte(s), 0644)
 }
 
 func readMemoryParts(memParts *memParts, memPartsFileName string) error {