subject:"\[U\-Boot\] \[RFC v3 03\/10\] cmd\: bootefi\: carve out fdt handling from do

Re: [U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

2019-04-17 Thread AKASHI Takahiro

On Wed, Apr 17, 2019 at 06:35:57PM +0200, Heinrich Schuchardt wrote:
> On 4/17/19 9:01 AM, AKASHI Takahiro wrote:
> >On Tue, Apr 16, 2019 at 06:54:58AM +0200, Heinrich Schuchardt wrote:
> >>On 4/16/19 6:24 AM, AKASHI Takahiro wrote:
> >>>This is a preparatory patch for reworking do_bootefi() in later patch.
> >>
> >>I would prefer a more informative commit message like:
> >>
> >>Carve out a function to handle the installation of the device tree as a
> >>configuration table.
> >
> >Okay, but it doesn't convey more than the subject.
> >
> >-Takahiro Akashi
> >
> >>Otherwise
> >>Reviewed-by: Heinrich Schuchardt 
> >>
> >>>
> >>>Signed-off-by: AKASHI Takahiro 
> >>>---
> >>>  cmd/bootefi.c | 53 ---
> >>>  1 file changed, 38 insertions(+), 15 deletions(-)
> >>>
> >>>diff --git a/cmd/bootefi.c b/cmd/bootefi.c
> >>>index 3619a20e6433..8cd9644115eb 100644
> >>>--- a/cmd/bootefi.c
> >>>+++ b/cmd/bootefi.c
> >>>@@ -198,6 +198,38 @@ static efi_status_t efi_install_fdt(ulong fdt_addr)
> >>>   return ret;
> >>>  }
> >>>
> >>>+/**
> >>>+ * efi_process_fdt() - process 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)
> >>>+{
> >>>+  unsigned long fdt_addr;
> >>>+  efi_status_t ret;
> >>>+
> >>>+  if (fdt_opt) {
> >>>+  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);
> >>>+  if (ret != EFI_SUCCESS) {
> >>>+  printf("ERROR: failed to install device tree\n");
> >>>+  return ret;
> >>>+  }
> >>>+  } else {
> >>>+  /* Remove device tree. EFI_NOT_FOUND can be ignored here */
> >>>+  efi_install_configuration_table(&efi_guid_fdt, NULL);
> >>>+  }
> >>>+
> >>>+  return EFI_SUCCESS;
> >>>+}
> >>>+
> >>>  static efi_status_t bootefi_run_prepare(const char *load_options_path,
> >>>   struct efi_device_path *device_path,
> >>>   struct efi_device_path *image_path,
> >>>@@ -407,21 +439,12 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, 
> >>>int argc, char * const argv[])
> >>>   if (argc < 2)
> >>>   return CMD_RET_USAGE;
> >>>
> >>>-  if (argc > 2) {
> >>>-  fdt_addr = simple_strtoul(argv[2], NULL, 16);
> >>>-  if (!fdt_addr && *argv[2] != '0')
> >>>-  return CMD_RET_USAGE;
> >>>-  /* Install device tree */
> >>>-  r = efi_install_fdt(fdt_addr);
> >>>-  if (r != EFI_SUCCESS) {
> >>>-  printf("ERROR: failed to install device tree\n");
> >>>-  return CMD_RET_FAILURE;
> >>>-  }
> >>>-  } else {
> >>>-  /* Remove device tree. EFI_NOT_FOUND can be ignored here */
> >>>-  efi_install_configuration_table(&efi_guid_fdt, NULL);
> >>>-  printf("WARNING: booting without device tree\n");
> >>>-  }
> >>>+  r = fdt_process_fdt(argc > 2 ? argv[2] : NULL);
> 
> cmd/bootefi.c: In function ‘do_bootefi’:
> cmd/bootefi.c:442:6: warning: implicit declaration of function
> ‘fdt_process_fdt’; did you mean ‘efi_process_fdt’?
> [-Wimplicit-function-declaration]
>   r = fdt_process_fdt(argc > 2 ? argv[2] : NULL);
>   ^~~
>   efi_process_fdt

Oops. I think that I fixed it before.
Will fix along with patch#4.

> cmd/bootefi.c:424:16: warning: unused variable ‘fdt_addr’
> [-Wunused-variable]
>   unsigned long fdt_addr;
> ^~~~

Okay.

