project/bcm63xx/atf.git
6 years agoMerge pull request #1601 from joannafarley-arm/jf/release-2.0-changelog
Soby Mathew [Tue, 2 Oct 2018 12:48:02 +0000 (13:48 +0100)]
Merge pull request #1601 from joannafarley-arm/jf/release-2.0-changelog

Release docs updates for v2.0 release

6 years agoMerge pull request #1599 from soby-mathew/sm/update_v2.0
Soby Mathew [Tue, 2 Oct 2018 12:47:44 +0000 (13:47 +0100)]
Merge pull request #1599 from soby-mathew/sm/update_v2.0

Update the version to 2.0

6 years agoRelease docs updates for v2.0 release
Joanna Farley [Fri, 28 Sep 2018 07:38:17 +0000 (08:38 +0100)]
Release docs updates for v2.0 release

Change-Id: Iaa5c586b65f0abdd4ddbdee4c73d07811a0aff49
Signed-off-by: Joanna Farley <joanna.farley@arm.com>
6 years agoMerge pull request #1600 from soby-mathew/sm/compat_policy_doc
Soby Mathew [Tue, 2 Oct 2018 10:21:46 +0000 (11:21 +0100)]
Merge pull request #1600 from soby-mathew/sm/compat_policy_doc

docs: Add platform compatibility policy document

6 years agodocs: Add platform compatibility policy document
Soby Mathew [Wed, 26 Sep 2018 10:17:23 +0000 (11:17 +0100)]
docs: Add platform compatibility policy document

Information regarding platform compatibility policy
is added to the documentation.

Change-Id: If9f2a11160f81354ee2c678f0fca9d67fc7366e6
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
6 years agoMerge pull request #1598 from soby-mathew/sm/docs_update_deprecate_1
Soby Mathew [Tue, 2 Oct 2018 10:09:30 +0000 (11:09 +0100)]
Merge pull request #1598 from soby-mathew/sm/docs_update_deprecate_1

docs: update for removal of deprecated interfaces.

6 years agoMerge pull request #1587 from antonio-nino-diaz-arm/an/deprecated
Soby Mathew [Tue, 2 Oct 2018 09:12:32 +0000 (10:12 +0100)]
Merge pull request #1587 from antonio-nino-diaz-arm/an/deprecated

Remove deprecated interfaces for all platforms

6 years agodocs: update for removal of deprecated interfaces.
Soby Mathew [Thu, 27 Sep 2018 15:46:41 +0000 (16:46 +0100)]
docs: update for removal of deprecated interfaces.

Change-Id: I69e2720f534583a0f8d0e44f2e7b6f393f6fd093
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
6 years agoUpdate the version to 2.0
Soby Mathew [Mon, 1 Oct 2018 15:16:34 +0000 (16:16 +0100)]
Update the version to 2.0

Change-Id: Icbc556d47a58d0870577b1bf1cd27cc5827fd56d
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
6 years agoMerge pull request #1589 from hzhuang1/topic/fix_clang
Dimitris Papastamos [Mon, 1 Oct 2018 10:29:36 +0000 (11:29 +0100)]
Merge pull request #1589 from hzhuang1/topic/fix_clang

Topic/fix clang

6 years agoMerge pull request #1596 from Yann-lms/mmc_defines
Dimitris Papastamos [Mon, 1 Oct 2018 10:29:11 +0000 (11:29 +0100)]
Merge pull request #1596 from Yann-lms/mmc_defines

mmc: Update framework to use standard response type

6 years agoMerge pull request #1590 from sandrine-bailleux-arm/sb/doc-fixes
Dimitris Papastamos [Mon, 1 Oct 2018 10:28:43 +0000 (11:28 +0100)]
Merge pull request #1590 from sandrine-bailleux-arm/sb/doc-fixes

Update link to Linux coding style

6 years agommc: Update framework to use standard response type
Yann Gautier [Fri, 28 Sep 2018 14:48:37 +0000 (16:48 +0200)]
mmc: Update framework to use standard response type

Respect official response type and update response to follow
official specification.
All the MMC_RESPONSE_R(_x) are replaced with each corresponding define.

Partly revert 2a82a9c95f6c06079f58d69315544a6b49cf64a4 for dw_mmc.c:
Responses R1, R1B and R5 have CRC.

Signed-off-by: Lionel Debieve <lionel.debieve@st.com>
Signed-off-by: Yann Gautier <yann.gautier@st.com>
6 years agouniphier: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:16:35 +0000 (17:16 +0100)]
uniphier: Migrate to new interfaces

- Remove references to removed build options.
- Migrate to bl31_early_platform_setup2().

Change-Id: I9242c4d02a36e385bf0bf8ee56287106030153d1
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agorockchip: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:16:20 +0000 (17:16 +0100)]
rockchip: Migrate to new interfaces

- Migrate to new GIC interfaces.
- Migrate to bl31_early_platform_setup2().
- Use bl31_warm_entrypoint() instead of psci_entrypoint().
- Use PLAT_VIRT_ADDR_SPACE_SIZE and PLAT_PHY_ADDR_SPACE_SIZE.
- Update Makefile paths.
- Remove references to removed build options.
- Use private definition of bl31_params_t.

Change-Id: I860341594b5c868b2fcaa59d23957ee718472ef1
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agotegra: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:16:05 +0000 (17:16 +0100)]
tegra: Migrate to new interfaces

- Migrate to bl31_early_platform_setup2().
- Remove references to removed build options.
- Replace zeromem16() by zeromem().
- Use private definition of bl31_params_t.

This is an incomplete migration, the platform doesn't currently compile.

Change-Id: I67fbf2206678be80c3a16692024221a131cec42f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agomediatek: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:15:54 +0000 (17:15 +0100)]
mediatek: Migrate to new interfaces

- mt6795: Migrate to new GIC interfaces.
- Remove support for PSCI platform compatibility layer.
- Migrate to bl31_early_platform_setup2().
- Migrate from cm_init_context() to cm_init_my_context().
- Use PLAT_VIRT_ADDR_SPACE_SIZE and PLAT_PHY_ADDR_SPACE_SIZE.
- Update Makefile paths.
- Use private definition of bl31_params_t.

This is an incomplete migration, mt6795 doesn't currently compile.

Change-Id: Icf9307637066cd6f2166524715e4f117f5ce2350
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agomarvell: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:15:46 +0000 (17:15 +0100)]
marvell: Migrate to new interfaces

- Migrate to bl2_early_platform_setup2().
- Remove references to removed build options.
- Use private definition of bl31_params_t.

This is an incomplete migration, the platform doesn't currently compile.

Change-Id: I1ae477b1f2489f49b651528050fdf06e4a55e425
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agols1043: Migrate to new interfaces
Antonio Nino Diaz [Tue, 25 Sep 2018 13:54:23 +0000 (14:54 +0100)]
ls1043: Migrate to new interfaces

- Migrate to new GIC interfaces.
- Remove references to removed build options.

Change-Id: I6f90a33d5438a9d7b71be3f93e8d9da278c8c6e6
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoimx8qm: imx8qx: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:56:56 +0000 (17:56 +0100)]
imx8qm: imx8qx: Migrate to new interfaces

- Migrate to new GIC interfaces.
- Migrate to bl31_early_platform_setup2().
- Remove references to removed build options.

Change-Id: Ia7c63f75325ea4b41e32a9de3f01b0007d0ae210
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agopoplar: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:15:15 +0000 (17:15 +0100)]
poplar: Migrate to new interfaces

- Remove support for LOAD_IMAGE_V2=0.
- Replace deprecated bl1_init_bl2_mem_layout().
- Migrate to bl2_early_platform_setup2().
- Migrate to bl31_early_platform_setup2().
- Use PLAT_VIRT_ADDR_SPACE_SIZE and PLAT_PHY_ADDR_SPACE_SIZE.
- Remove references to removed build options.
- Update Makefile paths.

Change-Id: I52e02633365b3db4244f7ff0f99a6446eae619f0
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agozynqmp: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:16:52 +0000 (17:16 +0100)]
zynqmp: Migrate to new interfaces

- Remove references to removed build options.
- Migrate to bl31_early_platform_setup2().

Change-Id: Ibeb8982a0a841f55ce778c4f09f06b72b47b21d8
Tested-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agohikey960: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:23:47 +0000 (17:23 +0100)]
hikey960: Migrate to new interfaces

- Migrate to new GIC interfaces.
- Remove unused bl1_init_bl2_mem_layout().
- Migrate to bl31_early_platform_setup2().
- Use PLAT_VIRT_ADDR_SPACE_SIZE and PLAT_PHY_ADDR_SPACE_SIZE.
- Remove references to removed build options.
- Update Makefile paths.

Change-Id: I583fd893555e6535f32d87ed67bbae430b8e6afe
Tested-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agohikey: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:15:05 +0000 (17:15 +0100)]
hikey: Migrate to new interfaces

- Migrate to new GIC interfaces.
- Remove unused bl1_init_bl2_mem_layout().
- Migrate to bl31_early_platform_setup2().
- Use PLAT_VIRT_ADDR_SPACE_SIZE and PLAT_PHY_ADDR_SPACE_SIZE.
- Update Makefile paths.
- Remove references to removed build options.

Change-Id: Idd1e99b4864b2a72e9e12ff1fcd73d8285bc1c94
Tested-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoqemu: Migrate to new interfaces
Antonio Nino Diaz [Wed, 26 Sep 2018 08:29:45 +0000 (09:29 +0100)]
qemu: Migrate to new interfaces

- Remove references to removed build options.
- Remove support for LOAD_IMAGE_V2=0.
- Migrate to sp_min_early_platform_setup2().

Change-Id: I884399139fb8e2554adeded888969f44672d56c0
Co-authored-by: Jens Wiklander <jens.wiklander@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agowarp7: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:25:08 +0000 (17:25 +0100)]
warp7: Migrate to new interfaces

- Fix reference to bl2_el3_early_platform_setup()
- Remove references to removed build options.

Change-Id: I9733bec64fc28db15716ddf481c05bdc30700b4a
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agosgi: sgm: Migrate to new interfaces
Antonio Nino Diaz [Tue, 25 Sep 2018 10:38:18 +0000 (11:38 +0100)]
sgi: sgm: Migrate to new interfaces

- Remove references to removed build options.
- Remove support for LOAD_IMAGE_V2=0.

Change-Id: I296385ef2ebf829446c76a54400d73f963ed265f
Tested-by: Nariman Poushin <nariman.poushin@linaro.org>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoallwinner: Remove references to removed build flags
Antonio Nino Diaz [Mon, 24 Sep 2018 16:14:53 +0000 (17:14 +0100)]
allwinner: Remove references to removed build flags

Change-Id: I206478597dd9855d3fe1577e7e2c0fe6d2af1cc5
Tested-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoti: k3: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:16:45 +0000 (17:16 +0100)]
ti: k3: Migrate to new interfaces

- Migrate to bl31_early_platform_setup2().
- Remove references to removed build options.

Change-Id: Ie9f149e3fdec935f9329402ed3dd8e1c00b8832c
Acked-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agosynquacer: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:16:30 +0000 (17:16 +0100)]
synquacer: Migrate to new interfaces

- Remove references to removed build options.
- Update Makefile paths.
- Migrate to bl31_early_platform_setup2().

Change-Id: I51cbf09a0297ac1ee645a959063238c9d556d8e1
Tested-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agostm32mp1: Migrate to new interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:16:41 +0000 (17:16 +0100)]
stm32mp1: Migrate to new interfaces

- Remove references to removed build options.
- Remove useless include to removed file.

Change-Id: I256da4135ac0a6ff80d4f211689ab4d08436206f
Tested-by: Yann Gautier <yann.gautier@st.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agorpi3: Remove references to removed build options
Antonio Nino Diaz [Mon, 24 Sep 2018 16:16:25 +0000 (17:16 +0100)]
rpi3: Remove references to removed build options

Change-Id: Ida5364da1346261cf1636c6a4956a562a5c36ee7
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoplat/arm: Migrate to new interfaces
Antonio Nino Diaz [Tue, 25 Sep 2018 10:37:23 +0000 (11:37 +0100)]
plat/arm: Migrate to new interfaces

- Remove references to removed build options.
- Remove support for legacy GIC driver.
- Remove support for LOAD_IMAGE_V2=0.

Change-Id: I72f8c05620bdf4a682765e6e53e2c04ca749a3d5
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoRemove all other deprecated interfaces and files
Antonio Nino Diaz [Tue, 25 Sep 2018 08:39:51 +0000 (09:39 +0100)]
Remove all other deprecated interfaces and files

Change-Id: Icd1cdd42afdc78895a9be6c46b414b0a155cfa63
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agodrivers: cadence: cdns: Fix flush function
Antonio Nino Diaz [Mon, 24 Sep 2018 21:07:58 +0000 (22:07 +0100)]
drivers: cadence: cdns: Fix flush function

It is still a placeholder, but now it is registered correctly by the
macro finish_console_register.

Change-Id: Ic78c966d9be606cbc1a53cec43ead23b32963afe
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoconsole: Remove deprecated files
Antonio Nino Diaz [Mon, 24 Sep 2018 16:29:01 +0000 (17:29 +0100)]
console: Remove deprecated files

Change-Id: Ib9eebbdff6f7868e1d1b8c41761cacc7501a25bd
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agocci400: Remove deprecated driver
Antonio Nino Diaz [Mon, 24 Sep 2018 10:14:58 +0000 (11:14 +0100)]
cci400: Remove deprecated driver

This driver is deprecated.

Change-Id: Ic6e154a5756e779743b17a329eed4570ccc61389
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agotzc400: Remove deprecated interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 10:40:12 +0000 (11:40 +0100)]
tzc400: Remove deprecated interfaces

Change-Id: I9874883ec33dbf293f607f9779d7c56f23cb8023
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoxlat: Remove deprecated interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:28:13 +0000 (17:28 +0100)]
xlat: Remove deprecated interfaces

Change-Id: I83de2ae3e0795e6fec3c1e5b37c441b64b0c9cb6
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agocontext_mgmt: Remove deprecated interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:27:55 +0000 (17:27 +0100)]
context_mgmt: Remove deprecated interfaces

