Message ID | 20230626160030.93063-7-bmeng.cn@gmail.com |
---|---|
State | Rejected |
Headers | show |
Series | riscv: Various fixes and small enhancements | expand |
Bin, All, On 2023-06-27 00:00 +0800, Bin Meng spake thusly: > From: Bin Meng <bmeng@tinylab.org> > > Since commit 64f1f82385b2 ("boot/opensbi: Bump to version 1.2"), > the default OpenSBI version has been bumped up to 1.2. With that, > there is no need to define a custom version in each RISC-V board's > defconfig files. In fact, no, because opensbi is a "critical" component part of the boot chain and, like uboot or the kernel, we want to pin the version we use in defconfig files. We only want the v ersion to be bumped in defconfig, when someone actually tested the defconfig still generates a bootable system. Regards, Yann E. MORIN. > Signed-off-by: Bin Meng <bmeng@tinylab.org> > --- > > configs/hifive_unleashed_defconfig | 2 -- > configs/nezha_defconfig | 2 -- > configs/qemu_riscv32_virt_defconfig | 2 -- > configs/qemu_riscv64_virt_defconfig | 2 -- > configs/sipeed_lichee_rv_defconfig | 2 -- > configs/sipeed_lichee_rv_dock_defconfig | 2 -- > configs/spike_riscv64_defconfig | 2 -- > 7 files changed, 14 deletions(-) > > diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig > index 80c5e48f96..013a1423c0 100644 > --- a/configs/hifive_unleashed_defconfig > +++ b/configs/hifive_unleashed_defconfig > @@ -38,8 +38,6 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Bootloader > BR2_TARGET_OPENSBI=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" > BR2_TARGET_OPENSBI_PLAT="generic" > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig > index dd94707905..b4c5b4d0ba 100644 > --- a/configs/nezha_defconfig > +++ b/configs/nezha_defconfig > @@ -15,8 +15,6 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_OPENSBI=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" > BR2_TARGET_OPENSBI_PLAT="generic" > # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set > BR2_TARGET_UBOOT=y > diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig > index 03c871282e..01922ac151 100644 > --- a/configs/qemu_riscv32_virt_defconfig > +++ b/configs/qemu_riscv32_virt_defconfig > @@ -25,8 +25,6 @@ BR2_LINUX_KERNEL_IMAGE=y > > # Bootloader > BR2_TARGET_OPENSBI=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" > BR2_TARGET_OPENSBI_PLAT="generic" > > # host-qemu for gitlab testing > diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig > index 666500d889..8b729f137d 100644 > --- a/configs/qemu_riscv64_virt_defconfig > +++ b/configs/qemu_riscv64_virt_defconfig > @@ -25,8 +25,6 @@ BR2_LINUX_KERNEL_IMAGE=y > > # Bootloader > BR2_TARGET_OPENSBI=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" > BR2_TARGET_OPENSBI_PLAT="generic" > > # host-qemu for gitlab testing > diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig > index 750d2d6e3b..8ad587d35f 100644 > --- a/configs/sipeed_lichee_rv_defconfig > +++ b/configs/sipeed_lichee_rv_defconfig > @@ -14,8 +14,6 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_OPENSBI=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" > BR2_TARGET_OPENSBI_PLAT="generic" > # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set > BR2_TARGET_UBOOT=y > diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig > index a228cd8cb7..b6ac7aa31f 100644 > --- a/configs/sipeed_lichee_rv_dock_defconfig > +++ b/configs/sipeed_lichee_rv_dock_defconfig > @@ -22,8 +22,6 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_OPENSBI=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" > BR2_TARGET_OPENSBI_PLAT="generic" > # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set > BR2_TARGET_UBOOT=y > diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig > index 73ea566084..a6f746eb3f 100644 > --- a/configs/spike_riscv64_defconfig > +++ b/configs/spike_riscv64_defconfig > @@ -9,8 +9,6 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > BR2_TARGET_ROOTFS_CPIO=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_OPENSBI=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y > -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" > BR2_TARGET_OPENSBI_PLAT="generic" > BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y > BR2_PACKAGE_HOST_RISCV_ISA_SIM=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Yann, On Tue, Jun 27, 2023 at 1:10 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote: > > Bin, All, > > On 2023-06-27 00:00 +0800, Bin Meng spake thusly: > > From: Bin Meng <bmeng@tinylab.org> > > > > Since commit 64f1f82385b2 ("boot/opensbi: Bump to version 1.2"), > > the default OpenSBI version has been bumped up to 1.2. With that, > > there is no need to define a custom version in each RISC-V board's > > defconfig files. > > In fact, no, because opensbi is a "critical" component part of the boot > chain and, like uboot or the kernel, we want to pin the version we use > in defconfig files. We only want the v ersion to be bumped in defconfig, > when someone actually tested the defconfig still generates a bootable > system. Makes sense to me. But I would argue at least we should update qemu_riscv32_virt_defconfig and qemu_riscv64_virt_defconfig to use the latest OpenSBI due to the reason that: 1. they are the main platforms to develop and test OpenSBI 2. latest OpenSBI binaries will always be integrated into QEMU as the default bios thoughts? Regards, Bin
Bin, All, On 2023-06-27 10:11 +0800, Bin Meng spake thusly: > On Tue, Jun 27, 2023 at 1:10 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote: > > On 2023-06-27 00:00 +0800, Bin Meng spake thusly: > > > From: Bin Meng <bmeng@tinylab.org> > > > Since commit 64f1f82385b2 ("boot/opensbi: Bump to version 1.2"), > > > the default OpenSBI version has been bumped up to 1.2. With that, > > > there is no need to define a custom version in each RISC-V board's > > > defconfig files. > > In fact, no, because opensbi is a "critical" component part of the boot > > chain and, like uboot or the kernel, we want to pin the version we use > > in defconfig files. We only want the v ersion to be bumped in defconfig, > > when someone actually tested the defconfig still generates a bootable > > system. > Makes sense to me. > But I would argue at least we should update > qemu_riscv32_virt_defconfig and qemu_riscv64_virt_defconfig to use the > latest OpenSBI due to the reason that: > 1. they are the main platforms to develop and test OpenSBI > 2. latest OpenSBI binaries will always be integrated into QEMU as the > default bios > thoughts? For the qemu defconfigs, I wouild indeed understand that we use the latest version; the rationale looks sound. Regards, Yann E. MORIN.
diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 80c5e48f96..013a1423c0 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -38,8 +38,6 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index dd94707905..b4c5b4d0ba 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -15,8 +15,6 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 03c871282e..01922ac151 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -25,8 +25,6 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 666500d889..8b729f137d 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -25,8 +25,6 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig index 750d2d6e3b..8ad587d35f 100644 --- a/configs/sipeed_lichee_rv_defconfig +++ b/configs/sipeed_lichee_rv_defconfig @@ -14,8 +14,6 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig index a228cd8cb7..b6ac7aa31f 100644 --- a/configs/sipeed_lichee_rv_dock_defconfig +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -22,8 +22,6 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index 73ea566084..a6f746eb3f 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -9,8 +9,6 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y BR2_PACKAGE_HOST_RISCV_ISA_SIM=y