Thanks,
-Takahiro Akashi
> At top level:
>   CC  drivers/virtio/virtio_pci_legacy.o
> cmd/bootefi.c:209:21: warning: ‘efi_process_fdt’ defined but not used
> [-Wunused-function]
>  static efi_status_t efi_process_fdt(const char *fdt_opt)
>  ^~~
> 
> Please, check.
> 
> Best regards
> 
> Heinrich
> 
> >>>+  if (r == EFI_INVALID_PARAMETER)
> >>>+  return CMD_RET_USAGE;
> >>>+  else if (r != EFI_SUCCESS)
> >>>+  return CMD_RET_FAILURE;
> >>>+
> >>>  #ifdef CONFIG_CMD_BOOTEFI_HELLO
> >>>   if (!strcmp(argv[1], "hello")) {
> >>>   ulong size = __efi_helloworld_end - __efi_helloworld_begin;
> >>>
> >>
> >
> 
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

2019-04-17 Thread Heinrich Schuchardt


On 4/17/19 9:01 AM, AKASHI Takahiro wrote:

On Tue, Apr 16, 2019 at 06:54:58AM +0200, Heinrich Schuchardt wrote:

On 4/16/19 6:24 AM, AKASHI Takahiro wrote:

This is a preparatory patch for reworking do_bootefi() in later patch.


I would prefer a more informative commit message like:

Carve out a function to handle the installation of the device tree as a
configuration table.


Okay, but it doesn't convey more than the subject.

-Takahiro Akashi


Otherwise
Reviewed-by: Heinrich Schuchardt 



Signed-off-by: AKASHI Takahiro 
---
  cmd/bootefi.c | 53 ---
  1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 3619a20e6433..8cd9644115eb 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -198,6 +198,38 @@ static efi_status_t efi_install_fdt(ulong fdt_addr)
return ret;
  }

+/**
+ * efi_process_fdt() - process 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)
+{
+   unsigned long fdt_addr;
+   efi_status_t ret;
+
+   if (fdt_opt) {
+   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);
+   if (ret != EFI_SUCCESS) {
+   printf("ERROR: failed to install device tree\n");
+   return ret;
+   }
+   } else {
+   /* Remove device tree. EFI_NOT_FOUND can be ignored here */
+   efi_install_configuration_table(&efi_guid_fdt, NULL);
+   }
+
+   return EFI_SUCCESS;
+}
+
  static efi_status_t bootefi_run_prepare(const char *load_options_path,
struct efi_device_path *device_path,
struct efi_device_path *image_path,
@@ -407,21 +439,12 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int 
argc, char * const argv[])
if (argc < 2)
return CMD_RET_USAGE;

-   if (argc > 2) {
-   fdt_addr = simple_strtoul(argv[2], NULL, 16);
-   if (!fdt_addr && *argv[2] != '0')
-   return CMD_RET_USAGE;
-   /* Install device tree */
-   r = efi_install_fdt(fdt_addr);
-   if (r != EFI_SUCCESS) {
-   printf("ERROR: failed to install device tree\n");
-   return CMD_RET_FAILURE;
-   }
-   } else {
-   /* Remove device tree. EFI_NOT_FOUND can be ignored here */
-   efi_install_configuration_table(&efi_guid_fdt, NULL);
-   printf("WARNING: booting without device tree\n");
-   }
+   r = fdt_process_fdt(argc > 2 ? argv[2] : NULL);


cmd/bootefi.c: In function ‘do_bootefi’:
cmd/bootefi.c:442:6: warning: implicit declaration of function
‘fdt_process_fdt’; did you mean ‘efi_process_fdt’?
[-Wimplicit-function-declaration]
  r = fdt_process_fdt(argc > 2 ? argv[2] : NULL);
  ^~~
  efi_process_fdt
cmd/bootefi.c:424:16: warning: unused variable ‘fdt_addr’
[-Wunused-variable]
  unsigned long fdt_addr;
^~~~
At top level:
  CC  drivers/virtio/virtio_pci_legacy.o
cmd/bootefi.c:209:21: warning: ‘efi_process_fdt’ defined but not used
[-Wunused-function]
 static efi_status_t efi_process_fdt(const char *fdt_opt)
 ^~~

Please, check.

Best regards

Heinrich


+   if (r == EFI_INVALID_PARAMETER)
+   return CMD_RET_USAGE;
+   else if (r != EFI_SUCCESS)
+   return CMD_RET_FAILURE;
+
  #ifdef CONFIG_CMD_BOOTEFI_HELLO
