diff mbox

qemu/mips64-malta: update defconfig to Linux 3.15.x

Message ID 20140721201340.GA31551@waldemar-brodkorb.de
State Superseded
Headers show

Commit Message

Waldemar Brodkorb July 21, 2014, 8:13 p.m. UTC 
Update to 3.15.x, use Ext2 instead of Ext4.
Genext2fs generates ext2 filesystem, so better use ext2
as used for qemu/mips-malta and qemu/mipsel-malta.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 board/qemu/mips64-malta/linux-3.13.config |   59 -----------------------------
 board/qemu/mips64-malta/linux-3.15.config |   59 +++++++++++++++++++++++++++++
 board/qemu/mips64-malta/readme.txt        |    2 +-
 configs/qemu_mips64_malta_defconfig       |   10 ++---
 4 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100644 board/qemu/mips64-malta/linux-3.13.config
 create mode 100644 board/qemu/mips64-malta/linux-3.15.config

Comments

Thomas Petazzoni July 21, 2014, 8:35 p.m. UTC | #1 
Dear Waldemar Brodkorb,

On Mon, 21 Jul 2014 22:13:41 +0200, Waldemar Brodkorb wrote:

> Update to 3.15.x, use Ext2 instead of Ext4.
> Genext2fs generates ext2 filesystem, so better use ext2
> as used for qemu/mips-malta and qemu/mipsel-malta.

Well, actually, Buildroot can generate ext3 and ext4 filesystems:
http://git.buildroot.net/buildroot/tree/fs/ext2/Config.in#n13.

Best regards,

Thomas
Gustavo Zacarias July 21, 2014, 8:37 p.m. UTC | #2 
On 07/21/2014 05:35 PM, Thomas Petazzoni wrote:

> Dear Waldemar Brodkorb,
> 
> On Mon, 21 Jul 2014 22:13:41 +0200, Waldemar Brodkorb wrote:
> 
>> Update to 3.15.x, use Ext2 instead of Ext4.
>> Genext2fs generates ext2 filesystem, so better use ext2
>> as used for qemu/mips-malta and qemu/mipsel-malta.
> 
> Well, actually, Buildroot can generate ext3 and ext4 filesystems:
> http://git.buildroot.net/buildroot/tree/fs/ext2/Config.in#n13.

And there's also CONFIG_EXT4_USE_FOR_EXT23 for the kernel side, which
makes the EXT4 option in the kernel cover all use cases.
Regards.
Thomas Petazzoni July 21, 2014, 10:08 p.m. UTC | #3 
Gustavo, Waldemar,

On Mon, 21 Jul 2014 17:37:29 -0300, Gustavo Zacarias wrote:

> > Well, actually, Buildroot can generate ext3 and ext4 filesystems:
> > http://git.buildroot.net/buildroot/tree/fs/ext2/Config.in#n13.
> 
> And there's also CONFIG_EXT4_USE_FOR_EXT23 for the kernel side, which
> makes the EXT4 option in the kernel cover all use cases.

So maybe, Waldemar, could you respin with CONFIG_EXT4 +
CONFIG_EXT4_USE_FOR_EXT23 ?

Thanks a lot!

Thomas
Gustavo Zacarias July 21, 2014, 10:12 p.m. UTC | #4 
On 07/21/2014 07:08 PM, Thomas Petazzoni wrote:

> So maybe, Waldemar, could you respin with CONFIG_EXT4 +
> CONFIG_EXT4_USE_FOR_EXT23 ?
> 
> Thanks a lot!

CONFIG_EXT4_USE_FOR_EXT23 is default y when there's EXT4, which is the
case right now, i did the config after all.
On the BR side i kept ext2 output because it was the standard norm for
disk-backed samples, but we can always change that.
Regards.
Waldemar Brodkorb July 22, 2014, 9:37 a.m. UTC | #5 
Hi,
Gustavo Zacarias wrote,

> On 07/21/2014 07:08 PM, Thomas Petazzoni wrote:
> 
> > So maybe, Waldemar, could you respin with CONFIG_EXT4 +
> > CONFIG_EXT4_USE_FOR_EXT23 ?
> > 
> > Thanks a lot!
> 
> CONFIG_EXT4_USE_FOR_EXT23 is default y when there's EXT4, which is the
> case right now, i did the config after all.
> On the BR side i kept ext2 output because it was the standard norm for
> disk-backed samples, but we can always change that.
> Regards.

Should I respin the patches to use ext4 instead of ext2 for
qemu/mips-malta and qemu/mipsel-malta?

Didn't know that a genextfs filesystem could be converted to
ext3/ext4. And indeed when using ext4, all three types can be
used to bootup a system.

best regards
 Waldemar
diff mbox

Patch

diff --git a/board/qemu/mips64-malta/linux-3.13.config b/board/qemu/mips64-malta/linux-3.13.config
deleted file mode 100644
index c112793..0000000
--- a/board/qemu/mips64-malta/linux-3.13.config
+++ /dev/null
@@ -1,59 +0,0 @@ 
-CONFIG_MIPS_MALTA=y
-CONFIG_CPU_MIPS64_R1=y
-CONFIG_64BIT=y
-CONFIG_MIPS_MT_SMP=y
-CONFIG_NR_CPUS=2
-CONFIG_HZ_100=y
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_NAMESPACES=y
-CONFIG_RELAY=y
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PCI=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_NETDEVICES=y
-CONFIG_PCNET32=y
-# CONFIG_WLAN is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-CONFIG_FB=y
-CONFIG_FB_CIRRUS=y
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT4_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
diff --git a/board/qemu/mips64-malta/linux-3.15.config b/board/qemu/mips64-malta/linux-3.15.config
new file mode 100644
index 0000000..7275bc8
--- /dev/null
+++ b/board/qemu/mips64-malta/linux-3.15.config
@@ -0,0 +1,59 @@ 
+CONFIG_MIPS_MALTA=y
+CONFIG_CPU_MIPS64_R1=y
+CONFIG_64BIT=y
+CONFIG_MIPS_MT_SMP=y
+CONFIG_NR_CPUS=2
+CONFIG_HZ_100=y
+CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_NAMESPACES=y
+CONFIG_RELAY=y
+CONFIG_EMBEDDED=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PCI=y
+CONFIG_MIPS32_COMPAT=y
+CONFIG_MIPS32_O32=y
+CONFIG_MIPS32_N32=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_GENERIC=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_PCNET32=y
+# CONFIG_WLAN is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+CONFIG_FB=y
+CONFIG_FB_CIRRUS=y
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_EXT2_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index 3ce3c62..967ea76 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -5,4 +5,4 @@  Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.7.0
+Tested with QEMU 2.0.0
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 97937d1..5929bc5 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -6,17 +6,17 @@  BR2_MIPS_NABI64=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.13 headers to avoid breaking with newer kernels
+# Lock to 3.15 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.5"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
+BR2_DEFAULT_KERNEL_VERSION="3.15.6"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.13.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.15.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config