On 4/16/19 6:24 AM, AKASHI Takahiro wrote:
This is a preparatory patch for reworking do_bootefi() in later patch.
For simplicity, merge two functions.
Signed-off-by: AKASHI Takahiro <takahiro.aka...@linaro.org>
---
cmd/bootefi.c | 67 +++++++++++++++++++++------------------------------
1 file changed, 28 insertions(+), 39 deletions(-)
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 8cd9644115eb..0f58f51cbc76 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -165,62 +165,51 @@ static void efi_carve_out_dt_rsv(void *fdt)
}
}
-static efi_status_t efi_install_fdt(ulong fdt_addr)
-{
- bootm_headers_t img = { 0 };
- efi_status_t ret;
- void *fdt;
-
- fdt = map_sysmem(fdt_addr, 0);
- if (fdt_check_header(fdt)) {
- printf("ERROR: invalid device tree\n");
- return EFI_INVALID_PARAMETER;
- }
-
- /* Create memory reservation as indicated by the device tree */
- efi_carve_out_dt_rsv(fdt);
-
- /* Prepare fdt for payload */
- ret = copy_fdt(&fdt);
- if (ret)
- return ret;
-
- if (image_setup_libfdt(&img, fdt, 0, NULL)) {
- printf("ERROR: failed to process device tree\n");
- return EFI_LOAD_ERROR;
- }
-
- /* Link to it in the efi tables */
- ret = efi_install_configuration_table(&efi_guid_fdt, fdt);
- if (ret != EFI_SUCCESS)
- return EFI_OUT_OF_RESOURCES;
-
- return ret;
-}
-
/**
- * efi_process_fdt() - process fdt passed by a command argument
+ * efi_install_fdt() - install fdt passed by a command argument
* @fdt_opt: pointer to argument
* Return: status code
*
* If specified, fdt will be installed as configuration table,
* otherwise no fdt will be passed.
*/
-static efi_status_t efi_process_fdt(const char *fdt_opt)
+static efi_status_t efi_install_fdt(const char *fdt_opt)
{
unsigned long fdt_addr;
+ void *fdt;
+ bootm_headers_t img = { 0 };
efi_status_t ret;
if (fdt_opt) {
+ /* Install device tree */
fdt_addr = simple_strtoul(fdt_opt, NULL, 16);
if (!fdt_addr && *fdt_opt != '0')
return EFI_INVALID_PARAMETER;
- /* Install device tree */
- ret = efi_install_fdt(fdt_addr);
+ fdt = map_sysmem(fdt_addr, 0);
+ if (fdt_check_header(fdt)) {
+ printf("ERROR: invalid device tree\n");
+ return EFI_INVALID_PARAMETER;
+ }
+
+ /* Create memory reservation as indicated by the device tree */
+ efi_carve_out_dt_rsv(fdt);
+
+ /* Prepare fdt for payload */
+ ret = copy_fdt(&fdt);
+ if (ret)
+ return ret;
+
+ if (image_setup_libfdt(&img, fdt, 0, NULL)) {
+ printf("ERROR: failed to process device tree\n");
+ return EFI_LOAD_ERROR;
+ }
+
+ /* Link to it in the efi tables */
+ ret = efi_install_configuration_table(&efi_guid_fdt, fdt);
if (ret != EFI_SUCCESS) {
printf("ERROR: failed to install device tree\n");
- return ret;
+ return EFI_OUT_OF_RESOURCES;
}
} else {
/* Remove device tree. EFI_NOT_FOUND can be ignored here */
@@ -439,7 +428,7 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
if (argc < 2)
return CMD_RET_USAGE;
- r = fdt_process_fdt(argc > 2 ? argv[2] : NULL);
+ r = fdt_install_fdt(argc > 2 ? argv[2] : NULL);
cmd/bootefi.c: In function ‘do_bootefi’:
cmd/bootefi.c:431:6: warning: implicit declaration of function
‘fdt_install_fdt’; did you mean ‘efi_install_fdt’?
[-Wimplicit-function-declaration]
r = fdt_install_fdt(argc > 2 ? argv[2] : NULL);
^~~~~~~~~~~~~~~
efi_install_fdt
cmd/bootefi.c:413:16: warning: unused variable ‘fdt_addr’
[-Wunused-variable]
unsigned long fdt_addr;
^~~~~~~~
At top level:
cmd/bootefi.c:176:21: warning: ‘efi_install_fdt’ defined but not used
[-Wunused-function]
static efi_status_t efi_install_fdt(const char *fdt_opt)
Please, check.
Best regards
Heinrich
if (r == EFI_INVALID_PARAMETER)
return CMD_RET_USAGE;
else if (r != EFI_SUCCESS)
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
