aboutsummaryrefslogtreecommitdiff
path: root/product/sgm775
diff options
context:
space:
mode:
authorChris Kay <chris.kay@arm.com>2020-07-29 22:44:16 +0100
committerjimqui01 <54316584+jimqui01@users.noreply.github.com>2020-09-08 11:37:54 +0100
commit77f68b5e3cf27a8dc70f8241c7cf6c0fc727ae24 (patch)
tree38966879953d155464786c03381b1fcc957729c7 /product/sgm775
parenta2ab9889bab9dbbd69fe6556ab4bc76a8c8d96e3 (diff)
fwk: Introduce input/output component
This change introduces the framework input/output (I/O) component, which enables low-level read and write operations to arbitrary entities. This component is available before the module runtime is available, and can therefore be used for debugging module initialization routines and console input/output (assuming an entity is available to handle it). For documentation on the I/O component, see `<fwk_io.h>`. This supplants much of the existing logging implementation, including the `log` module, though the public logging component interface remains largely the same. The "always-on backend"/"dynamic backend" concept has been removed as the logging component now uses the I/O component under the hood. See For documentation on the Log component, see `<fwk_log.h>`. Change-Id: I9cfcbe63220969b5a2f47333a89c8d1b287589ac Signed-off-by: Chris Kay <chris.kay@arm.com>
Diffstat (limited to 'product/sgm775')
-rw-r--r--product/sgm775/include/fmw_io.h17
-rw-r--r--product/sgm775/scp_ramfw/config_log.c21
-rw-r--r--product/sgm775/scp_ramfw/firmware.mk2
-rw-r--r--product/sgm775/scp_romfw/config_log.c21
-rw-r--r--product/sgm775/scp_romfw/firmware.mk4
5 files changed, 18 insertions, 47 deletions
diff --git a/product/sgm775/include/fmw_io.h b/product/sgm775/include/fmw_io.h
new file mode 100644
index 00000000..2650c1c2
--- /dev/null
+++ b/product/sgm775/include/fmw_io.h
@@ -0,0 +1,17 @@
+/*
+ * Arm SCP/MCP Software
+ * Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef FMW_IO_H
+#define FMW_IO_H
+
+#include <fwk_id.h>
+#include <fwk_module_idx.h>
+
+#define FMW_IO_STDIN_ID FWK_ID_ELEMENT(FWK_MODULE_IDX_PL011, 0)
+#define FMW_IO_STDOUT_ID FWK_ID_ELEMENT(FWK_MODULE_IDX_PL011, 0)
+
+#endif /* FMW_IO_H */
diff --git a/product/sgm775/scp_ramfw/config_log.c b/product/sgm775/scp_ramfw/config_log.c
deleted file mode 100644
index 01076d98..00000000
--- a/product/sgm775/scp_ramfw/config_log.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2017-2020, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <mod_log.h>
-
-#include <fwk_id.h>
-#include <fwk_module.h>
-#include <fwk_module_idx.h>
-
-static const struct mod_log_config log_data = {
- .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0),
- .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0),
-};
-
-struct fwk_module_config config_log = {
- .data = &log_data,
-};
diff --git a/product/sgm775/scp_ramfw/firmware.mk b/product/sgm775/scp_ramfw/firmware.mk
index 34cecf8a..c731d3c8 100644
--- a/product/sgm775/scp_ramfw/firmware.mk
+++ b/product/sgm775/scp_ramfw/firmware.mk
@@ -18,7 +18,6 @@ BS_FIRMWARE_MODULES := \
system_info \
pcid \
pl011 \
- log \
gtimer \
timer \
sgm775_ddr_phy500 \
@@ -55,7 +54,6 @@ endif
BS_FIRMWARE_SOURCES := \
rtx_config.c \
sgm775_core.c \
- config_log.c \
config_pl011.c\
config_timer.c \
config_sgm775_ddr_phy500.c \
diff --git a/product/sgm775/scp_romfw/config_log.c b/product/sgm775/scp_romfw/config_log.c
deleted file mode 100644
index 01076d98..00000000
--- a/product/sgm775/scp_romfw/config_log.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2017-2020, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <mod_log.h>
-
-#include <fwk_id.h>
-#include <fwk_module.h>
-#include <fwk_module_idx.h>
-
-static const struct mod_log_config log_data = {
- .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0),
- .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0),
-};
-
-struct fwk_module_config config_log = {
- .data = &log_data,
-};
diff --git a/product/sgm775/scp_romfw/firmware.mk b/product/sgm775/scp_romfw/firmware.mk
index 9e271f93..06471de2 100644
--- a/product/sgm775/scp_romfw/firmware.mk
+++ b/product/sgm775/scp_romfw/firmware.mk
@@ -19,7 +19,6 @@ BS_FIRMWARE_MODULES := sid \
ppu_v0 \
ppu_v1 \
pl011 \
- log \
gtimer \
msys_rom \
bootloader \
@@ -29,8 +28,7 @@ BS_FIRMWARE_MODULES := sid \
clock \
sds
-BS_FIRMWARE_SOURCES := config_log.c \
- config_pl011.c \
+BS_FIRMWARE_SOURCES := config_pl011.c \
config_timer.c \
config_msys_rom.c \
config_sds.c \