diff options
| author | Marc Jones <marc.jones@se-eng.com> | 2015-01-16 13:45:23 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2015-01-26 11:41:06 +0100 |
| commit | 17b9c198e0ebbd79d1b581eba0810a4c7979f012 (patch) | |
| tree | 41eade9129f8d0cfcea7287dd1ffa3a724bb2eb4 /src/arch/arm64/armv8 | |
| parent | c4dbdaf50a8fa67e0d17e237eb0dcb6309240dd6 (diff) | |
| download | coreboot-17b9c198e0ebbd79d1b581eba0810a4c7979f012.tar.xz | |
arm64: Prepare ARM64 for building
There were a number of issues with the ARM64 build files. This
patch ports the following changes from ARMV4/V7 to ARMV8:
- make armv8 Kconfig options consistent with armv4/v7
- fix build include issues in boot.c, tables.c,
and early_variables.h by matching armv4/v7.
Change-Id: I57359a96821d88c50f48dc0bb6ad226cacb0c2ec
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: Iacd95d336559c45458784d1da67bde62a0956620
Reviewed-on: http://review.coreboot.org/8236
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch/arm64/armv8')
| -rw-r--r-- | src/arch/arm64/armv8/Kconfig | 8 | ||||
| -rw-r--r-- | src/arch/arm64/armv8/Makefile.inc | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/arch/arm64/armv8/Kconfig b/src/arch/arm64/armv8/Kconfig index fc2e6680b1..1dd2576cb7 100644 --- a/src/arch/arm64/armv8/Kconfig +++ b/src/arch/arm64/armv8/Kconfig @@ -1,9 +1,11 @@ -config ARCH_BOOTBLOCK_ARM_V8_64 +config ARCH_BOOTBLOCK_ARMV8_64 def_bool n select ARCH_BOOTBLOCK_ARM64 -config ARCH_ROMSTAGE_ARM_V8_64 + +config ARCH_ROMSTAGE_ARMV8_64 def_bool n select ARCH_ROMSTAGE_ARM64 -config ARCH_RAMSTAGE_ARM_V8_64 + +config ARCH_RAMSTAGE_ARMV8_64 def_bool n select ARCH_RAMSTAGE_ARM64 diff --git a/src/arch/arm64/armv8/Makefile.inc b/src/arch/arm64/armv8/Makefile.inc index 973b391dd4..c5f7a80767 100644 --- a/src/arch/arm64/armv8/Makefile.inc +++ b/src/arch/arm64/armv8/Makefile.inc @@ -26,7 +26,7 @@ armv8_asm_flags = $(armv8_flags) ################################################################################ ## bootblock ################################################################################ -ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARM_V8_64),y) +ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARMV8_64),y) ifneq ($(CONFIG_ARM_BOOTBLOCK_CUSTOM),y) bootblock-y += bootblock.S @@ -46,7 +46,7 @@ endif ################################################################################ ## romstage ################################################################################ -ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM_V8_64),y) +ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV8_64),y) romstage-y += cache.c romstage-y += cpu.S @@ -61,7 +61,7 @@ endif ################################################################################ ## ramstage ################################################################################ -ifeq ($(CONFIG_ARCH_RAMSTAGE_ARM_V8_64),y) +ifeq ($(CONFIG_ARCH_RAMSTAGE_ARMV8_64),y) ramstage-y += cache.c ramstage-y += cpu.S @@ -71,4 +71,7 @@ ramstage-y += exception_asm.S ramstage-c-ccopts += $(armv8_flags) ramstage-S-ccopts += $(armv8_asm_flags) +rmodules_arm64-c-ccopts += $(armv8_flags) +rmodules_arm64-S-ccopts += $(armv8_asm_flags) + endif |