Skip to content

GitLab

Commit 9935047b authored by Manish Pandey's avatar Manish Pandey Committed by TrustedFirmware Code Review
Browse files

Merge changes I80316689,I23cac4fb,If911e7de,I169ff358,I4e040cd5, ... into integration 

* changes:
  ddr: a80x0: add DDR 32-bit ECC mode support
  ble: ap807: improve PLL configuration sequence
  ble: ap807: clean-up PLL configuration sequence
  ddr: a80x0: add DDR 32-bit mode support
  plat: marvell: mci: perform mci link tuning for all mci interfaces
  plat: marvell: mci: use more meaningful name for mci link tuning
  plat: marvell: a8k: remove wrong or unnecessary comments
  plat: marvell: ap807: enable snoop filter for ap807
  plat: marvell: ap807: update configuration space of each CP
  plat: marvell: ap807: use correct address for MCIx4 register
  plat: marvell: add support for PLL 2.2GHz mode
  plat: marvell: armada: make a8k_common.mk and mss_common.mk more generic
  marvell: armada: add extra level in marvell platform hierarchy
parents a53e89bc 32b3b999
Show whitespace changes
Inline Side-by-side
plat/marvell/a8k/a70x0/platform.mk → plat/marvell/armada/a8k/a70x0/platform.mk
View file @ 9935047b
...@@ -14,6 +14,7 @@ DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg ...@@ -14,6 +14,7 @@ DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg
MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
include plat/marvell/a8k/common/a8k_common.mk BOARD_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))
include plat/marvell/armada/a8k/common/a8k_common.mk
include plat/marvell/common/marvell_common.mk include plat/marvell/armada/common/marvell_common.mk
plat/marvell/a8k/a70x0_amc/platform.mk → plat/marvell/armada/a8k/a70x0_amc/platform.mk
View file @ 9935047b
...@@ -14,6 +14,7 @@ DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg ...@@ -14,6 +14,7 @@ DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg
MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
include plat/marvell/a8k/common/a8k_common.mk BOARD_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))
include plat/marvell/armada/a8k/common/a8k_common.mk
include plat/marvell/common/marvell_common.mk include plat/marvell/armada/common/marvell_common.mk
plat/marvell/a8k/a80x0/board/dram_port.c → plat/marvell/armada/a8k/a80x0/board/dram_port.c
View file @ 9935047b
...@@ -52,7 +52,11 @@ static struct mv_ddr_topology_map board_topology_map = { ...@@ -52,7 +52,11 @@ static struct mv_ddr_topology_map board_topology_map = {
MV_DDR_FREQ_SAR, /* frequency */ MV_DDR_FREQ_SAR, /* frequency */
0, 0, /* cas_l, cas_wl */ 0, 0, /* cas_l, cas_wl */
MV_DDR_TEMP_LOW} }, /* temperature */ MV_DDR_TEMP_LOW} }, /* temperature */
#if DDR32
MV_DDR_32BIT_ECC_PUP8_BUS_MASK, /* subphys mask */
#else
MV_DDR_64BIT_ECC_PUP8_BUS_MASK, /* subphys mask */ MV_DDR_64BIT_ECC_PUP8_BUS_MASK, /* subphys mask */
#endif
MV_DDR_CFG_SPD, /* ddr configuration data source */ MV_DDR_CFG_SPD, /* ddr configuration data source */
{ {0} }, /* raw spd data */ { {0} }, /* raw spd data */
{0}, /* timing parameters */ {0}, /* timing parameters */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment