diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2019-11-29 16:14:29 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-02 11:02:21 +0100 |
| commit | 39ae48a54ec9fa471261e25413814d54db656c87 (patch) | |
| tree | 8286642ffdaa9518431ee2d5a8975dd7fec6cbe9 /arch | |
| parent | cae5e14224f4e8d935fe16d6c4d07648a960bfa8 (diff) | |
| download | barebox-39ae48a54ec9fa471261e25413814d54db656c87.tar.gz barebox-39ae48a54ec9fa471261e25413814d54db656c87.tar.xz | |
ARM: move into ARM32 specific optee kernel start into lib32 dir
Otherwise it may also get built on a ARM64 config, which obviously
fails.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/lib32/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/lib32/start-kernel-optee.S (renamed from arch/arm/cpu/start-kernel-optee.S) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index 09b3bc2eea..4b6e238497 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -15,7 +15,6 @@ pbl-$(CONFIG_BOARD_ARM_GENERIC_DT_AARCH64) += board-dt-2nd-aarch64.o obj-pbl-y += setupc$(S64).o cache$(S64).o -obj-$(CONFIG_BOOTM_OPTEE) += start-kernel-optee.o obj-$(CONFIG_ARM_PSCI_CLIENT) += psci-client.o # diff --git a/arch/arm/lib32/Makefile b/arch/arm/lib32/Makefile index 3c02a0bf96..cd43147e66 100644 --- a/arch/arm/lib32/Makefile +++ b/arch/arm/lib32/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_ARM_LINUX) += armlinux.o obj-$(CONFIG_CMD_BOOTZ) += bootz.o obj-$(CONFIG_BOOTM) += bootm.o +obj-$(CONFIG_BOOTM_OPTEE) += start-kernel-optee.o obj-$(CONFIG_CMD_BOOTU) += bootu.o obj-y += div0.o obj-y += findbit.o diff --git a/arch/arm/cpu/start-kernel-optee.S b/arch/arm/lib32/start-kernel-optee.S index 92da4b63c9..92da4b63c9 100644 --- a/arch/arm/cpu/start-kernel-optee.S +++ b/arch/arm/lib32/start-kernel-optee.S |