[v3,6/8] distro: Extend with RISC-V defines

Message ID 20180423055950.78818-7-agraf@suse.de
State Accepted
Commit 2c6903fa7b1f8c141f56219b181bee2b7fe1f2f4
Headers show
Series
  • riscv: Enable efi_loader support
Related show

Commit Message

Alexander Graf April 23, 2018, 5:59 a.m.
While we don't have UEFI naming conventions for RISC-V file paths yet,
we need to search for something. So let's copy the removable file paths
from the RISC-V edk2 port.

Also add the official VCI strings that contain the standardized RISC-V
architecture ID fields.

Signed-off-by: Alexander Graf <agraf@suse.de>

---

v1 -> v2:

  - Use edk2 default boot file names

v2 -> v3:

  - Use official values for vci
---
 include/config_distro_bootcmd.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Heinrich Schuchardt April 23, 2018, 6:56 a.m. | #1
On 04/23/2018 07:59 AM, Alexander Graf wrote:
> While we don't have UEFI naming conventions for RISC-V file paths yet,
> we need to search for something. So let's copy the removable file paths
> from the RISC-V edk2 port.
> 
> Also add the official VCI strings that contain the standardized RISC-V
> architecture ID fields.
> 
> Signed-off-by: Alexander Graf <agraf@suse.de>

Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

> 
> ---
> 
> v1 -> v2:
> 
>    - Use edk2 default boot file names
> 
> v2 -> v3:
> 
>    - Use official values for vci
> ---
>   include/config_distro_bootcmd.h | 11 +++++++++++
>   1 file changed, 11 insertions(+)
> 
> diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
> index f567cebd38..989b5556af 100644
> --- a/include/config_distro_bootcmd.h
> +++ b/include/config_distro_bootcmd.h
> @@ -100,6 +100,10 @@
>   #define BOOTEFI_NAME "bootia32.efi"
>   #elif defined(CONFIG_X86_RUN_64BIT)
>   #define BOOTEFI_NAME "bootx64.efi"
> +#elif defined(CONFIG_CPU_RISCV_32)
> +#define BOOTEFI_NAME "bootriscv32.efi"
> +#elif defined(CONFIG_CPU_RISCV_64)
> +#define BOOTEFI_NAME "bootriscv64.efi"
>   #endif
>   #endif
>   
> @@ -241,6 +245,7 @@
>   
>   #if defined(CONFIG_CMD_DHCP)
>   #if defined(CONFIG_EFI_LOADER)
> +/* http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml */
>   #if defined(CONFIG_ARM64)
>   #define BOOTENV_EFI_PXE_ARCH "0xb"
>   #define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00011:UNDI:003000"
> @@ -251,6 +256,12 @@
>   /* Always assume we're running 64bit */
>   #define BOOTENV_EFI_PXE_ARCH "0x7"
>   #define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00007:UNDI:003000"
> +#elif defined(CONFIG_CPU_RISCV_32)
> +#define BOOTENV_EFI_PXE_ARCH "0x19"
> +#define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00025:UNDI:003000"
> +#elif defined(CONFIG_CPU_RISCV_64)
> +#define BOOTENV_EFI_PXE_ARCH "0x1b"
> +#define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00027:UNDI:003000"
>   #else
>   #error Please specify an EFI client identifier
>   #endif
>

Patch

diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index f567cebd38..989b5556af 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -100,6 +100,10 @@ 
 #define BOOTEFI_NAME "bootia32.efi"
 #elif defined(CONFIG_X86_RUN_64BIT)
 #define BOOTEFI_NAME "bootx64.efi"
+#elif defined(CONFIG_CPU_RISCV_32)
+#define BOOTEFI_NAME "bootriscv32.efi"
+#elif defined(CONFIG_CPU_RISCV_64)
+#define BOOTEFI_NAME "bootriscv64.efi"
 #endif
 #endif
 
@@ -241,6 +245,7 @@ 
 
 #if defined(CONFIG_CMD_DHCP)
 #if defined(CONFIG_EFI_LOADER)
+/* http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml */
 #if defined(CONFIG_ARM64)
 #define BOOTENV_EFI_PXE_ARCH "0xb"
 #define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00011:UNDI:003000"
@@ -251,6 +256,12 @@ 
 /* Always assume we're running 64bit */
 #define BOOTENV_EFI_PXE_ARCH "0x7"
 #define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00007:UNDI:003000"
+#elif defined(CONFIG_CPU_RISCV_32)
+#define BOOTENV_EFI_PXE_ARCH "0x19"
+#define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00025:UNDI:003000"
+#elif defined(CONFIG_CPU_RISCV_64)
+#define BOOTENV_EFI_PXE_ARCH "0x1b"
+#define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00027:UNDI:003000"
 #else
 #error Please specify an EFI client identifier
 #endif