[v2,2/5] configs: qemu_riscv32_virt: Upgrade to 4.20 kernel
diff mbox series

Message ID 20190318210106.6347-2-alistair.francis@wdc.com
State Accepted
Headers show
Series
  • Untitled series #97803
Related show

Commit Message

Alistair Francis March 18, 2019, 9:02 p.m. UTC
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 configs/qemu_riscv32_virt_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni March 18, 2019, 9:59 p.m. UTC | #1
On Mon, 18 Mar 2019 21:02:02 +0000
Alistair Francis <Alistair.Francis@wdc.com> wrote:

> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>  configs/qemu_riscv32_virt_defconfig | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
Mark Corbin March 19, 2019, 3:20 p.m. UTC | #2
Hello Alistair

On 18/03/2019 21:02, Alistair Francis wrote:
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>  configs/qemu_riscv32_virt_defconfig | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig
> index fb37da6a89..6f9a61b11c 100644
> --- a/configs/qemu_riscv32_virt_defconfig
> +++ b/configs/qemu_riscv32_virt_defconfig
> @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
>  # Filesystem
>  BR2_TARGET_ROOTFS_EXT2=y
>  
> -# Linux headers same as kernel, a 4.15 series
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
> +# Linux headers same as kernel, a 4.20 series
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y
>  
>  # Kernel
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_GIT=y
>  BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be"

I wasn't sure that the 4.20 kernel worked for riscv32 under qemu which
is probably why it wasn't bumped from 4.15 in January when the
qemu_riscv64_virt_defconfig kernel version was.

How did you manage to test this? I've tried both qemu 2.12.0 and 3.1.0
and neither version will boot the resulting kernel.

Regards

Mark
Alistair Francis March 19, 2019, 6:02 p.m. UTC | #3
On Tue, Mar 19, 2019 at 8:20 AM Mark Corbin <mark.corbin@embecosm.com> wrote:
>
> Hello Alistair
>
> On 18/03/2019 21:02, Alistair Francis wrote:
> > Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> > ---
> >  configs/qemu_riscv32_virt_defconfig | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig
> > index fb37da6a89..6f9a61b11c 100644
> > --- a/configs/qemu_riscv32_virt_defconfig
> > +++ b/configs/qemu_riscv32_virt_defconfig
> > @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
> >  # Filesystem
> >  BR2_TARGET_ROOTFS_EXT2=y
> >
> > -# Linux headers same as kernel, a 4.15 series
> > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
> > +# Linux headers same as kernel, a 4.20 series
> > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y
> >
> >  # Kernel
> >  BR2_LINUX_KERNEL=y
> >  BR2_LINUX_KERNEL_CUSTOM_GIT=y
> >  BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git"
> > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220"
> > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be"
>
> I wasn't sure that the 4.20 kernel worked for riscv32 under qemu which
> is probably why it wasn't bumped from 4.15 in January when the
> qemu_riscv64_virt_defconfig kernel version was.
>
> How did you manage to test this? I've tried both qemu 2.12.0 and 3.1.0
> and neither version will boot the resulting kernel.

I just tested this again and here are my results. All running on QEMU
3.1.0 and using OpenSBI

With current master + my OpenSBI patches -> I can boot the 4.20
kernel, but it never gets to a login prompt.

With current master + my OpenSBI patches + defconfig update -> I can
boot the 4.20 kernel and I get to a login prompt.

I did some of my original tests with an updated defconfig but I
thought I tested without any changed. I'll send a patch to update the
defconfig.

Alistair

