summaryrefslogtreecommitdiff
path: root/src/soc/cavium/common
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2018-04-20 14:43:21 +0200
committerPatrick Georgi <pgeorgi@google.com>2018-07-30 18:47:26 +0000
commit5cdaa3305ec928f07fb8e55531d7082aeaecbeb9 (patch)
tree30a4e4f73a71daaae58e14c21e5710708f63795c /src/soc/cavium/common
parente15556ed3ae859acbdfcd5a4ab175dba8b359c4e (diff)
soc/cavium/cn81xx: Use ATF from blobs repo
Use precompiled BL31 from blobs repo. There's no check for USE_BLOBS here as the included file is "free": The BL31 is Open-Source and licensed under BSD. Change-Id: I7e9eb429d11150d43aa070d1bd6a11ea71951ce3 Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/25751 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Diffstat (limited to 'src/soc/cavium/common')
-rw-r--r--src/soc/cavium/common/Kconfig3
-rw-r--r--src/soc/cavium/common/Makefile.inc1
-rw-r--r--src/soc/cavium/common/bl31_plat_params.c32
-rw-r--r--src/soc/cavium/common/include/soc/bl31_plat_params.h25
4 files changed, 1 insertions, 60 deletions
diff --git a/src/soc/cavium/common/Kconfig b/src/soc/cavium/common/Kconfig
index 1161ac2263..f7921dc94c 100644
--- a/src/soc/cavium/common/Kconfig
+++ b/src/soc/cavium/common/Kconfig
@@ -4,8 +4,7 @@ config SOC_CAVIUM_COMMON
select BOOTBLOCK_CUSTOM
select CAVIUM_BDK
select FLATTENED_DEVICE_TREE
-# FIXME: No Cavium support in ATF
-# select ARM64_USE_ARM_TRUSTED_FIRMWARE
+ select ARM64_USE_ARM_TRUSTED_FIRMWARE
if SOC_CAVIUM_COMMON
diff --git a/src/soc/cavium/common/Makefile.inc b/src/soc/cavium/common/Makefile.inc
index 4d9854186d..7af8bf58ef 100644
--- a/src/soc/cavium/common/Makefile.inc
+++ b/src/soc/cavium/common/Makefile.inc
@@ -29,7 +29,6 @@ romstage-y += bdk-coreboot.c
# ramstage
ramstage-y += cbmem.c
-ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += bl31_plat_params.c
CPPFLAGS_common += -Isrc/soc/cavium/common/include
diff --git a/src/soc/cavium/common/bl31_plat_params.c b/src/soc/cavium/common/bl31_plat_params.c
deleted file mode 100644
index 583eac8059..0000000000
--- a/src/soc/cavium/common/bl31_plat_params.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2016 Rockchip Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#include <arm_tf.h>
-#include <assert.h>
-#include <soc/bl31_plat_params.h>
-
-static struct bl31_plat_param *plat_params;
-
-void register_bl31_param(struct bl31_plat_param *param)
-{
- param->next = plat_params;
- plat_params = param;
-}
-
-void *soc_get_bl31_plat_params(bl31_params_t *bl31_params)
-{
- return plat_params;
-}
diff --git a/src/soc/cavium/common/include/soc/bl31_plat_params.h b/src/soc/cavium/common/include/soc/bl31_plat_params.h
deleted file mode 100644
index 3407e90c07..0000000000
--- a/src/soc/cavium/common/include/soc/bl31_plat_params.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2016 Rockchip Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef __BL31_PLAT_PARAMS_H__
-#define __BL31_PLAT_PARAMS_H__
-
-// FIXME: use correct path one ATF is upstream
-#include <arm-trusted-firmware/plat/rockchip/common/include/plat_params.h>
-
-void register_bl31_param(struct bl31_plat_param *param);
-
-#endif/* __BL31_PLAT_PARAMS_H__ */