diff mbox

[1/2] configs/qemu: use zImage for sh4/sh4eb samples

Message ID 1462447857-29400-1-git-send-email-gustavo@zacarias.com.ar
State Accepted
Headers show

Commit Message

Gustavo Zacarias May 5, 2016, 11:30 a.m. UTC
The default for ARM was changed to uImage in 5c67cb1d, however the
sh4/sh4eb sample configs were updated to drop zImage in error, hence
end up building uImage which doesn't work with Qemu.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 configs/qemu_sh4_r2d_defconfig   | 1 +
 configs/qemu_sh4eb_r2d_defconfig | 1 +
 2 files changed, 2 insertions(+)

Comments

Thomas Petazzoni May 5, 2016, 12:24 p.m. UTC | #1
Hello,

On Thu,  5 May 2016 08:30:56 -0300, Gustavo Zacarias wrote:
> The default for ARM was changed to uImage in 5c67cb1d, however the

5c67cb1d changed ARM to default to *zImage*.

> sh4/sh4eb sample configs were updated to drop zImage in error, hence
> end up building uImage which doesn't work with Qemu.

Right, that's a mistake. However, seems like the SPARC defconfig was
also changed while it shouldn't have been changed.

Thomas
Gustavo Zacarias May 5, 2016, 12:32 p.m. UTC | #2
On 05/05/16 09:24, Thomas Petazzoni wrote:

> On Thu,  5 May 2016 08:30:56 -0300, Gustavo Zacarias wrote:
>> The default for ARM was changed to uImage in 5c67cb1d, however the
>
> 5c67cb1d changed ARM to default to *zImage*.

Hi, right, word puzzle!

> Right, that's a mistake. However, seems like the SPARC defconfig was
> also changed while it shouldn't have been changed.

That's not a problem - it was redudant, sparc doesn't support uImage 
hence zImage is the default anyway.
I've tested all of this with the qemu defconfig rebuilds and noticed 
sh4(eb) was still running 4.5.0 (rsync without delete when copying to 
run the tests, hence previous kernel).
Regards.
Thomas Petazzoni May 5, 2016, 1:45 p.m. UTC | #3
Hello,

On Thu,  5 May 2016 08:30:56 -0300, Gustavo Zacarias wrote:
> The default for ARM was changed to uImage in 5c67cb1d, however the
> sh4/sh4eb sample configs were updated to drop zImage in error, hence
> end up building uImage which doesn't work with Qemu.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  configs/qemu_sh4_r2d_defconfig   | 1 +
>  configs/qemu_sh4eb_r2d_defconfig | 1 +
>  2 files changed, 2 insertions(+)

Both patches applied. As discussed, for the first patch, I've reworked
the commit log.

Thanks!

Thomas
diff mbox

Patch

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 57d5578..c7f4ec1 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -19,3 +19,4 @@  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-4.5.config"
+BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig
index d356434..06215c9 100644
--- a/configs/qemu_sh4eb_r2d_defconfig
+++ b/configs/qemu_sh4eb_r2d_defconfig
@@ -18,3 +18,4 @@  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux-4.5.config"
+BR2_LINUX_KERNEL_ZIMAGE=y