>
> Regards
>
> Mark
>
> --
> Mark Corbin
> Embecosm Ltd.
> https://www.embecosm.com
>
Alistair Francis March 19, 2019, 6:14 p.m. UTC | #4
On Tue, Mar 19, 2019 at 11:02 AM Alistair Francis <alistair23@gmail.com> wrote:
>
> On Tue, Mar 19, 2019 at 8:20 AM Mark Corbin <mark.corbin@embecosm.com> wrote:
> >
> > Hello Alistair
> >
> > On 18/03/2019 21:02, Alistair Francis wrote:
> > > Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> > > ---
> > >  configs/qemu_riscv32_virt_defconfig | 6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig
> > > index fb37da6a89..6f9a61b11c 100644
> > > --- a/configs/qemu_riscv32_virt_defconfig
> > > +++ b/configs/qemu_riscv32_virt_defconfig
> > > @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
> > >  # Filesystem
> > >  BR2_TARGET_ROOTFS_EXT2=y
> > >
> > > -# Linux headers same as kernel, a 4.15 series
> > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
> > > +# Linux headers same as kernel, a 4.20 series
> > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y
> > >
> > >  # Kernel
> > >  BR2_LINUX_KERNEL=y
> > >  BR2_LINUX_KERNEL_CUSTOM_GIT=y
> > >  BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git"
> > > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220"
> > > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be"
> >
> > I wasn't sure that the 4.20 kernel worked for riscv32 under qemu which
> > is probably why it wasn't bumped from 4.15 in January when the
> > qemu_riscv64_virt_defconfig kernel version was.
> >
> > How did you manage to test this? I've tried both qemu 2.12.0 and 3.1.0
> > and neither version will boot the resulting kernel.
>
> I just tested this again and here are my results. All running on QEMU
> 3.1.0 and using OpenSBI
>
> With current master + my OpenSBI patches -> I can boot the 4.20
> kernel, but it never gets to a login prompt.
>
> With current master + my OpenSBI patches + defconfig update -> I can
> boot the 4.20 kernel and I get to a login prompt.
>
> I did some of my original tests with an updated defconfig but I
> thought I tested without any changed. I'll send a patch to update the
> defconfig.

I even tested BBL with my v4 series that I'm about to send and that
boots to a login prompt.

So everything should work with the updated config.

Alistair

>
> Alistair
>
> >
> > Regards
> >
> > Mark
> >
> > --
> > Mark Corbin
> > Embecosm Ltd.
> > https://www.embecosm.com
> >
Mark Corbin March 19, 2019, 8:05 p.m. UTC | #5
Hello Alistair

On 19/03/2019 18:02, Alistair Francis wrote:
> On Tue, Mar 19, 2019 at 8:20 AM Mark Corbin <mark.corbin@embecosm.com> wrote:
>> Hello Alistair
>>
>> On 18/03/2019 21:02, Alistair Francis wrote:
>>> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
>>> ---
>>>  configs/qemu_riscv32_virt_defconfig | 6 +++---
>>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig
>>> index fb37da6a89..6f9a61b11c 100644
>>> --- a/configs/qemu_riscv32_virt_defconfig
>>> +++ b/configs/qemu_riscv32_virt_defconfig
>>> @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
>>>  # Filesystem
>>>  BR2_TARGET_ROOTFS_EXT2=y
>>>
>>> -# Linux headers same as kernel, a 4.15 series
>>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
>>> +# Linux headers same as kernel, a 4.20 series
>>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y
>>>
>>>  # Kernel
>>>  BR2_LINUX_KERNEL=y
>>>  BR2_LINUX_KERNEL_CUSTOM_GIT=y
>>>  BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git"
>>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220"
>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be"
>> I wasn't sure that the 4.20 kernel worked for riscv32 under qemu which
>> is probably why it wasn't bumped from 4.15 in January when the
>> qemu_riscv64_virt_defconfig kernel version was.
>>
>> How did you manage to test this? I've tried both qemu 2.12.0 and 3.1.0
>> and neither version will boot the resulting kernel.
> I just tested this again and here are my results. All running on QEMU
> 3.1.0 and using OpenSBI
>
> With current master + my OpenSBI patches -> I can boot the 4.20
> kernel, but it never gets to a login prompt.

This is what happens for me when I build and test from master - no login
prompt. I guess that it's because your qemu_riscv32_virt_defconfig
kernel version update has been checked-in without the necessary opensbi
or config updates.

Regards

Mark

Patch
diff mbox series

diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig
index fb37da6a89..6f9a61b11c 100644
--- a/configs/qemu_riscv32_virt_defconfig
+++ b/configs/qemu_riscv32_virt_defconfig
@@ -10,14 +10,14 @@  BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 
-# Linux headers same as kernel, a 4.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+# Linux headers same as kernel, a 4.20 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux.config"