Hello Patrick Georgi,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/45214
to review the following change.
Change subject: trogdor/sc7180: Clarify USE_QC_BLOBS requirements
......................................................................
trogdor/sc7180: Clarify USE_QC_BLOBS requirements
This patch adds some Kconfig hints to make it clearer that the
USE_QC_BLOBS option is required for SC7180 boards and guide the user in
the right direction through menuconfig. Also add those little arrows to
the Trogdor board options that are there on most other boards.
Signed-off-by: Julius Werner <jwerner(a)chromium.org>
Change-Id: I973cae8026a229408a1a1817c4808b0266387ea7
---
M src/mainboard/google/trogdor/Kconfig.name
M src/soc/qualcomm/sc7180/Kconfig
2 files changed, 12 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/14/45214/1
diff --git a/src/mainboard/google/trogdor/Kconfig.name b/src/mainboard/google/trogdor/Kconfig.name
index b7c03f9..4c1d351 100644
--- a/src/mainboard/google/trogdor/Kconfig.name
+++ b/src/mainboard/google/trogdor/Kconfig.name
@@ -1,17 +1,24 @@
comment "Trogdor"
+if USE_QC_BLOBS
+
config BOARD_GOOGLE_BUBS
- bool "Bubs"
+ bool "-> Bubs"
select BOARD_GOOGLE_TROGDOR_COMMON
config BOARD_GOOGLE_LAZOR
- bool "Lazor"
+ bool "-> Lazor"
select BOARD_GOOGLE_TROGDOR_COMMON
config BOARD_GOOGLE_POMPOM
- bool "Pompom"
+ bool "-> Pompom"
select BOARD_GOOGLE_TROGDOR_COMMON
config BOARD_GOOGLE_TROGDOR
- bool "Trogdor"
+ bool "-> Trogdor"
select BOARD_GOOGLE_TROGDOR_COMMON
+
+endif
+
+comment "(Trogdor requires 'Allow QC blobs repository')"
+ depends on !USE_QC_BLOBS
diff --git a/src/soc/qualcomm/sc7180/Kconfig b/src/soc/qualcomm/sc7180/Kconfig
index db7350f..488fec6 100644
--- a/src/soc/qualcomm/sc7180/Kconfig
+++ b/src/soc/qualcomm/sc7180/Kconfig
@@ -2,6 +2,7 @@
config SOC_QUALCOMM_SC7180
bool
default n
+ depends on USE_QC_BLOBS
select ARCH_BOOTBLOCK_ARMV8_64
select ARCH_RAMSTAGE_ARMV8_64
select ARCH_ROMSTAGE_ARMV8_64
--
To view, visit https://review.coreboot.org/c/coreboot/+/45214
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I973cae8026a229408a1a1817c4808b0266387ea7
Gerrit-Change-Number: 45214
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-MessageType: newchange
Hello Aaron Durbin,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/46835
to review the following change.
Change subject: cbfstool: Don't add compression attribute for uncompressed files
......................................................................
cbfstool: Don't add compression attribute for uncompressed files
Our current cbfstool has always added a compression attribute to the
CBFS file header for all files that used the cbfstool_convert_raw()
function (basically anything other than a stage or payload), even if the
compression type was NONE. This was likely some sort of oversight, since
coreboot CBFS reading code has always accepted the absence of a
compression attribute to mean "no compression". This patch fixes the
behavior to avoid adding the attribute in these cases.
Change-Id: Ic4a41152db9df66376fa26096d6f3a53baea51de
---
M util/cbfstool/cbfstool.c
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/46835/1
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 454aff9..6b9f664 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -766,6 +766,9 @@
return -1;
memcpy(compressed, buffer->data + 8, compressed_size);
} else {
+ if (param.compression == CBFS_COMPRESS_NONE)
+ goto out;
+
compress = compression_function(param.compression);
if (!compress)
return -1;
@@ -777,7 +780,7 @@
compressed, &compressed_size)) {
WARN("Compression failed - disabled\n");
free(compressed);
- return 0;
+ goto out;
}
}
@@ -797,6 +800,7 @@
buffer->data = compressed;
buffer->size = compressed_size;
+out:
header->len = htonl(buffer->size);
return 0;
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/46835
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ic4a41152db9df66376fa26096d6f3a53baea51de
Gerrit-Change-Number: 46835
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-MessageType: newchange