Change in coreboot[master]: util/spd_tools: Support comments in json

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Rob Barnes (Code Review)

26 Aug 2020 26 Aug '20

7:32 p.m.

Rob Barnes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44834 )

Change subject: util/spd_tools: Support comments in json ......................................................................

util/spd_tools: Support comments in json

Allow comments in json file for better documentation. Comments must be on seperate line.

BUG=none TEST=Injest global_ddr4_mem_parts.json.txt with comments

Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Signed-off-by: Rob Barnes robbarnes@google.com --- M util/spd_tools/intel/ddr4/gen_spd.go M util/spd_tools/intel/ddr4/global_ddr4_mem_parts.json.txt 2 files changed, 8 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/44834/1

diff --git a/util/spd_tools/intel/ddr4/gen_spd.go b/util/spd_tools/intel/ddr4/gen_spd.go index 5adadc9..0462fd5 100644 --- a/util/spd_tools/intel/ddr4/gen_spd.go +++ b/util/spd_tools/intel/ddr4/gen_spd.go @@ -12,6 +12,7 @@ "reflect" "strconv" "strings" + "regexp" )

/* @@ -998,6 +999,10 @@ return err }

+ // Strip comments from json file + re := regexp.MustCompile(`(?m)^\s*//.*`) + databytes = re.ReplaceAll(databytes, []byte("")) + return json.Unmarshal(databytes, memParts) }

diff --git a/util/spd_tools/intel/ddr4/global_ddr4_mem_parts.json.txt b/util/spd_tools/intel/ddr4/global_ddr4_mem_parts.json.txt index 4e9c7c8..51068d5 100644 --- a/util/spd_tools/intel/ddr4/global_ddr4_mem_parts.json.txt +++ b/util/spd_tools/intel/ddr4/global_ddr4_mem_parts.json.txt @@ -1,3 +1,6 @@ +// Global list of ddr4 memory part attributes. +// These attributes match the part specifications and are independent +// of any SoC expectations. { "parts": [ {

Attachments:

attachment.htm (text/html — 3.7 KB)

Show replies by date

Furquan Shaikh (Code Review)

26 Aug 26 Aug

7:56 p.m.

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44834 )

Change subject: util/spd_tools: Support comments in json ......................................................................

Patch Set 1: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/44834 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Gerrit-Change-Number: 44834 Gerrit-PatchSet: 1 Gerrit-Owner: Rob Barnes robbarnes@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Wed, 26 Aug 2020 17:56:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Rob Barnes (Code Review)

9:37 p.m.

Hello build bot (Jenkins), Furquan Shaikh, Nick Vaccaro,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/44834

to look at the new patch set (#2).

Change subject: util/spd_tools: Support comments in json ......................................................................

util/spd_tools: Support comments in json

Allow comments in json file for better documentation. Comments must be on seperate line.

BUG=none TEST=Injest global_ddr4_mem_parts.json.txt with comments

Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Signed-off-by: Rob Barnes robbarnes@google.com --- M util/spd_tools/ddr4/gen_spd.go M util/spd_tools/ddr4/global_ddr4_mem_parts.json.txt 2 files changed, 8 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/44834/2

-- To view, visit https://review.coreboot.org/c/coreboot/+/44834 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Gerrit-Change-Number: 44834 Gerrit-PatchSet: 2 Gerrit-Owner: Rob Barnes robbarnes@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

Furquan Shaikh (Code Review)

9:39 p.m.

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44834 )

Change subject: util/spd_tools: Support comments in json ......................................................................

Patch Set 2: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/44834 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Gerrit-Change-Number: 44834 Gerrit-PatchSet: 2 Gerrit-Owner: Rob Barnes robbarnes@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Wed, 26 Aug 2020 19:39:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Nick Vaccaro (Code Review)

10:10 p.m.

Nick Vaccaro has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44834 )

Change subject: util/spd_tools: Support comments in json ......................................................................

Patch Set 2: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/44834 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Gerrit-Change-Number: 44834 Gerrit-PatchSet: 2 Gerrit-Owner: Rob Barnes robbarnes@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@chromium.org Gerrit-Reviewer: Nick Vaccaro nvaccaro@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Wed, 26 Aug 2020 20:10:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Rob Barnes (Code Review)

27 Aug 27 Aug

10:28 p.m.

Rob Barnes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/44834 )

Change subject: util/spd_tools: Support comments in json ......................................................................

Abandoned

Reordered

-- To view, visit https://review.coreboot.org/c/coreboot/+/44834 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Gerrit-Change-Number: 44834 Gerrit-PatchSet: 5 Gerrit-Owner: Rob Barnes robbarnes@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@chromium.org Gerrit-Reviewer: Nick Vaccaro nvaccaro@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: abandon

Rob Barnes (Code Review)

10:29 p.m.

Rob Barnes has restored this change. ( https://review.coreboot.org/c/coreboot/+/44834 )

Change subject: util/spd_tools: Support comments in json ......................................................................

Restored

-- To view, visit https://review.coreboot.org/c/coreboot/+/44834 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Gerrit-Change-Number: 44834 Gerrit-PatchSet: 5 Gerrit-Owner: Rob Barnes robbarnes@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@chromium.org Gerrit-Reviewer: Nick Vaccaro nvaccaro@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: restore

Rob Barnes (Code Review)

10:40 p.m.

Hello build bot (Jenkins), Furquan Shaikh, Nick Vaccaro, Nick Vaccaro,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/44834

to look at the new patch set (#7).

Change subject: util/spd_tools: Support comments in json ......................................................................

util/spd_tools: Support comments in json

Allow comments in json file for better documentation. Comments must be on seperate line.

BUG=none TEST=Injest global_ddr4_mem_parts.json.txt with comments

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/44834/7

-- To view, visit https://review.coreboot.org/c/coreboot/+/44834 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Gerrit-Change-Number: 44834 Gerrit-PatchSet: 7 Gerrit-Owner: Rob Barnes robbarnes@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@chromium.org Gerrit-Reviewer: Nick Vaccaro nvaccaro@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

Furquan Shaikh (Code Review)

11:41 p.m.

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44834 )

Change subject: util/spd_tools: Support comments in json ......................................................................

Patch Set 7: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/44834 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Gerrit-Change-Number: 44834 Gerrit-PatchSet: 7 Gerrit-Owner: Rob Barnes robbarnes@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@chromium.org Gerrit-Reviewer: Nick Vaccaro nvaccaro@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Thu, 27 Aug 2020 21:41:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Furquan Shaikh (Code Review)

11:41 p.m.

Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44834 )

Change subject: util/spd_tools: Support comments in json ......................................................................

util/spd_tools: Support comments in json

Allow comments in json file for better documentation. Comments must be on seperate line.

BUG=none TEST=Injest global_ddr4_mem_parts.json.txt with comments

Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Signed-off-by: Rob Barnes robbarnes@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/44834 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com --- M util/spd_tools/ddr4/gen_spd.go M util/spd_tools/ddr4/global_ddr4_mem_parts.json.txt 2 files changed, 8 insertions(+), 0 deletions(-)

Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved

diff --git a/util/spd_tools/ddr4/gen_spd.go b/util/spd_tools/ddr4/gen_spd.go index 5adadc9..0462fd5 100644 --- a/util/spd_tools/ddr4/gen_spd.go +++ b/util/spd_tools/ddr4/gen_spd.go @@ -12,6 +12,7 @@ "reflect" "strconv" "strings" + "regexp" )

/* @@ -998,6 +999,10 @@ return err }

+ // Strip comments from json file + re := regexp.MustCompile(`(?m)^\s*//.*`) + databytes = re.ReplaceAll(databytes, []byte("")) + return json.Unmarshal(databytes, memParts) }

diff --git a/util/spd_tools/ddr4/global_ddr4_mem_parts.json.txt b/util/spd_tools/ddr4/global_ddr4_mem_parts.json.txt index 4e9c7c8..51068d5 100644 --- a/util/spd_tools/ddr4/global_ddr4_mem_parts.json.txt +++ b/util/spd_tools/ddr4/global_ddr4_mem_parts.json.txt @@ -1,3 +1,6 @@ +// Global list of ddr4 memory part attributes. +// These attributes match the part specifications and are independent +// of any SoC expectations. { "parts": [ {

-- To view, visit https://review.coreboot.org/c/coreboot/+/44834 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I51295408d4f916708e4ed5bc42d5468ccdc68a6b Gerrit-Change-Number: 44834 Gerrit-PatchSet: 8 Gerrit-Owner: Rob Barnes robbarnes@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@chromium.org Gerrit-Reviewer: Nick Vaccaro nvaccaro@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: merged

1532

days inactive

1533

days old

coreboot-gerrit@coreboot.org

9 comments

3 participants

tags (0)

participants (3)

Furquan Shaikh (Code Review)
Nick Vaccaro (Code Review)
Rob Barnes (Code Review)