marvell: armada: add extra level in marvell platform hierarchy
This commit is a preparation for upcoming support for OcteonTX and OcteonTX2 product families. Armada platform related files (docs, plat, include/plat) are moved to the new "armada" sub-folder. Change-Id: Icf03356187078ad6a2e56c9870992be3ca4c9655 Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
This commit is contained in:
parent
967a6d162d
commit
a28471722a
|
@ -84,7 +84,7 @@ There are several build options:
|
||||||
- BLE_PATH
|
- BLE_PATH
|
||||||
|
|
||||||
Points to BLE (Binary ROM extension) sources folder. Only required for A8K builds.
|
Points to BLE (Binary ROM extension) sources folder. Only required for A8K builds.
|
||||||
The parameter is optional, its default value is ``plat/marvell/a8k/common/ble``.
|
The parameter is optional, its default value is ``plat/marvell/armada/a8k/common/ble``.
|
||||||
|
|
||||||
- MV_DDR_PATH
|
- MV_DDR_PATH
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@ Special Build Flags
|
||||||
In order to build UART recovery image this operation should be disabled for
|
In order to build UART recovery image this operation should be disabled for
|
||||||
a70x0 and a80x0 because of hardware limitation (boot from secondary image
|
a70x0 and a80x0 because of hardware limitation (boot from secondary image
|
||||||
can interrupt UART recovery process). This MACRO definition is set in
|
can interrupt UART recovery process). This MACRO definition is set in
|
||||||
``plat/marvell/a8k/common/include/platform_def.h`` file.
|
``plat/marvell/armada/a8k/common/include/platform_def.h`` file.
|
||||||
|
|
||||||
For more information about build options, please refer to the
|
For more information about build options, please refer to the
|
||||||
:ref:`Build Options` document.
|
:ref:`Build Options` document.
|
|
@ -8,13 +8,13 @@ SoC being used is already supported in TF-A.
|
||||||
Source Code Structure
|
Source Code Structure
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
- The customer platform specific code shall reside under ``plat/marvell/<soc family>/<soc>_cust``
|
- The customer platform specific code shall reside under ``plat/marvell/armada/<soc family>/<soc>_cust``
|
||||||
(e.g. 'plat/marvell/a8k/a7040_cust').
|
(e.g. 'plat/marvell/armada/a8k/a7040_cust').
|
||||||
- The platform name for build purposes is called ``<soc>_cust`` (e.g. ``a7040_cust``).
|
- The platform name for build purposes is called ``<soc>_cust`` (e.g. ``a7040_cust``).
|
||||||
- The build system will reuse all files from within the soc directory, and take only the porting
|
- The build system will reuse all files from within the soc directory, and take only the porting
|
||||||
files from the customer platform directory.
|
files from the customer platform directory.
|
||||||
|
|
||||||
Files that require porting are located at ``plat/marvell/<soc family>/<soc>_cust`` directory.
|
Files that require porting are located at ``plat/marvell/armada/<soc family>/<soc>_cust`` directory.
|
||||||
|
|
||||||
|
|
||||||
Armada-70x0/Armada-80x0 Porting
|
Armada-70x0/Armada-80x0 Porting
|
||||||
|
@ -64,7 +64,7 @@ boot loader recovery (marvell_plat_config.c)
|
||||||
- Example:
|
- Example:
|
||||||
|
|
||||||
In A7040-DB specific implementation
|
In A7040-DB specific implementation
|
||||||
(``plat/marvell/a8k/a70x0/board/marvell_plat_config.c``), the image skip is
|
(``plat/marvell/armada/a8k/a70x0/board/marvell_plat_config.c``), the image skip is
|
||||||
implemented using GPIO: mpp 33 (SW5).
|
implemented using GPIO: mpp 33 (SW5).
|
||||||
|
|
||||||
Before resetting the board make sure there is a valid image on the next flash
|
Before resetting the board make sure there is a valid image on the next flash
|
||||||
|
@ -91,7 +91,7 @@ The BLE and consequently, the DDR init code is executed at the early stage of
|
||||||
the boot process.
|
the boot process.
|
||||||
|
|
||||||
Each supported platform of the TF-A has its own DDR porting file called
|
Each supported platform of the TF-A has its own DDR porting file called
|
||||||
dram_port.c located at ``atf/plat/marvell/a8k/<platform>/board`` directory.
|
dram_port.c located at ``atf/plat/marvell/armada/a8k/<platform>/board`` directory.
|
||||||
|
|
||||||
Please refer to '<path_to_mv_ddr_sources>/doc/porting_guide.txt' for detailed
|
Please refer to '<path_to_mv_ddr_sources>/doc/porting_guide.txt' for detailed
|
||||||
porting description.
|
porting description.
|
||||||
|
@ -128,7 +128,7 @@ Comphy Porting (phy-porting-layer.h or phy-default-porting-layer.h)
|
||||||
The porting layer for PHY was introduced in TF-A. There is one file
|
The porting layer for PHY was introduced in TF-A. There is one file
|
||||||
``drivers/marvell/comphy/phy-default-porting-layer.h`` which contains the
|
``drivers/marvell/comphy/phy-default-porting-layer.h`` which contains the
|
||||||
defaults. Those default parameters are used only if there is no appropriate
|
defaults. Those default parameters are used only if there is no appropriate
|
||||||
phy-porting-layer.h file under: ``plat/marvell/<soc
|
phy-porting-layer.h file under: ``plat/marvell/armada/<soc
|
||||||
family>/<platform>/board/phy-porting-layer.h``. If the phy-porting-layer.h
|
family>/<platform>/board/phy-porting-layer.h``. If the phy-porting-layer.h
|
||||||
exists, the phy-default-porting-layer.h is not going to be included.
|
exists, the phy-default-porting-layer.h is not going to be included.
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@ Comphy Porting (phy-porting-layer.h or phy-default-porting-layer.h)
|
||||||
The easiest way to prepare the PHY porting layer for custom board is to copy
|
The easiest way to prepare the PHY porting layer for custom board is to copy
|
||||||
existing example to a new platform:
|
existing example to a new platform:
|
||||||
|
|
||||||
- cp ``plat/marvell/a8k/a80x0/board/phy-porting-layer.h`` "plat/marvell/<soc family>/<platform>/board/phy-porting-layer.h"
|
- cp ``plat/marvell/armada/a8k/a80x0/board/phy-porting-layer.h`` "plat/marvell/armada/<soc family>/<platform>/board/phy-porting-layer.h"
|
||||||
- adjust relevant parameters or
|
- adjust relevant parameters or
|
||||||
- if different comphy index is used for specific feature, move it to proper table entry and then adjust.
|
- if different comphy index is used for specific feature, move it to proper table entry and then adjust.
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ Comphy Porting (phy-porting-layer.h or phy-default-porting-layer.h)
|
||||||
|
|
||||||
- Example:
|
- Example:
|
||||||
Example porting layer for armada-8040-db is under:
|
Example porting layer for armada-8040-db is under:
|
||||||
``plat/marvell/a8k/a80x0/board/phy-porting-layer.h``
|
``plat/marvell/armada/a8k/a80x0/board/phy-porting-layer.h``
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
If there is no PHY porting layer for new platform (missing
|
If there is no PHY porting layer for new platform (missing
|
|
@ -5,10 +5,10 @@ Marvell
|
||||||
:maxdepth: 1
|
:maxdepth: 1
|
||||||
:caption: Contents
|
:caption: Contents
|
||||||
|
|
||||||
build
|
armada/build
|
||||||
porting
|
armada/porting
|
||||||
misc/mvebu-a8k-addr-map
|
armada/misc/mvebu-a8k-addr-map
|
||||||
misc/mvebu-amb
|
armada/misc/mvebu-amb
|
||||||
misc/mvebu-ccu
|
armada/misc/mvebu-ccu
|
||||||
misc/mvebu-io-win
|
armada/misc/mvebu-io-win
|
||||||
misc/mvebu-iob
|
armada/misc/mvebu-iob
|
||||||
|
|
|
@ -2236,7 +2236,7 @@ int mvebu_cp110_comphy_xfi_rx_training(uint64_t comphy_base,
|
||||||
|
|
||||||
printf("########################################################\n");
|
printf("########################################################\n");
|
||||||
printf("# To use trained values update the ATF sources:\n");
|
printf("# To use trained values update the ATF sources:\n");
|
||||||
printf("# plat/marvell/a8k/<board_type>/board/phy-porting-layer.h ");
|
printf("# plat/marvell/armada/a8k/<board_type>/board/phy-porting-layer.h ");
|
||||||
printf("file\n# with new values as below (for appropriate AP nr %d",
|
printf("file\n# with new values as below (for appropriate AP nr %d",
|
||||||
ap_nr);
|
ap_nr);
|
||||||
printf("and CP nr: %d comphy_index %d\n\n",
|
printf("and CP nr: %d comphy_index %d\n\n",
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
/* Those are parameters for xfi mode, which need to be tune for each board type.
|
/* Those are parameters for xfi mode, which need to be tune for each board type.
|
||||||
* For known DB boards the parameters was already calibrated and placed under
|
* For known DB boards the parameters was already calibrated and placed under
|
||||||
* the plat/marvell/a8k/<board_type>/board/phy-porting-layer.h
|
* the plat/marvell/armada/a8k/<board_type>/board/phy-porting-layer.h
|
||||||
*/
|
*/
|
||||||
struct xfi_params {
|
struct xfi_params {
|
||||||
uint8_t g1_ffe_res_sel;
|
uint8_t g1_ffe_res_sel;
|
||||||
|
|
|
@ -5,6 +5,6 @@
|
||||||
# https://spdx.org/licenses
|
# https://spdx.org/licenses
|
||||||
#
|
#
|
||||||
|
|
||||||
include plat/marvell/a3700/common/a3700_common.mk
|
include plat/marvell/armada/a3700/common/a3700_common.mk
|
||||||
|
|
||||||
include plat/marvell/common/marvell_common.mk
|
include plat/marvell/armada/common/marvell_common.mk
|
|
@ -5,8 +5,8 @@
|
||||||
# https://spdx.org/licenses
|
# https://spdx.org/licenses
|
||||||
#
|
#
|
||||||
|
|
||||||
MARVELL_PLAT_BASE := plat/marvell
|
MARVELL_PLAT_BASE := plat/marvell/armada
|
||||||
MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell
|
MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell/armada
|
||||||
PLAT_FAMILY := a3700
|
PLAT_FAMILY := a3700
|
||||||
PLAT_FAMILY_BASE := $(MARVELL_PLAT_BASE)/$(PLAT_FAMILY)
|
PLAT_FAMILY_BASE := $(MARVELL_PLAT_BASE)/$(PLAT_FAMILY)
|
||||||
PLAT_INCLUDE_BASE := $(MARVELL_PLAT_INCLUDE_BASE)/$(PLAT_FAMILY)
|
PLAT_INCLUDE_BASE := $(MARVELL_PLAT_INCLUDE_BASE)/$(PLAT_FAMILY)
|
||||||
|
@ -15,7 +15,7 @@ MARVELL_DRV_BASE := drivers/marvell
|
||||||
MARVELL_COMMON_BASE := $(MARVELL_PLAT_BASE)/common
|
MARVELL_COMMON_BASE := $(MARVELL_PLAT_BASE)/common
|
||||||
HANDLE_EA_EL3_FIRST := 1
|
HANDLE_EA_EL3_FIRST := 1
|
||||||
|
|
||||||
include $(MARVELL_PLAT_BASE)/marvell.mk
|
include plat/marvell/marvell.mk
|
||||||
|
|
||||||
#*********** A3700 *************
|
#*********** A3700 *************
|
||||||
DOIMAGEPATH := $(WTP)
|
DOIMAGEPATH := $(WTP)
|
|
@ -14,6 +14,6 @@ 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
|
include plat/marvell/armada/a8k/common/a8k_common.mk
|
||||||
|
|
||||||
include plat/marvell/common/marvell_common.mk
|
include plat/marvell/armada/common/marvell_common.mk
|
|
@ -14,6 +14,6 @@ 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
|
include plat/marvell/armada/a8k/common/a8k_common.mk
|
||||||
|
|
||||||
include plat/marvell/common/marvell_common.mk
|
include plat/marvell/armada/common/marvell_common.mk
|
|
@ -14,7 +14,7 @@ DOIMAGE_SEC := tools/doimage/secure/sec_img_8K.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
|
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_INCLUDES += -Iplat/marvell/a8k/a80x0/board
|
PLAT_INCLUDES += -Iplat/marvell/armada/a8k/a80x0/board
|
|
@ -14,6 +14,6 @@ DOIMAGE_SEC := tools/doimage/secure/sec_img_8K.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
|
include plat/marvell/armada/a8k/common/a8k_common.mk
|
||||||
|
|
||||||
include plat/marvell/common/marvell_common.mk
|
include plat/marvell/armada/common/marvell_common.mk
|
|
@ -7,11 +7,11 @@
|
||||||
include tools/marvell/doimage/doimage.mk
|
include tools/marvell/doimage/doimage.mk
|
||||||
|
|
||||||
PLAT_FAMILY := a8k
|
PLAT_FAMILY := a8k
|
||||||
PLAT_FAMILY_BASE := plat/marvell/$(PLAT_FAMILY)
|
PLAT_FAMILY_BASE := plat/marvell/armada/$(PLAT_FAMILY)
|
||||||
PLAT_INCLUDE_BASE := include/plat/marvell/$(PLAT_FAMILY)
|
PLAT_INCLUDE_BASE := include/plat/marvell/armada/$(PLAT_FAMILY)
|
||||||
PLAT_COMMON_BASE := $(PLAT_FAMILY_BASE)/common
|
PLAT_COMMON_BASE := $(PLAT_FAMILY_BASE)/common
|
||||||
MARVELL_DRV_BASE := drivers/marvell
|
MARVELL_DRV_BASE := drivers/marvell
|
||||||
MARVELL_COMMON_BASE := plat/marvell/common
|
MARVELL_COMMON_BASE := plat/marvell/armada/common
|
||||||
|
|
||||||
MARVELL_SVC_TEST := 0
|
MARVELL_SVC_TEST := 0
|
||||||
$(eval $(call add_define,MARVELL_SVC_TEST))
|
$(eval $(call add_define,MARVELL_SVC_TEST))
|
|
@ -8,7 +8,7 @@ MV_DDR_PATH ?= drivers/marvell/mv_ddr
|
||||||
MV_DDR_LIB = $(CURDIR)/$(BUILD_PLAT)/ble/mv_ddr_lib.a
|
MV_DDR_LIB = $(CURDIR)/$(BUILD_PLAT)/ble/mv_ddr_lib.a
|
||||||
LIBC_LIB = $(CURDIR)/$(BUILD_PLAT)/lib/libc.a
|
LIBC_LIB = $(CURDIR)/$(BUILD_PLAT)/lib/libc.a
|
||||||
BLE_LIBS = $(MV_DDR_LIB) $(LIBC_LIB)
|
BLE_LIBS = $(MV_DDR_LIB) $(LIBC_LIB)
|
||||||
PLAT_MARVELL = plat/marvell
|
PLAT_MARVELL = plat/marvell/armada
|
||||||
|
|
||||||
BLE_SOURCES += $(BLE_PATH)/ble_main.c \
|
BLE_SOURCES += $(BLE_PATH)/ble_main.c \
|
||||||
$(BLE_PATH)/ble_mem.S \
|
$(BLE_PATH)/ble_mem.S \
|
|
@ -5,7 +5,7 @@
|
||||||
# https://spdx.org/licenses
|
# https://spdx.org/licenses
|
||||||
#
|
#
|
||||||
|
|
||||||
PLAT_MARVELL := plat/marvell
|
PLAT_MARVELL := plat/marvell/armada
|
||||||
A8K_MSS_SOURCE := $(PLAT_MARVELL)/a8k/common/mss
|
A8K_MSS_SOURCE := $(PLAT_MARVELL)/a8k/common/mss
|
||||||
|
|
||||||
BL2_SOURCES += $(A8K_MSS_SOURCE)/mss_bl2_setup.c \
|
BL2_SOURCES += $(A8K_MSS_SOURCE)/mss_bl2_setup.c \
|
|
@ -3,11 +3,11 @@
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
# SPDX-License-Identifier: BSD-3-Clause
|
||||||
# https://spdx.org/licenses
|
# https://spdx.org/licenses
|
||||||
|
|
||||||
MARVELL_PLAT_BASE := plat/marvell
|
MARVELL_PLAT_BASE := plat/marvell/armada
|
||||||
MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell
|
MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell/armada
|
||||||
|
|
||||||
include $(MARVELL_PLAT_BASE)/version.mk
|
include plat/marvell/version.mk
|
||||||
include $(MARVELL_PLAT_BASE)/marvell.mk
|
include plat/marvell/marvell.mk
|
||||||
|
|
||||||
VERSION_STRING +=(Marvell-${SUBVERSION})
|
VERSION_STRING +=(Marvell-${SUBVERSION})
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue