diff options
author | Soby Mathew <soby.mathew@arm.com> | 2019-09-12 10:58:43 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-09-12 10:58:43 +0000 |
commit | 9af73b36883010a4dc4f0b0640dcc7dced895770 (patch) | |
tree | 1f4d1d0c9c399cddea727a04b3a62e8f96275db4 /drivers | |
parent | 749b3346946fe331445deaabef562c55f8835af9 (diff) | |
parent | b56218744e318097b2d850510505d0bcac6d5132 (diff) | |
download | trusted-firmware-a-9af73b36883010a4dc4f0b0640dcc7dced895770.tar.gz |
Merge changes from topic "amlogic-refactoring" into integration
* changes:
amlogic: Fix includes order
amlogic: Fix header guards
amlogic: Fix prefixes in the SoC specific files
amlogic: Fix prefixes in the PM code
amlogic: Fix prefixes in the SCPI related code
amlogic: Fix prefixes in the MHU code
amlogic: Fix prefixes in the SIP/SVC code
amlogic: Fix prefixes in the thermal driver
amlogic: Fix prefixes in the private header file
amlogic: Fix prefixes in the efuse driver
amlogic: Fix prefixes in the platform macros file
amlogic: Fix prefixes in the helpers file
amlogic: Rework Makefiles
amlogic: Move the SIP SVC code to common directory
amlogic: Move topology file to common directory
amlogic: Move thermal code to common directory
amlogic: Move MHU code to common directory
amlogic: Move efuse code to common directory
amlogic: Move platform macros assembly file to common directory
amlogic: Introduce unified private header file
amlogic: Move SCPI code to common directory
amlogic: Move the SHA256 DMA driver to common directory
amlogic: Move assembly helpers to common directory
amlogic: Introduce directory parameters in the makefiles
meson: Rename platform directory to amlogic
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/amlogic/console/aarch64/meson_console.S (renamed from drivers/meson/console/aarch64/meson_console.S) | 4 | ||||
-rw-r--r-- | drivers/amlogic/crypto/sha_dma.c (renamed from drivers/meson/gxl/crypto/sha_dma.c) | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/meson/console/aarch64/meson_console.S b/drivers/amlogic/console/aarch64/meson_console.S index 22d0773328..e645cbab83 100644 --- a/drivers/meson/console/aarch64/meson_console.S +++ b/drivers/amlogic/console/aarch64/meson_console.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,7 +7,7 @@ #include <asm_macros.S> #include <assert_macros.S> #include <console_macros.S> -#include <drivers/meson/meson_console.h> +#include <drivers/amlogic/meson_console.h> .globl console_meson_register .globl console_meson_init diff --git a/drivers/meson/gxl/crypto/sha_dma.c b/drivers/amlogic/crypto/sha_dma.c index a969dea74c..d48ded987a 100644 --- a/drivers/meson/gxl/crypto/sha_dma.c +++ b/drivers/amlogic/crypto/sha_dma.c @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <assert.h> #include <arch_helpers.h> -#include <lib/mmio.h> +#include <assert.h> #include <crypto/sha_dma.h> +#include <lib/mmio.h> #define AML_SHA_DMA_BASE 0xc883e000 |