hw: prevent alignment faults in bootstrap

Enable strict-alignment to compile bootstrap code, which cannot handle alignment faults during initialization properly. Ref genodelabs/genode#4827
genodelabs · May 31, 2023 · 80f5b88 · 80f5b88
1 parent 080b3c9
commit 80f5b88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/lib/mk/spec/arm_v8/bootstrap-hw-imx8q_evk.mk b/lib/mk/spec/arm_v8/bootstrap-hw-imx8q_evk.mk
@@ -5,12 +5,7 @@ REP_INC_DIR += src/bootstrap/board/imx8q_evk
 SRC_CC  += bootstrap/board/imx8q_evk/platform.cc
 SRC_CC  += bootstrap/spec/arm/gicv3.cc
 SRC_CC  += bootstrap/spec/arm_64/cortex_a53_mmu.cc
-SRC_CC  += lib/base/arm_64/kernel/interface.cc
-SRC_CC  += spec/64bit/memory_map.cc
-SRC_S   += bootstrap/spec/arm_64/crt0.s
-
-vpath spec/64bit/memory_map.cc $(call select_from_repositories,src/lib/hw)
 
 vpath bootstrap/% $(REP_DIR)/src
 
-include $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
+include $(call select_from_repositories,lib/mk/spec/arm_v8/bootstrap-hw.inc)
diff --git a/lib/mk/spec/arm_v8/bootstrap-hw-mnt_reform2.mk b/lib/mk/spec/arm_v8/bootstrap-hw-mnt_reform2.mk
@@ -5,12 +5,7 @@ REP_INC_DIR += src/bootstrap/board/imx8q_evk
 SRC_CC  += bootstrap/board/mnt_reform2/platform.cc
 SRC_CC  += bootstrap/spec/arm/gicv3.cc
 SRC_CC  += bootstrap/spec/arm_64/cortex_a53_mmu.cc
-SRC_CC  += lib/base/arm_64/kernel/interface.cc
-SRC_CC  += spec/64bit/memory_map.cc
-SRC_S   += bootstrap/spec/arm_64/crt0.s
-
-vpath spec/64bit/memory_map.cc $(call select_from_repositories,src/lib/hw)
 
 vpath bootstrap/% $(REP_DIR)/src
 
-include $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
+include $(call select_from_repositories,lib/mk/spec/arm_v8/bootstrap-hw.inc)