efi: Generalize handle_ramdisks() and rename to handle_cmdline_files().

The handle_cmdline_files now takes the option to handle as a string,
and returns the loaded data through parameters, rather than taking
an x86 specific setup_header structure.  For ARM, this will be used
to load a device tree blob in addition to initrd images.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
Acked-by: Mark Salter <msalter@redhat.com>
Reviewed-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index ef2181a96d09..beb07a4529ac 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -442,6 +442,8 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
         u16 *s2;
         u8 *s1;
         int i;
+        unsigned long ramdisk_addr;
+        unsigned long ramdisk_size;
 
         sys_table = _table;
 
@@ -500,9 +502,14 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
 
         memset(sdt, 0, sizeof(*sdt));
 
-        status = handle_ramdisks(sys_table, image, hdr);
+        status = handle_cmdline_files(sys_table, image,
+                                      (char *)(unsigned long)hdr->cmd_line_ptr,
+                                      "initrd=", hdr->initrd_addr_max,
+                                      &ramdisk_addr, &ramdisk_size);
         if (status != EFI_SUCCESS)
                 goto fail2;
+        hdr->ramdisk_image = ramdisk_addr;
+        hdr->ramdisk_size = ramdisk_size;
 
         return boot_params;
 fail2: