Skip to contentSkip to conversation

cmd:spl:fix: Prevent from a build error on boards, which don't support FDT

PATCH New Lukasz Majewski 3 participants 3 messages Dec 6, 2012 – Dec 12, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmd:spl:fix: Prevent from a build error on boards, which don't support FDT

Do not compile in FDT related code, when it is not supported.

---
 common/cmd_spl.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
common/cmd_spl.c +2 -0
index 9ec054a..e3c543b 100644
@@ -130,10 +130,12 @@ static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		if (call_bootm(argc, argv, subcmd_list[(int)c->cmd]))
 			return -1;
 		switch ((int)c->cmd) {
+#ifdef CONFIG_OF_LIBFDT
 		case SPL_EXPORT_FDT:
 			printf("Argument image is now in RAM: 0x%p\n",
 				(void *)images.ft_addr);
 			break;
+#endif
 		case SPL_EXPORT_ATAGS:
 			printf("Argument image is now in RAM at: 0x%p\n",
 				(void *)gd->bd->bi_boot_params);
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 1/1 cmd:spl:fix: Prevent from a build error on boards, which don't support FDT

Quoted 16 lines · Lukasz Majewski

Do not compile in FDT related code, when it is not supported.

---
 common/cmd_spl.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
common/cmd_spl.c +0 -0
index 9ec054a..e3c543b 100644
@@ -130,10 +130,12 @@ static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		if (call_bootm(argc, argv, subcmd_list[(int)c->cmd]))
 			return -1;

common/cmd_spl.c static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 141

Quoted 10 lines
common/cmd_spl.c +2 -0
 		switch ((int)c->cmd) {
+#ifdef CONFIG_OF_LIBFDT
 		case SPL_EXPORT_FDT:
 			printf("Argument image is now in RAM: 0x%p\n",
 				(void *)images.ft_addr);
 			break;
+#endif
 		case SPL_EXPORT_ATAGS:
 			printf("Argument image is now in RAM at: 0x%p\n",
 				(void *)gd->bd->bi_boot_params);

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#2 lore raw

PATCH 1/1 cmd:spl:fix: Prevent from a build error on boards, which don't support FDT

Quoted 21 lines · Stefano Babic
Quoted 20 lines · Lukasz Majewski

Do not compile in FDT related code, when it is not supported.

---
 common/cmd_spl.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
common/cmd_spl.c +1 -0
index 9ec054a..e3c543b 100644
@@ -130,10 +130,12 @@ static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		if (call_bootm(argc, argv, subcmd_list[(int)c->cmd]))
 			return -1;
 		switch ((int)c->cmd) {
+#ifdef CONFIG_OF_LIBFDT
 		case SPL_EXPORT_FDT:
 			printf("Argument image is now in RAM: 0x%p\n",
 				(void *)images.ft_addr);
Quoted 8 lines

common/cmd_spl.c static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 141

Quoted 6 lines
common/cmd_spl.c +1 -0
 			break;
+#endif
 		case SPL_EXPORT_ATAGS:
 			printf("Argument image is now in RAM at: 0x%p\n",
 				(void *)gd->bd->bi_boot_params);

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20121212/2b6b3646/attachment.pgp>