Merge pull request #1606 from satheesbalya-arm/sb1_2603_misra_plat ...

plat/arm: Fix misra warnings in platform code

Merge pull request #1622 from bryanodonoghue/master+imx7-mmc_fix ...

drivers: imx: mxc_usdhc: Do not set MMC_RSP_48 for MMC_RESPONSE_R2

Merge pull request #1624 from glneo/less-cache-flushing ...

PSCI cache flush and comment fixup

plat/arm: Fix misra warnings in platform code ...

Change-Id: Ica944acc474a099219d50b041cfaeabd4f3d362f
Signed-off-by: Sathees Balya <sathees.balya@arm.com>

Merge pull request #1625 from ldts/psci ...

psci: platform control of SYSTEM_SUSPEND entry

Merge pull request #1621 from jts-arm/typos ...

Various corrections of typos

Merge pull request #1619 from antonio-nino-diaz-arm/an/norflash ...

plat/arm: Move norflash driver to drivers/ folder

psci: platform control of SYSTEM_SUSPEND entry ...

Some platforms can only resume from system suspend from the boot
CPU, hence they should only enter that state from that same core.

The following commit presents an interface that allows the platform to
reject system suspend entry near its very last stage (last CPU).

Merge pull request #1620 from deepan02/deepak-arm/move-reset-to-bl31 ...

plat/arm: allow RESET_TO_BL31 for CSS-based platforms

PSCI: Do not flush cache when unneeded ...

When a platform enables its caches before it accesses the
psci_non_cpu_pd_nodes structure then explicit cache maintenance
is not needed.

Signed-off-by: Andrew F. Davis <afd@ti.com>

PSCI: Update comment on MMU disablement ...

The MMU is not disabled in this path, update the comment to
reflect this. Also clarify that both paths call prepare_cpu_pwr_dwn(),
but the second path does stack cache maintenance.

Signed-off-by: Andrew F. Davis <afd@ti.com>

Merge pull request #1614 from MISL-EBU-System-SW/integration-fix ...

Fix service CPU image load at BL2 stage and update maintainers list

Merge pull request #1612 from antonio-nino-diaz-arm/an/tools ...

tools: Make invocation of host compiler correct

Merge pull request #1607 from girishpathak/gp/346_sgm775_earlylog_fix_v2 ...

plat/arm/css/sgm: Reorder early platform init

Merge pull request #1489 from teknoraver/master ...

doimage: get rid of non null terminated strings by strncpy

drivers: imx: mxc_usdhc: Do not set MMC_RSP_48 for MMC_RESPONSE_R2 ...

commit 97d5db8 reverts an update to the
MMC layer that accompanied the original submission of this MMC driver this
is the right-thing-to-do in terms of the MMC spec.

Unfortunately the reversion also breaks this driver. The issue is the i.MX
controller doesn't want MMC_RSP_48 set for MMC_RESPONSE_R2.

The appropriate place to place that constraint is obviously in
drivers/imx/usdhc/imx_usdhc.c not in the shared MMC codebase. This patch
restores the logic the i.MX controller requires without breaking it for
everyone else.

Fixes: 97d5db8
Fixes: 2a82a9c

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Jun Nie <jun.nie@linaro.org>

Fix typos in changelog ...

Change-Id: Icc6fb03abb9b4ef85931b9e3d767b5a9c271b5f3
Signed-off-by: John Tsichritzis <john.tsichritzis@arm.com>

docs: Clarify usage of LOG_LEVEL ...

Change-Id: I1ce771a155e6e83885a00d2f05591bf98cd69854
Signed-off-by: John Tsichritzis <john.tsichritzis@arm.com>

Replace S-EL3 references by EL3 ...

The "Secure" prefix (S-ELx) is valid only for S-EL0 and S-EL1 but is
meaningless for EL3, since EL3 is always secure. Hence, the "S" prefix
has been removed from wherever it was used as "S-EL3".

Change-Id: Icdeac9506d763f9f83d7297c7113aec7b85e9dbe
Signed-off-by: John Tsichritzis <john.tsichritzis@arm.com>

Reorder log level macro definitions for clarity ...

The definitions of the logging macros are reordered to be consistent
with the definitions of the log levels.

Change-Id: I6ff07b93eb64786ff147d39014d1c8e15db28444
Signed-off-by: John Tsichritzis <john.tsichritzis@arm.com>

plat/arm/css/sgm: Reorder early platform init ...

In the function, bl1_early_platform_setup in the file
plat/arm/css/sgm/sgm_bl1_setup.c:

  plat_config_init();

  arm_bl1_early_platform_setup();

The debug messages logged by plat_config_init() are lost because
the console is initialized in the function
arm_bl1_early_platform_setup()

To see the logs of plat_config_init, this fix re-orders above calls
so that the console is initialized before call to plat_config_init.

Change-Id: I2e98f1f67c591cca24e28905acd0838ea3697a7c
Signed-off-by: Girish Pathak <girish.pathak@arm.com>

Merge pull request #1618 from satheesbalya-arm/sb1_2601_misra_smc_pwr ...

Fix misra warnings in SMC and power mgmt code

plat/arm: Move norflash driver to drivers/ folder ...

This way it can be reused by other platforms if needed.

Note that this driver is designed to work with the Versatile Express NOR
flash of Juno and FVP. In said platforms, the memory is organized as an
interleaved memory of two chips with a 16 bit word.

Any platform that wishes to reuse it with a different configuration will
need to modify the driver so that it is more generic.

Change-Id: Ic721758425864e0cf42b7b9b04bf0d9513b6022e
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

plat/arm: allow RESET_TO_BL31 for CSS-based platforms ...

This lets any future CSS platforms to use RESET_TO_BL31 flag.

Change-Id: I32a90fce43cb0c6f4d33589653a0fd6a7ecc9577
Signed-off-by: Deepak Pandey <Deepak.Pandey@arm.com>

Fix misra warnings in SMC and power mgmt code ...

Change-Id: Ia00eba2b18804e6498d935d33ec104953e0e5e03
Signed-off-by: Sathees Balya <sathees.balya@arm.com>

Merge pull request #1617 from antonio-nino-diaz-arm/an/bugfix ...

xlat: Fix checks in mmap_add() and mmap_add_ctx()

xlat: Fix checks in mmap_add() and mmap_add_ctx() ...

Commit 79621f0 broke sgi575.

It is possible to have a region with 0 as value for the attributes. It
means device memory, read only, secure, executable. This is legitimate
if the code is in flash and the code is executed from there.

This is the case for SGI_MAP_FLASH0_RO, defined in the file
plat/arm/css/sgi/sgi_plat.c.

This problem is solved by checking both size and attributes in xlat v1.
In xlat v2, it is enough to check the granularity, as it can never be 0.

Change-Id: I7be11f1b0e51c4c2ffd560b4a6cdfbf15de2c276
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

plat: marvell: invoke platform specific scp_bl2 image handler ...

Before switching to new API the scp_bl2 handler was invoked from
bl2/bl2_image_load.c which was removed. Invoke the platform specific
scp_bl2 handler in analogy to ARM and HiSilicon.

Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>

add Marvell tools to maintained sources list ...

Declate Marvell's ownership on tools/doimage

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>

Merge pull request #1611 from antonio-nino-diaz-arm/an/misra-common ...

Remove some MISRA defects in common code