Rob Barnes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43786 )
Change subject: util: Remove extra newlines in log messages ......................................................................
util: Remove extra newlines in log messages
Print adds a newline implicitly. Simply remove the extra newlines.
BUG=None TEST=Build zork, observe build log
Change-Id: Idb150c12c90719ba1465e7e7fe45c26d456e2a1c Signed-off-by: Rob Barnes robbarnes@google.com --- M util/apcb/apcb_edit.py 1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/43786/1
diff --git a/util/apcb/apcb_edit.py b/util/apcb/apcb_edit.py index e5dd0cd..54d59d6 100755 --- a/util/apcb/apcb_edit.py +++ b/util/apcb/apcb_edit.py @@ -99,7 +99,7 @@ def main(): args = parseargs()
- print("Reading input APCB from %s\n" % (args.apcb_in.name)) + print("Reading input APCB from %s" % (args.apcb_in.name))
apcb = args.apcb_in.read()
@@ -107,10 +107,10 @@
gpio_offset = apcb.find(GPIO_MAGIC) assert gpio_offset > 0, "GPIO magic number not found" - print('GPIO magic number found at offset 0x%x\n' % gpio_offset) + print('GPIO magic number found at offset 0x%x' % gpio_offset) gpio_array = (args.board_id_gpio0 + args.board_id_gpio1 + args.board_id_gpio2 + args.board_id_gpio3) - print('Writing SPD GPIO array %s\n' % gpio_array) + print('Writing SPD GPIO array %s' % gpio_array) apcb = inject(apcb, pack('BBBBBBBBBBBB', *gpio_array), gpio_offset)
spd_offset = 0 @@ -130,7 +130,7 @@ "Unexpected channel number found in APCB"
print("Found SPD magic number with channel %d and dimm %d " - "at offset 0x%x\n" % (spd_ssp.ChannelNumber, spd_ssp.DimmNumber, + "at offset 0x%x" % (spd_ssp.ChannelNumber, spd_ssp.DimmNumber, spd_offset))
dimm_channel = (spd_ssp.ChannelNumber, spd_ssp.DimmNumber) @@ -155,12 +155,12 @@ assert len(spd) == 512, \ "Expected SPD to be 512 bytes, got %d" % len(spd)
- print("Enabling channel %d, dimm %d and injecting SPD\n" % + print("Enabling channel %d, dimm %d and injecting SPD" % (spd_ssp.ChannelNumber, spd_ssp.DimmNumber)) spd_ssp = spd_ssp._replace(SpdValid=True, DimmPresent=True)
else: - print("Disabling channel %d, dimm %d and clearing SPD\n" % + print("Disabling channel %d, dimm %d and clearing SPD" % (spd_ssp.ChannelNumber, spd_ssp.DimmNumber)) spd_ssp = spd_ssp._replace(SpdValid=False, DimmPresent=False) spd = EMPTY_SPD @@ -170,7 +170,7 @@
spd_offset += 512
- print("Fixing checksum and writing to %s\n" % (args.apcb_out.name)) + print("Fixing checksum and writing to %s" % (args.apcb_out.name))
apcb = inject(apcb, bytes([chksum(apcb)]), 16)
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43786 )
Change subject: util: Remove extra newlines in log messages ......................................................................
Patch Set 1: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43786 )
Change subject: util: Remove extra newlines in log messages ......................................................................
util: Remove extra newlines in log messages
Print adds a newline implicitly. Simply remove the extra newlines.
BUG=None TEST=Build zork, observe build log
Change-Id: Idb150c12c90719ba1465e7e7fe45c26d456e2a1c Signed-off-by: Rob Barnes robbarnes@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/43786 Reviewed-by: Aaron Durbin adurbin@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M util/apcb/apcb_edit.py 1 file changed, 7 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved
diff --git a/util/apcb/apcb_edit.py b/util/apcb/apcb_edit.py index e5dd0cd..54d59d6 100755 --- a/util/apcb/apcb_edit.py +++ b/util/apcb/apcb_edit.py @@ -99,7 +99,7 @@ def main(): args = parseargs()
- print("Reading input APCB from %s\n" % (args.apcb_in.name)) + print("Reading input APCB from %s" % (args.apcb_in.name))
apcb = args.apcb_in.read()
@@ -107,10 +107,10 @@
gpio_offset = apcb.find(GPIO_MAGIC) assert gpio_offset > 0, "GPIO magic number not found" - print('GPIO magic number found at offset 0x%x\n' % gpio_offset) + print('GPIO magic number found at offset 0x%x' % gpio_offset) gpio_array = (args.board_id_gpio0 + args.board_id_gpio1 + args.board_id_gpio2 + args.board_id_gpio3) - print('Writing SPD GPIO array %s\n' % gpio_array) + print('Writing SPD GPIO array %s' % gpio_array) apcb = inject(apcb, pack('BBBBBBBBBBBB', *gpio_array), gpio_offset)
spd_offset = 0 @@ -130,7 +130,7 @@ "Unexpected channel number found in APCB"
print("Found SPD magic number with channel %d and dimm %d " - "at offset 0x%x\n" % (spd_ssp.ChannelNumber, spd_ssp.DimmNumber, + "at offset 0x%x" % (spd_ssp.ChannelNumber, spd_ssp.DimmNumber, spd_offset))
dimm_channel = (spd_ssp.ChannelNumber, spd_ssp.DimmNumber) @@ -155,12 +155,12 @@ assert len(spd) == 512, \ "Expected SPD to be 512 bytes, got %d" % len(spd)
- print("Enabling channel %d, dimm %d and injecting SPD\n" % + print("Enabling channel %d, dimm %d and injecting SPD" % (spd_ssp.ChannelNumber, spd_ssp.DimmNumber)) spd_ssp = spd_ssp._replace(SpdValid=True, DimmPresent=True)
else: - print("Disabling channel %d, dimm %d and clearing SPD\n" % + print("Disabling channel %d, dimm %d and clearing SPD" % (spd_ssp.ChannelNumber, spd_ssp.DimmNumber)) spd_ssp = spd_ssp._replace(SpdValid=False, DimmPresent=False) spd = EMPTY_SPD @@ -170,7 +170,7 @@
spd_offset += 512
- print("Fixing checksum and writing to %s\n" % (args.apcb_out.name)) + print("Fixing checksum and writing to %s" % (args.apcb_out.name))
apcb = inject(apcb, bytes([chksum(apcb)]), 16)
-
Aaron Durbin (Code Review) -
Patrick Georgi (Code Review)
-
Rob Barnes (Code Review)