Change-Id: I2d4a21a80a768bc422e9707e6d7e98d20a716275
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoRemove deprecated bl1_init_bl2_mem_layout()
Antonio Nino Diaz [Mon, 24 Sep 2018 16:26:25 +0000 (17:26 +0100)]
Remove deprecated bl1_init_bl2_mem_layout()

Change-Id: I8ec8b4439ca1d7606aae069c2c576a9a8b18c92c
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoRemove deprecated early platform setup interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:24:41 +0000 (17:24 +0100)]
Remove deprecated early platform setup interfaces

The affected interfaces are bl31_early_platform_setup(),
sp_min_early_platform_setup() and bl2_early_platform_setup().

Change-Id: I50c01ec68bcbe97fe4e5d101bcd0f763358b8e1e
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agogic: Remove deprecated driver and interfaces
Antonio Nino Diaz [Mon, 24 Sep 2018 16:23:24 +0000 (17:23 +0100)]
gic: Remove deprecated driver and interfaces

Change-Id: I567a406edb090ae9d109382f6874846a79dd7473
Co-authored-by: Roberto Vargas <roberto.vargas@arm.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agotbbr: Use USE_TBBR_DEFS=1 by default
Antonio Nino Diaz [Tue, 25 Sep 2018 08:41:08 +0000 (09:41 +0100)]
tbbr: Use USE_TBBR_DEFS=1 by default

Change-Id: I2885b0d8cb9bb16da1fa96a30e46cccde434dc42
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoRemove build option LOAD_IMAGE_V2
Roberto Vargas [Mon, 24 Sep 2018 16:20:48 +0000 (17:20 +0100)]
Remove build option LOAD_IMAGE_V2

The code of LOAD_IMAGE_V2=0 has been removed.

Change-Id: Iea03e5bebb90c66889bdb23f85c07d0c9717fffe
Co-authored-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoPSCI: Remove deprecated file plat_psci_common.c
Antonio Nino Diaz [Mon, 24 Sep 2018 16:18:33 +0000 (17:18 +0100)]
PSCI: Remove deprecated file plat_psci_common.c

Change-Id: I9fd8016527ad7706494f34356fdae8efacef5f72
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoPSCI: Remove platform compatibility layer
Roberto Vargas [Mon, 24 Sep 2018 16:14:46 +0000 (17:14 +0100)]
PSCI: Remove platform compatibility layer

Change-Id: I40d040aa05bcbf11536a96ce59827711456b93a8
Co-authored-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agofip_create: Remove fip_create compatibility script
dp-arm [Fri, 30 Dec 2016 14:33:24 +0000 (14:33 +0000)]
fip_create: Remove fip_create compatibility script

A compatibility script has been provided for about 2 years. Users should
have migrated to fiptool by now so remove the compat script.

Change-Id: I643e0c40a9e3fb428bad3be04a82cb431aad74dc
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
6 years agoMerge pull request #1594 from ARM-software/revert-1586-topics/ep/scp_bl2_size
Dimitris Papastamos [Fri, 28 Sep 2018 13:23:50 +0000 (14:23 +0100)]
Merge pull request #1594 from ARM-software/revert-1586-topics/ep/scp_bl2_size

Revert "sgm: increase SCP_BL2 maximum size"

6 years agoRevert "sgm: increase SCP_BL2 maximum size"
Dimitris Papastamos [Fri, 28 Sep 2018 13:23:26 +0000 (14:23 +0100)]
Revert "sgm: increase SCP_BL2 maximum size"

6 years agoMerge pull request #1593 from shawnguo2/mmc_fix_R2_response
Dimitris Papastamos [Fri, 28 Sep 2018 12:58:21 +0000 (13:58 +0100)]
Merge pull request #1593 from shawnguo2/mmc_fix_R2_response

drivers: mmc: Fix R2 response type definition

6 years agoMerge pull request #1592 from shawnguo2/fix-recovery-build
Dimitris Papastamos [Fri, 28 Sep 2018 12:57:45 +0000 (13:57 +0100)]
Merge pull request #1592 from shawnguo2/fix-recovery-build

poplar: fix build error with POPLAR_RECOVERY=1

6 years agoMerge pull request #1586 from Elieva/topics/ep/scp_bl2_size
Dimitris Papastamos [Fri, 28 Sep 2018 12:56:59 +0000 (13:56 +0100)]
Merge pull request #1586 from Elieva/topics/ep/scp_bl2_size

sgm: increase SCP_BL2 maximum size

6 years agodrivers: mmc: Fix R2 response type definition
Shawn Guo [Fri, 28 Sep 2018 06:21:01 +0000 (14:21 +0800)]
drivers: mmc: Fix R2 response type definition

