diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-03-31 14:21:59 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-03-31 16:08:21 +0900 |
| commit | c452ba159c148de0760624896406bf0ab0604b95 (patch) | |
| tree | 4bb159002b51114aff3c8d0a80ecd57aca91ce7f | |
| parent | 85ee795ca286a5a07a215902cc8d39a92c845637 (diff) | |
| download | platform_external_arm-trusted-firmware-c452ba159c148de0760624896406bf0ab0604b95.tar.gz platform_external_arm-trusted-firmware-c452ba159c148de0760624896406bf0ab0604b95.tar.bz2 platform_external_arm-trusted-firmware-c452ba159c148de0760624896406bf0ab0604b95.zip | |
fconf: exclude fconf_dyn_cfg_getter.c from BL1_SOURCES
fconf_dyn_cfg_getter.c calls FCONF_REGISTER_POPULATOR(), which populates
the fconf_populator structure.
However, bl1/bl1.ld.S does not have:
__FCONF_POPULATOR_START__ = .;
KEEP(*(.fconf_populator))
__FCONF_POPULATOR_END__ = .;
So, this is not linked to bl1.elf
We could change either bl1/bl1.lds.S or lib/fconf/fconf.mk to make
them consistent.
I chose to fix up fconf.mk to keep the current behavior.
This is a groundwork to factor out the common code from linker scripts.
Change-Id: I07b7ad4db4ec77b57acf1588fffd0b06306d7293
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | lib/fconf/fconf.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/fconf/fconf.mk b/lib/fconf/fconf.mk index 703196949..c087102d7 100644 --- a/lib/fconf/fconf.mk +++ b/lib/fconf/fconf.mk @@ -5,8 +5,8 @@ # # Add Firmware Configuration files -FCONF_SOURCES := lib/fconf/fconf.c \ - lib/fconf/fconf_dyn_cfg_getter.c +FCONF_SOURCES := lib/fconf/fconf.c +FCONF_DYN_SOURCES := lib/fconf/fconf_dyn_cfg_getter.c BL1_SOURCES += ${FCONF_SOURCES} -BL2_SOURCES += ${FCONF_SOURCES} +BL2_SOURCES += ${FCONF_SOURCES} ${FCONF_DYN_SOURCES} |