Julius Werner would like Philip Chen and mturney mturney to review this change.
sc7180: Enable bootblock compression
This patch enables bootblock compression on SC7180. In my tests, that
makes it boot roughly 10ms faster (which isn't much, but... might as
well take it).
Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: Ibbe06eeb05347cc77395681969e6eaf1598b4260
---
M src/arch/arm64/Makefile.inc
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
M src/soc/qualcomm/sc7180/bootblock.c
A src/soc/qualcomm/sc7180/decompressor.c
M src/soc/qualcomm/sc7180/memlayout.ld
6 files changed, 16 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/45855/1
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 920ff5d..44517cb 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -31,6 +31,7 @@
$(call src-to-obj,decompressor,$(dir)/id.S): $(obj)/build.h
$(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h
+decompressor-$(CONFIG_ARM64_USE_ARCH_TIMER) += arch_timer.c
bootblock-$(CONFIG_ARM64_USE_ARCH_TIMER) += arch_timer.c
bootblock-y += transition.c transition_asm.S
diff --git a/src/soc/qualcomm/sc7180/Kconfig b/src/soc/qualcomm/sc7180/Kconfig
index d543ef5..addb49d 100644
--- a/src/soc/qualcomm/sc7180/Kconfig
+++ b/src/soc/qualcomm/sc7180/Kconfig
@@ -17,6 +17,7 @@
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_FORCE_NATIVE_VGA_INIT
select HAVE_LINEAR_FRAMEBUFFER
+ select COMPRESS_BOOTBLOCK
if SOC_QUALCOMM_SC7180
diff --git a/src/soc/qualcomm/sc7180/Makefile.inc b/src/soc/qualcomm/sc7180/Makefile.inc
index a0d3bc6..7f52a9a 100644
--- a/src/soc/qualcomm/sc7180/Makefile.inc
+++ b/src/soc/qualcomm/sc7180/Makefile.inc
@@ -1,6 +1,10 @@
ifeq ($(CONFIG_SOC_QUALCOMM_SC7180),y)
+decompressor-y += decompressor.c
+decompressor-y += mmu.c
+decompressor-y += timer.c
+
################################################################################
bootblock-y += bootblock.c
bootblock-y += mmu.c
diff --git a/src/soc/qualcomm/sc7180/bootblock.c b/src/soc/qualcomm/sc7180/bootblock.c
index 7dbaeec..cfeb6f9 100644
--- a/src/soc/qualcomm/sc7180/bootblock.c
+++ b/src/soc/qualcomm/sc7180/bootblock.c
@@ -2,13 +2,11 @@
#include <bootblock_common.h>
#include <soc/clock.h>
-#include <soc/mmu.h>
#include <soc/qspi.h>
#include <soc/qupv3_config.h>
void bootblock_soc_init(void)
{
- sc7180_mmu_init();
clock_init();
quadspi_init(37500 * KHz);
qupv3_fw_init();
diff --git a/src/soc/qualcomm/sc7180/decompressor.c b/src/soc/qualcomm/sc7180/decompressor.c
new file mode 100644
index 0000000..ac55150
--- /dev/null
+++ b/src/soc/qualcomm/sc7180/decompressor.c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <bootblock_common.h>
+#include <soc/mmu.h>
+
+void decompressor_soc_init(void)
+{
+ sc7180_mmu_init();
+}
diff --git a/src/soc/qualcomm/sc7180/memlayout.ld b/src/soc/qualcomm/sc7180/memlayout.ld
index 0142242..ea9a451 100644
--- a/src/soc/qualcomm/sc7180/memlayout.ld
+++ b/src/soc/qualcomm/sc7180/memlayout.ld
@@ -22,7 +22,7 @@
AOPSRAM_END(0x0B100000)
SSRAM_START(0x14680000)
- OVERLAP_VERSTAGE_ROMSTAGE(0x14680000, 100K)
+ OVERLAP_DECOMPRESSOR_VERSTAGE_ROMSTAGE(0x14680000, 100K)
REGION(qcsdi, 0x14699000, 52K, 4K)
SSRAM_END(0x146AE000)
To view, visit change 45855. To unsubscribe, or for help writing mail filters, visit settings.