Jonathan Neuschäfer has uploaded this change for review. ( https://review.coreboot.org/25590
Change subject: util/cbfstool: Print all supported architectures
......................................................................
util/cbfstool: Print all supported architectures
The list of supported architectures in the usage output of cbfstool is
currently hardcoded and outdated.
Use the arch_names array in common.c to provide and up-to-date list.
Change-Id: I3e7ed67c3bfd928b304c314fcc8e1bea35561662
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net>
---
M util/cbfstool/cbfstool.c
M util/cbfstool/common.c
M util/cbfstool/common.h
3 files changed, 17 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/25590/1
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 1f71906..7156e00 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -1350,10 +1350,11 @@
" in two possible formats: if their value is greater than\n"
" 0x80000000, they are interpreted as a top-aligned x86 memory\n"
" address; otherwise, they are treated as an offset into flash.\n"
- "ARCHes:\n"
- " arm64, arm, mips, x86\n"
- "TYPEs:\n", name, name
+ "ARCHes:\n", name, name
);
+ print_supported_architectures();
+
+ printf("TYPEs:\n");
print_supported_filetypes();
printf(
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 72ff745..14ccaa9 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -168,6 +168,18 @@
return ret;
}
+void print_supported_architectures(void)
+{
+ size_t i;
+
+ for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
+ printf(i == 0? " ":", ");
+ printf("%s", arch_names[i].name);
+ }
+
+ printf("\n");
+}
+
void print_supported_filetypes(void)
{
int i, number = ARRAY_SIZE(filetypes);
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 85dfdeb..8bae63e 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -204,6 +204,7 @@
int parse_elf_to_xip_stage(const struct buffer *input, struct buffer *output,
uint32_t *location, const char *ignore_section);
+void print_supported_architectures(void);
void print_supported_filetypes(void);
/* lzma/lzma.c */
--
To view, visit https://review.coreboot.org/25590
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e7ed67c3bfd928b304c314fcc8e1bea35561662
Gerrit-Change-Number: 25590
Gerrit-PatchSet: 1
Gerrit-Owner: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net>
Jonathan Neuschäfer has uploaded this change for review. ( https://review.coreboot.org/25589
Change subject: util/cbfstool: Print types on stdout
......................................................................
util/cbfstool: Print types on stdout
Currently, "cbfstool -h | less" doesn't show any file types under
"TYPEs:". That's because the file types are printed with
print_supported_filetypes, which uses LOG, which prints to stderr. Use
printf print_supported_filetypes, and thus print to stdout, to make the
usage output more normal.
Change-Id: I800c9205c59383b63a640bc0798a1bd9117b0f99
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net>
---
M util/cbfstool/common.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/25589/1
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 5a47c2f..72ff745 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -173,9 +173,9 @@
int i, number = ARRAY_SIZE(filetypes);
for (i=0; i<number; i++) {
- LOG(" %s%c", filetypes[i].name, (i==(number-1))?'\n':',');
+ printf(" %s%c", filetypes[i].name, (i==(number-1))?'\n':',');
if ((i%8) == 7)
- LOG("\n");
+ printf("\n");
}
}
--
To view, visit https://review.coreboot.org/25589
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I800c9205c59383b63a640bc0798a1bd9117b0f99
Gerrit-Change-Number: 25589
Gerrit-PatchSet: 1
Gerrit-Owner: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net>
Marco Chen has posted comments on this change. ( https://review.coreboot.org/25587 )
Change subject: mb/google/fizz: Add device index for 2nd LAN
......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/25587/1/src/mainboard/google/fizz/devicetre…
File src/mainboard/google/fizz/devicetree.cb:
https://review.coreboot.org/#/c/25587/1/src/mainboard/google/fizz/devicetre…
PS1, Line 376: register "device_index" = "1"
For multiple LAN interfaces, as I know we should set device_index from 1 to 10. In case of Fizz, we should set these two interfaces's device_index to 1 and 2 so VPDs would be ethernet_mac0 and ethernet_mac1.
Therefore line 354 should have device_index as 1 and here be 2?
--
To view, visit https://review.coreboot.org/25587
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic357a3f1435d6d08107520e40872f1003ef2edf3
Gerrit-Change-Number: 25587
Gerrit-PatchSet: 1
Gerrit-Owner: David Wu <david_wu(a)quantatw.com>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Gaggery Tsai <gaggery.tsai(a)intel.com>
Gerrit-Reviewer: Gaggery Tsai <gaggery.tsai(a)intel.corp-partner.google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Marco Chen <marcochen(a)google.com>
Gerrit-Comment-Date: Tue, 10 Apr 2018 12:55:03 +0000
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
David Wu has uploaded this change for review. ( https://review.coreboot.org/25587
Change subject: mb/google/fizz: Add device index for 2nd LAN
......................................................................
mb/google/fizz: Add device index for 2nd LAN
Fix 2nd LAN can't inherit correct MAC from VPD setting.
BUG=b:77836343
BRANCH=Fizz
TEST=Program the mac address to VPD in shell
vpd -s ethernet_mac0=<mac address> && reboot the system.
Ensure the MAC address was fetched correctly by ifconfig command.
Change-Id: Ic357a3f1435d6d08107520e40872f1003ef2edf3
Signed-off-by: David Wu <david_wu(a)quantatw.com>
---
M src/mainboard/google/fizz/devicetree.cb
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/25587/1
diff --git a/src/mainboard/google/fizz/devicetree.cb b/src/mainboard/google/fizz/devicetree.cb
index 9d120ea..b957bc6 100644
--- a/src/mainboard/google/fizz/devicetree.cb
+++ b/src/mainboard/google/fizz/devicetree.cb
@@ -373,6 +373,7 @@
device pci 1d.0 on # PCI Express Port 9 for 2nd LAN
chip drivers/net
register "customized_leds" = "0x0fa5"
+ register "device_index" = "1"
device pci 00.0 on end
end
end # PCI Express Port 9 for BtoB
--
To view, visit https://review.coreboot.org/25587
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic357a3f1435d6d08107520e40872f1003ef2edf3
Gerrit-Change-Number: 25587
Gerrit-PatchSet: 1
Gerrit-Owner: David Wu <david_wu(a)quantatw.com>