if (!strcmp(argv[1], "hello")) {
ulong size = __efi_helloworld_end - __efi_helloworld_begin;







___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

2019-04-17 Thread AKASHI Takahiro

On Tue, Apr 16, 2019 at 06:54:58AM +0200, Heinrich Schuchardt wrote:
> On 4/16/19 6:24 AM, AKASHI Takahiro wrote:
> >This is a preparatory patch for reworking do_bootefi() in later patch.
> 
> I would prefer a more informative commit message like:
> 
> Carve out a function to handle the installation of the device tree as a
> configuration table.

Okay, but it doesn't convey more than the subject.

-Takahiro Akashi

> Otherwise
> Reviewed-by: Heinrich Schuchardt 
> 
> >
> >Signed-off-by: AKASHI Takahiro 
> >---
> >  cmd/bootefi.c | 53 ---
> >  1 file changed, 38 insertions(+), 15 deletions(-)
> >
> >diff --git a/cmd/bootefi.c b/cmd/bootefi.c
> >index 3619a20e6433..8cd9644115eb 100644
> >--- a/cmd/bootefi.c
> >+++ b/cmd/bootefi.c
> >@@ -198,6 +198,38 @@ static efi_status_t efi_install_fdt(ulong fdt_addr)
> > return ret;
> >  }
> >
> >+/**
> >+ * efi_process_fdt() - process 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)
> >+{
> >+unsigned long fdt_addr;
> >+efi_status_t ret;
> >+
> >+if (fdt_opt) {
> >+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);
> >+if (ret != EFI_SUCCESS) {
> >+printf("ERROR: failed to install device tree\n");
> >+return ret;
> >+}
> >+} else {
> >+/* Remove device tree. EFI_NOT_FOUND can be ignored here */
> >+efi_install_configuration_table(&efi_guid_fdt, NULL);
> >+}
> >+
> >+return EFI_SUCCESS;
> >+}
> >+
> >  static efi_status_t bootefi_run_prepare(const char *load_options_path,
> > struct efi_device_path *device_path,
> > struct efi_device_path *image_path,
> >@@ -407,21 +439,12 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int 
> >argc, char * const argv[])
> > if (argc < 2)
> > return CMD_RET_USAGE;
> >
> >-if (argc > 2) {
> >-fdt_addr = simple_strtoul(argv[2], NULL, 16);
> >-if (!fdt_addr && *argv[2] != '0')
> >-return CMD_RET_USAGE;
> >-/* Install device tree */
> >-r = efi_install_fdt(fdt_addr);
> >-if (r != EFI_SUCCESS) {
> >-printf("ERROR: failed to install device tree\n");
> >-return CMD_RET_FAILURE;
> >-}
> >-} else {
> >-/* Remove device tree. EFI_NOT_FOUND can be ignored here */
> >-efi_install_configuration_table(&efi_guid_fdt, NULL);
> >-printf("WARNING: booting without device tree\n");
> >-}
> >+r = fdt_process_fdt(argc > 2 ? argv[2] : NULL);
> >+if (r == EFI_INVALID_PARAMETER)
> >+return CMD_RET_USAGE;
> >+else if (r != EFI_SUCCESS)
> >+return CMD_RET_FAILURE;
> >+
> >  #ifdef CONFIG_CMD_BOOTEFI_HELLO
> > if (!strcmp(argv[1], "hello")) {
> > ulong size = __efi_helloworld_end - __efi_helloworld_begin;
> >
> 
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

2019-04-15 Thread Heinrich Schuchardt


On 4/16/19 6:24 AM, AKASHI Takahiro wrote:

This is a preparatory patch for reworking do_bootefi() in later patch.


I would prefer a more informative commit message like:

Carve out a function to handle the installation of the device tree as a
configuration table.

Otherwise
Reviewed-by: Heinrich Schuchardt 



Signed-off-by: AKASHI Takahiro 
---
  cmd/bootefi.c | 53 ---
  1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 3619a20e6433..8cd9644115eb 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -198,6 +198,38 @@ static efi_status_t efi_install_fdt(ulong fdt_addr)
return ret;
  }