The Poplar is broken on eMMC initialization because of commit
2a82a9c95f6c ("drivers: emmc: dw_mmc: Add response flag into response ID
definition").  It changes the driver behavior on response type handling
in dw_send_cmd(), because MMC_RESPONSE_R(2) and MMC_RESPONSE_R2 are
different things.  MMC core is still sending the former while we already
changed to check the latter in dw_mmc driver.

This patch fixes R2 response type in MMC core code.  It's the same
thing as what commit 94522ff7f6d2 ("drivers: mmc: Fix R3 response type
definition") does for R3 response.

With this fix, Poplar is back to work.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
6 years agopoplar: fix build error with POPLAR_RECOVERY=1
Shawn Guo [Thu, 27 Sep 2018 08:48:00 +0000 (16:48 +0800)]
poplar: fix build error with POPLAR_RECOVERY=1

Commit eba1b6b3c724 ("plat/poplar: migrate to mmc framework") defines
variable 'info' without !POPLAR_RECOVERY protection, and hence causes
the following unused variable error with POPLAR_RECOVERY=1 build.

plat/hisilicon/poplar/bl1_plat_setup.c: In function ‘bl1_platform_setup’:
plat/hisilicon/poplar/bl1_plat_setup.c:95:25: error: unused variable ‘info’ [-Werror=unused-variable]
  struct mmc_device_info info;
                         ^~~~

The patches fixes the build error with POPLAR_RECOVERY=1.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
6 years agoUpdate link to Linux coding style
Sandrine Bailleux [Mon, 24 Sep 2018 15:26:57 +0000 (17:26 +0200)]
Update link to Linux coding style

Change-Id: Id0f099a19f207771c9dc542ba669898f57141755
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
6 years agohikey960: fix build issue for clang
Haojian Zhuang [Mon, 10 Sep 2018 04:21:35 +0000 (12:21 +0800)]
hikey960: fix build issue for clang

plat/hisilicon/hikey960/include/plat_macros.S:19:55: error: unexpected token in
'.asciz' directive
 .asciz "gicd_ispendr regs (Offsets 0x200 - 0x278)\n" " Offset:\t\t\tvalue\n"
                                                      ^
Makefile:720: recipe for target 'build/hikey960/debug/bl1/cortex_a53.o' failed
make: *** [build/hikey960/debug/bl1/cortex_a53.o] Error 1

Merge the two lines into one.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
6 years agohikey: fix build issue for clang
Haojian Zhuang [Mon, 10 Sep 2018 03:28:25 +0000 (11:28 +0800)]
hikey: fix build issue for clang

plat/hisilicon/hikey/include/plat_macros.S:19:55: error: unexpected token in '.asciz' directive
 .asciz "gicd_ispendr regs (Offsets 0x200 - 0x278)\n" " Offset:\t\t\tvalue\n"
                                                      ^
Makefile:720: recipe for target 'build/hikey/debug/bl1/cortex_a53.o' failed
make: *** [build/hikey/debug/bl1/cortex_a53.o] Error 1

Merge two lines into one line.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
6 years agosgm: increase SCP_BL2 maximum size
Elieva Pignat [Mon, 24 Sep 2018 13:30:36 +0000 (14:30 +0100)]
sgm: increase SCP_BL2 maximum size

For sgm775 the SCP_BL2 build in debug mode is around 94KiB which
is higher than the maximum size for SCP_BL2.

This patch increase the maximum allowed size for SCP_BL2 to
96KiB.

Change-Id: Ibca0daadba41429301c651ae21cbba87e45ccddf
Signed-off-by: Elieva Pignat <Elieva.Pignat@arm.com>
6 years agoMerge pull request #1585 from sandrine-bailleux-arm/sb/doc-fixes
Soby Mathew [Fri, 21 Sep 2018 12:15:34 +0000 (13:15 +0100)]
Merge pull request #1585 from sandrine-bailleux-arm/sb/doc-fixes

Minor documentation fixes

6 years agoMerge pull request #1581 from satheesbalya-arm/sb1_update_minor_version
Soby Mathew [Fri, 21 Sep 2018 12:15:05 +0000 (13:15 +0100)]
Merge pull request #1581 from satheesbalya-arm/sb1_update_minor_version

Update release minor version string

6 years agoMerge pull request #1580 from joannafarley-arm/jf/release-1.6-changelogs-Readme
Soby Mathew [Fri, 21 Sep 2018 12:14:33 +0000 (13:14 +0100)]
Merge pull request #1580 from joannafarley-arm/jf/release-1.6-changelogs-Readme

Readme and Change-log updates for v1.6 release

6 years agoMerge pull request #1578 from Yann-lms/par_addr_mask_64
Soby Mathew [Fri, 21 Sep 2018 09:46:22 +0000 (10:46 +0100)]
Merge pull request #1578 from Yann-lms/par_addr_mask_64

aarch32: PAR_ADDR_MASK should explicitly use BIT_64

6 years agoUpdate release minor version string
Sathees Balya [Fri, 21 Sep 2018 09:41:13 +0000 (10:41 +0100)]
Update release minor version string

Change-Id: I67382383fc9d18ab57c7e51f793145cb14c6fec5
Signed-off-by: Sathees Balya <sathees.balya@arm.com>
6 years agoReadme and Change-log updates for v1.6 release
Joanna Farley [Tue, 11 Sep 2018 14:51:31 +0000 (15:51 +0100)]
Readme and Change-log updates for v1.6 release

Change-Id: I7855c9d3de104975bf3249bdf291c428f001d07a
Signed-off-by: Joanna Farley <joanna.farley@arm.com>
6 years agoaarch32: PAR_ADDR_MASK should explicitly use BIT_64
Yann Gautier [Thu, 20 Sep 2018 13:48:52 +0000 (15:48 +0200)]
aarch32: PAR_ADDR_MASK should explicitly use BIT_64

PAR register used here is a 64 bit register.
On AARCH32 BIT macro is BIT_32.
PAR_ADDR_MASK should then use BIT_64 to avoid overflow.

Signed-off-by: Yann Gautier <yann.gautier@st.com>
6 years agoUser guide: Document ENABLE_SPM build flag
Sandrine Bailleux [Thu, 20 Sep 2018 10:44:39 +0000 (12:44 +0200)]
User guide: Document ENABLE_SPM build flag

Change-Id: Ib9a045200de4fcd00387b114cbbd006e46ad6a8b
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
6 years agoUser guide: Fix link to Linux master tree
Sandrine Bailleux [Thu, 20 Sep 2018 08:27:13 +0000 (10:27 +0200)]
User guide: Fix link to Linux master tree

Change-Id: Ia67a4786350c1c2ef55125cd6a318ae6d918c08e
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
6 years agoMerge pull request #1570 from Andre-ARM/allwinner/pmic-fixes
Soby Mathew [Wed, 19 Sep 2018 09:50:46 +0000 (10:50 +0100)]
Merge pull request #1570 from Andre-ARM/allwinner/pmic-fixes

Allwinner PMIC fixes

6 years agodrivers: i2c: mentor: move platform code into header files
Andre Przywara [Sun, 9 Sep 2018 00:39:57 +0000 (01:39 +0100)]
drivers: i2c: mentor: move platform code into header files

At the moment we have two I2C stub drivers (for the Allwinner and the
Marvell platform), which #include the actual .c driver file.
Change this into the more usual design, by renaming and moving the stub
drivers into platform specific header files and including these from the
actual driver file. The platform specific include directories make sure
the driver picks up the right header automatically.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
6 years agoMerge pull request #1577 from antonio-nino-diaz-arm/an/trusty
Soby Mathew [Tue, 18 Sep 2018 14:20:41 +0000 (15:20 +0100)]
Merge pull request #1577 from antonio-nino-diaz-arm/an/trusty

trusty: Fix return value of trusty_init()

6 years agoMerge pull request #1576 from antonio-nino-diaz-arm/an/fix-bl32-init
Soby Mathew [Tue, 18 Sep 2018 14:20:16 +0000 (15:20 +0100)]
Merge pull request #1576 from antonio-nino-diaz-arm/an/fix-bl32-init

BL31: Fix warning about BL32 init function

6 years agoMerge pull request #1575 from soby-mathew/sm/fix_cryptocell_mem
Soby Mathew [Tue, 18 Sep 2018 14:19:54 +0000 (15:19 +0100)]
Merge pull request #1575 from soby-mathew/sm/fix_cryptocell_mem

ARM platforms: Reintroduce coherent memory for BL1 and BL2

6 years agotrusty: Fix return value of trusty_init()
Antonio Nino Diaz [Tue, 18 Sep 2018 12:13:24 +0000 (13:13 +0100)]
trusty: Fix return value of trusty_init()

The value used to signal failure is 0. It is needed to return a different
value on success.

Change-Id: I2186aa7dfbfc825bfe7b3d5ae3c4de7af10ee44f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoARM platforms: Reintroduce coherent memory for BL1 and BL2
Soby Mathew [Tue, 18 Sep 2018 10:42:42 +0000 (11:42 +0100)]
ARM platforms: Reintroduce coherent memory for BL1 and BL2

The patch d323af9 removed the support for coherent memory in BL1 and
BL2 for ARM platforms. But the CryptoCell SBROM  integration depends
on use of coherent buffers for passing data from the AP CPU to the
CryptoCell. Hence this patch reintroduces support for coherent
memory in BL1 and BL2 if ARM_CRYPTOCELL_INTEG=1.

Change-Id: I011482dda7f7a3ec9e3e79bfb3f4fa03796f7e02
Signed-Off-by: Soby Mathew <soby.mathew@arm.com>
6 years agoBL31: Fix warning about BL32 init function
Antonio Nino Diaz [Tue, 18 Sep 2018 12:10:47 +0000 (13:10 +0100)]
BL31: Fix warning about BL32 init function

The expected value for failure is 0, so the warning only has to be shown
in that case. This is the way the TSPD has done it since it was
introduced, and the way SPM and OP-TEE do it.

Trusty wrongly returns 0 on success.

In the case of TLK, the return value of tlkd_init() is passed from the
secure world in register X1 when calling the SMC TLK_ENTRY_DONE.

Change-Id: I39106d67631ee57f109619f8830bf4b9d96155e6
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
6 years agoallwinner: sun50i_h6: initialise I2C just before powering down
Andre Przywara [Sat, 8 Sep 2018 23:38:58 +0000 (00:38 +0100)]
allwinner: sun50i_h6: initialise I2C just before powering down

Even though we initialise the platform part and the I2C controller
itself at boot time, we actually only access the bus on power down.
Meanwhile a rich OS might have configured the I2C pins differently or
even disabled the controller.
So repeat the platform setup and controller initialisation just before
we actually access the bus to power off the system. This is safe,
because at this point the rich OS should no longer be running.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
6 years agoallwinner: sun50i_h6: improve I2C setup
Andre Przywara [Sat, 8 Sep 2018 23:38:19 +0000 (00:38 +0100)]
allwinner: sun50i_h6: improve I2C setup

Drop the unnecessary check for the I2C pins being already configured as
I2C pins (we actually don't care).
Also avoid resetting *every* peripheral that is covered by the PRCM reset
controller, instead just clear the one line connected to the I2C controller.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
6 years agoMerge pull request #1572 from iq250vip/tf_log
Dimitris Papastamos [Wed, 12 Sep 2018 10:19:05 +0000 (11:19 +0100)]
Merge pull request #1572 from iq250vip/tf_log

Allow setting log level back to compile time value

6 years agoAllow setting log level back to compile time value
Junhan Zhou [Mon, 10 Sep 2018 20:36:06 +0000 (16:36 -0400)]
Allow setting log level back to compile time value

When using the tf_log_set_max_level() function, one can dynamically
set the log level to a value smaller than then compile time specified
one, but not equal. This means that when the log level have been
lowered, it can't be reset to the previous value. This commit modifies
this function to allow setting the log level back to the compile time
value.

Fixes ARM-software/tf-issues#624

Change-Id: Ib157715c8835982ce4977ba67a48e18ff23d5a61
Signed-off-by: Junhan Zhou <Junhan@mellanox.com>
6 years agoMerge pull request #1571 from jeenu-arm/deps
Dimitris Papastamos [Tue, 11 Sep 2018 13:46:04 +0000 (14:46 +0100)]
Merge pull request #1571 from jeenu-arm/deps

Update dependencies for ARM TF

6 years agoUpdate dependencies for ARM TF
David Cunado [Tue, 19 Dec 2017 16:33:25 +0000 (16:33 +0000)]
Update dependencies for ARM TF

- Linaro binaries:    18.04
- mbed TLS library:   2.12.0
- FVP model versions: 11.4 build 37

This patch updates the user guide documentation to reflect these
changes to the dependencies.

Change-Id: I454782ca43a0db43aeeef2ab3622f4dea9dfec55
Signed-off-by: Jeenu Viswambharan <jeenu.viswambharan@arm.com>
6 years agoMerge pull request #1569 from soby-mathew/sm/cov_fix_scmi
Soby Mathew [Mon, 10 Sep 2018 11:44:56 +0000 (12:44 +0100)]
Merge pull request #1569 from soby-mathew/sm/cov_fix_scmi

CSS: Fix overrun if system power level is not available

6 years agoMerge pull request #1568 from soby-mathew/sm/fix_ares_err_report
Soby Mathew [Mon, 10 Sep 2018 11:44:38 +0000 (12:44 +0100)]
Merge pull request #1568 from soby-mathew/sm/fix_ares_err_report

Fix the Cortex-ares errata reporting function name

6 years agoFix the Cortex-ares errata reporting function name
Soby Mathew [Mon, 10 Sep 2018 10:14:01 +0000 (11:14 +0100)]
Fix the Cortex-ares errata reporting function name

This patch fixes the name of the Cortex-ares errata function which was
previously named `cortex_a72_errata_report` which was an error.

Change-Id: Ia124df4628261021baa8d9a30308bc286d45712b
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
6 years agoCSS: Fix overrun if system power level is not available
Soby Mathew [Mon, 10 Sep 2018 10:32:49 +0000 (11:32 +0100)]
CSS: Fix overrun if system power level is not available

This patch fixes an array overrun in CSS scmi driver if the
system power domain level is less than 2. This was reported from
https://scan.coverity.com/projects/arm-software-arm-trusted-firmware

CID 308492

Change-Id: I3a59c700490816718d20c71141281f19b2b7e7f7
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
6 years agoMerge pull request #1555 from theopolis/tbb-hikey960
Soby Mathew [Mon, 10 Sep 2018 10:10:12 +0000 (11:10 +0100)]
Merge pull request #1555 from theopolis/tbb-hikey960

hikey960: Add development TBB support

6 years agoMerge pull request #1534 from Icenowy/sun50i_h6_pmic
Soby Mathew [Mon, 10 Sep 2018 10:06:16 +0000 (11:06 +0100)]
Merge pull request #1534 from Icenowy/sun50i_h6_pmic

Add support for Allwinner H6 + X-Powers AXP805 PMIC combination

6 years agohikey960: Add development TBB support
Teddy Reed [Mon, 3 Sep 2018 21:38:50 +0000 (17:38 -0400)]
hikey960: Add development TBB support

This patch adds experimental support for TBB to the HiKey960 board. To
build and test with TBB modify the uefi-tools project platforms.config

+ATF_BUILDFLAGS=TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 SAVE_KEYS=1 \
  MBEDTLS_DIR=./mbedtls

Signed-off-by: Teddy Reed <teddy@casualhacking.io>
6 years agoMerge pull request #1567 from jeenu-arm/ras-fix
Dimitris Papastamos [Sat, 8 Sep 2018 23:36:02 +0000 (00:36 +0100)]
Merge pull request #1567 from jeenu-arm/ras-fix

RAS: Fix assert condition

6 years agoRAS: Fix assert condition
Jeenu Viswambharan [Fri, 7 Sep 2018 15:30:58 +0000 (16:30 +0100)]
RAS: Fix assert condition

Change-Id: Ia02a2dbfd4e25547776e78bed40a91f3452553d7
Signed-off-by: Jeenu Viswambharan <jeenu.viswambharan@arm.com>
6 years agoMerge pull request #1566 from EvanLloyd/non_secure_uart
Soby Mathew [Fri, 7 Sep 2018 15:34:02 +0000 (16:34 +0100)]
Merge pull request #1566 from EvanLloyd/non_secure_uart

ARM Platforms:Enable non-secure access to UART1

6 years agoallwinner: implement system power down on H6 w/ AXP805
Icenowy Zheng [Sun, 22 Jul 2018 13:52:50 +0000 (21:52 +0800)]
allwinner: implement system power down on H6 w/ AXP805

The AXP805 PMIC used with H6 is capable of shutting down the system.

Add support for using it to shut down the system power.

The original placeholder power off code is moved to A64 code, as it's
still TODO to implement PMIC operations for A64.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
6 years agoallwinner: sun50i_h6: add initial AXP805 PMIC code
Icenowy Zheng [Sun, 22 Jul 2018 13:30:14 +0000 (21:30 +0800)]
allwinner: sun50i_h6: add initial AXP805 PMIC code

The OTT reference design of Allwinner H6 SoC uses an X-Powers AXP805
PMIC.

Add initial code for it.

Currently it's only detected.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
6 years agoMerge pull request #1565 from satheesbalya-arm/sb1_2332_fwu_sds_register
Dimitris Papastamos [Fri, 7 Sep 2018 15:01:03 +0000 (16:01 +0100)]
Merge pull request #1565 from satheesbalya-arm/sb1_2332_fwu_sds_register

juno: Revert FWU update detect mechanism

6 years agoallwinner: add I2C glue driver
Icenowy Zheng [Sun, 22 Jul 2018 13:29:02 +0000 (21:29 +0800)]
allwinner: add I2C glue driver

Allwinner 64-bit SoCs all use the Mentor Graphics MI2CV I2C controller
core, with inverted clear quirk.

Add a glue driver for this.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
6 years agodrivers: mentor: mi2cv: add inverted interrupt clear flag quirk
Icenowy Zheng [Sun, 22 Jul 2018 13:27:30 +0000 (21:27 +0800)]
drivers: mentor: mi2cv: add inverted interrupt clear flag quirk

The I2C controller on Allwinner SoCs after A31 has a inverted interrupt
clear flag, which needs to be written 1 (rather than 0 on Marvell SoCs
and old Allwinner SoCs) to clear.

Add such a quirk to mi2cv driver common code.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
6 years agoallwinner: call PMIC setup code
Icenowy Zheng [Sat, 21 Jul 2018 12:41:12 +0000 (20:41 +0800)]
allwinner: call PMIC setup code

As the ATF may need to do some power initialization on Allwinner
platform with AXP PMICs, call the PMIC setup code in BL31.

Stub of PMIC setup code is added, to prevent undefined reference.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
6 years agoMerge pull request #1563 from jts-arm/mbed
Dimitris Papastamos [Fri, 7 Sep 2018 14:05:54 +0000 (15:05 +0100)]
Merge pull request #1563 from jts-arm/mbed

Improvements to Mbed TLS shared heap code

6 years agoMerge pull request #1564 from jeenu-arm/sdei-suspend
Dimitris Papastamos [Fri, 7 Sep 2018 14:05:28 +0000 (15:05 +0100)]
Merge pull request #1564 from jeenu-arm/sdei-suspend

SDEI: Mask events after CPU wakeup