UPSTREAM: cmd/fs: fix build if CMD_BOOTEFI is not set

DC-fgervais · JosephChen2017 · commit 6dce606bd24e · 2021-05-24T14:50:48.000+08:00
Fixes:
cmd/fs.c:29: undefined reference to `efi_set_bootdev'

Signed-off-by: Francois Gervais &lt;fgervais@distech-controls.com&gt;
Change-Id: Ia4d6696dde0a95dc7d5a90ac286e94d2d9f06fb1
diff --git a/cmd/fs.c b/cmd/fs.c
@@ -27,8 +27,10 @@ U_BOOT_CMD(
 static int do_load_wrapper(cmd_tbl_t *cmdtp, int flag, int argc,
 				char * const argv[])
 {
+#ifdef CONFIG_CMD_BOOTEFI
 	efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "",
 			(argc > 4) ? argv[4] : "");
+#endif
 	return do_load(cmdtp, flag, argc, argv, FS_TYPE_ANY);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,10 @@ U_BOOT_CMD(`
`27`	`27`	`static int do_load_wrapper(cmd_tbl_t *cmdtp, int flag, int argc,`
`28`	`28`	`char * const argv[])`
`29`	`29`	`{`
	`30`	`+#ifdef CONFIG_CMD_BOOTEFI`
`30`	`31`	`efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "",`
`31`	`32`	`(argc > 4) ? argv[4] : "");`
	`33`	`+#endif`
`32`	`34`	`return do_load(cmdtp, flag, argc, argv, FS_TYPE_ANY);`
`33`	`35`	`}`
`34`	`36`