+/**
+ * efi_process_fdt() - process 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)
+{
+   unsigned long fdt_addr;
+   efi_status_t ret;
+
+   if (fdt_opt) {
+   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);
+   if (ret != EFI_SUCCESS) {
+   printf("ERROR: failed to install device tree\n");
+   return ret;
+   }
+   } else {
+   /* Remove device tree. EFI_NOT_FOUND can be ignored here */
+   efi_install_configuration_table(&efi_guid_fdt, NULL);
+   }
+
+   return EFI_SUCCESS;
+}
+
  static efi_status_t bootefi_run_prepare(const char *load_options_path,
struct efi_device_path *device_path,
struct efi_device_path *image_path,
@@ -407,21 +439,12 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int 
argc, char * const argv[])
if (argc < 2)
return CMD_RET_USAGE;

-   if (argc > 2) {
-   fdt_addr = simple_strtoul(argv[2], NULL, 16);
-   if (!fdt_addr && *argv[2] != '0')
-   return CMD_RET_USAGE;
-   /* Install device tree */
-   r = efi_install_fdt(fdt_addr);
-   if (r != EFI_SUCCESS) {
-   printf("ERROR: failed to install device tree\n");
-   return CMD_RET_FAILURE;
-   }
-   } else {
-   /* Remove device tree. EFI_NOT_FOUND can be ignored here */
-   efi_install_configuration_table(&efi_guid_fdt, NULL);
-   printf("WARNING: booting without device tree\n");
-   }
+   r = fdt_process_fdt(argc > 2 ? argv[2] : NULL);
+   if (r == EFI_INVALID_PARAMETER)
+   return CMD_RET_USAGE;
+   else if (r != EFI_SUCCESS)
+   return CMD_RET_FAILURE;
+
  #ifdef CONFIG_CMD_BOOTEFI_HELLO
if (!strcmp(argv[1], "hello")) {
ulong size = __efi_helloworld_end - __efi_helloworld_begin;



___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

2019-04-15 Thread AKASHI Takahiro

This is a preparatory patch for reworking do_bootefi() in later patch.

Signed-off-by: AKASHI Takahiro 
---
 cmd/bootefi.c | 53 ---
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 3619a20e6433..8cd9644115eb 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -198,6 +198,38 @@ static efi_status_t efi_install_fdt(ulong fdt_addr)
return ret;
 }
 
+/**
+ * efi_process_fdt() - process 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)
+{
+   unsigned long fdt_addr;
+   efi_status_t ret;
+
+   if (fdt_opt) {
+   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);
+   if (ret != EFI_SUCCESS) {
+   printf("ERROR: failed to install device tree\n");
+   return ret;
+   }
+   } else {
+   /* Remove device tree. EFI_NOT_FOUND can be ignored here */
+   efi_install_configuration_table(&efi_guid_fdt, NULL);
+   }
+
+   return EFI_SUCCESS;
+}
+
 static efi_status_t bootefi_run_prepare(const char *load_options_path,
struct efi_device_path *device_path,
struct efi_device_path *image_path,
@@ -407,21 +439,12 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int 
argc, char * const argv[])
if (argc < 2)
return CMD_RET_USAGE;
 
-   if (argc > 2) {
-   fdt_addr = simple_strtoul(argv[2], NULL, 16);
-   if (!fdt_addr && *argv[2] != '0')
-   return CMD_RET_USAGE;
-   /* Install device tree */
-   r = efi_install_fdt(fdt_addr);
-   if (r != EFI_SUCCESS) {
-   printf("ERROR: failed to install device tree\n");
-   return CMD_RET_FAILURE;
-   }
-   } else {
-   /* Remove device tree. EFI_NOT_FOUND can be ignored here */
-   efi_install_configuration_table(&efi_guid_fdt, NULL);
-   printf("WARNING: booting without device tree\n");
-   }
+   r = fdt_process_fdt(argc > 2 ? argv[2] : NULL);
+   if (r == EFI_INVALID_PARAMETER)
+   return CMD_RET_USAGE;
+   else if (r != EFI_SUCCESS)
+   return CMD_RET_FAILURE;
+
 #ifdef CONFIG_CMD_BOOTEFI_HELLO
if (!strcmp(argv[1], "hello")) {
ulong size = __efi_helloworld_end - __efi_helloworld_begin;
-- 
2.20.1

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

Re: [U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

Re: [U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

Re: [U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

[U-Boot] [RFC v3 03/10] cmd: bootefi: carve out fdt handling from do_bootefi()

5 matches

Site Navigation

Mail list logo

Footer information