| Message ID | 20200817043431.28718-4-chee.hong.ang@intel.com |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Enable ARM Trusted Firmware for U-Boot | expand |
> -----Original Message----- > From: Ang, Chee Hong <chee.hong.ang@intel.com> > Sent: Monday, August 17, 2020 12:34 PM > To: u-boot@lists.denx.de > Cc: Marek Vasut <marex@denx.de>; Simon Goldschmidt > <simon.k.r.goldschmidt@gmail.com>; Tom Rini <trini@konsulko.com>; See, > Chin Liang <chin.liang.see@intel.com>; Tan, Ley Foon > <ley.foon.tan@intel.com>; Ang, Chee Hong <chee.hong.ang@intel.com>; > Chee, Tien Fong <tien.fong.chee@intel.com>; Lim, Elly Siew Chin > <elly.siew.chin.lim@intel.com> > Subject: [PATCH v1 03/16] arm: socfpga: Add function for checking > description from FIT image > > Add board_fit_config_name_match() for matching board name with device > tree files in FIT image. This will ensure correct DTB file is loaded for different > board type. Currently, we are not supporting multiple device tree files in FIT > image therefore this function basically do nothing for now. > Users are allowed to override this 'weak' function in their specific board > implementation. > > Signed-off-by: Chee Hong Ang <chee.hong.ang@intel.com> > --- > arch/arm/mach-socfpga/board.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach- > socfpga/board.c index 340abf9305..7993c27646 100644 > --- a/arch/arm/mach-socfpga/board.c > +++ b/arch/arm/mach-socfpga/board.c > @@ -13,7 +13,7 @@ > #include <asm/arch/clock_manager.h> > #include <asm/arch/misc.h> > #include <asm/io.h> > - > +#include <log.h> > #include <usb.h> > #include <usb/dwc2_udc.h> > > @@ -87,3 +87,13 @@ int g_dnl_board_usb_cable_connected(void) > return 1; > } > #endif > + > +#ifdef CONFIG_SPL_BUILD > +__weak int board_fit_config_name_match(const char *name) { > + /* Just empty function now - can't decide what to choose */ > + debug("%s: %s\n", __func__, name); > + > + return 0; > +} > +#endif Reviewed-by: Ley Foon Tan <ley.foon.tan@intel.com>
> -----Original Message----- > From: Ang, Chee Hong <chee.hong.ang@intel.com> > Sent: Monday, August 17, 2020 12:34 PM > To: u-boot@lists.denx.de > Cc: Marek Vasut <marex@denx.de>; Simon Goldschmidt > <simon.k.r.goldschmidt@gmail.com>; Tom Rini <trini@konsulko.com>; See, > Chin Liang <chin.liang.see@intel.com>; Tan, Ley Foon > <ley.foon.tan@intel.com>; Ang, Chee Hong <chee.hong.ang@intel.com>; > Chee, Tien Fong <tien.fong.chee@intel.com>; Lim, Elly Siew Chin > <elly.siew.chin.lim@intel.com> > Subject: [PATCH v1 03/16] arm: socfpga: Add function for checking > description from FIT image > > Add board_fit_config_name_match() for matching board name with device > tree files in FIT image. This will ensure correct DTB file is loaded for different > board type. Currently, we are not supporting multiple device tree files in FIT > image therefore this function basically do nothing for now. > Users are allowed to override this 'weak' function in their specific board > implementation. > > Signed-off-by: Chee Hong Ang <chee.hong.ang@intel.com> > --- > arch/arm/mach-socfpga/board.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach- > socfpga/board.c index 340abf9305..7993c27646 100644 > --- a/arch/arm/mach-socfpga/board.c > +++ b/arch/arm/mach-socfpga/board.c > @@ -13,7 +13,7 @@ > #include <asm/arch/clock_manager.h> > #include <asm/arch/misc.h> > #include <asm/io.h> > - > +#include <log.h> > #include <usb.h> > #include <usb/dwc2_udc.h> > > @@ -87,3 +87,13 @@ int g_dnl_board_usb_cable_connected(void) > return 1; > } > #endif > + > +#ifdef CONFIG_SPL_BUILD > +__weak int board_fit_config_name_match(const char *name) { > + /* Just empty function now - can't decide what to choose */ > + debug("%s: %s\n", __func__, name); > + > + return 0; > +} > +#endif Reviewed-by: Ley Foon Tan <ley.foon.tan@intel.com>
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c index 340abf9305..7993c27646 100644 --- a/arch/arm/mach-socfpga/board.c +++ b/arch/arm/mach-socfpga/board.c @@ -13,7 +13,7 @@ #include <asm/arch/clock_manager.h> #include <asm/arch/misc.h> #include <asm/io.h> - +#include <log.h> #include <usb.h> #include <usb/dwc2_udc.h> @@ -87,3 +87,13 @@ int g_dnl_board_usb_cable_connected(void) return 1; } #endif + +#ifdef CONFIG_SPL_BUILD +__weak int board_fit_config_name_match(const char *name) +{ + /* Just empty function now - can't decide what to choose */ + debug("%s: %s\n", __func__, name); + + return 0; +} +#endif
Add board_fit_config_name_match() for matching board name with device tree files in FIT image. This will ensure correct DTB file is loaded for different board type. Currently, we are not supporting multiple device tree files in FIT image therefore this function basically do nothing for now. Users are allowed to override this 'weak' function in their specific board implementation. Signed-off-by: Chee Hong Ang <chee.hong.ang@intel.com> --- arch/arm/mach-socfpga/board.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)