Commit e7124e36 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

configs/qemu: fix and bump relevant kernel/header versions 



Tweak the configs to deal with b155f5a5
fallout.
And bump to the latest kernel versions.

As of this commit the microblaze qemu targets seem broken, probably
because of commit 14e527eb or some qemu
limitation.

SPARC seems to have issues as well, the kernel seems to go down with an
unhandled exception with qemu 1.7.0

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 1f646d71

board/qemu/arm-nuri/readme.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ graphical window is the framebuffer. 


Startup time is slow because of the SMP CPU emulation so be patient.



Tested with QEMU 1.6.1
 
Tested with QEMU 1.7.0

board/qemu/arm-versatile/linux-3.11.config→board/qemu/arm-versatile/linux-3.13.config

+6 −16
Original line number Diff line number Diff line 
CONFIG_ARCH_VERSATILE=y

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14
@@ -7,16 +5,14 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_VERSATILE=y

CONFIG_MACH_VERSATILE_AB=y

CONFIG_PCI=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=1f03 mem=32M"

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -27,24 +23,22 @@ CONFIG_IP_PNP_BOOTP=y 
# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_EEPROM_LEGACY=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_SYM53C8XX_2=y

CONFIG_EEPROM_LEGACY=m

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIO_AMBAKMI=y

CONFIG_LEGACY_PTY_COUNT=16

CONFIG_SERIAL_8250=m

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y
@@ -52,15 +46,12 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y 
CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_LEGACY_PTY_COUNT=16

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=m

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_FONT_ACORN_8x8=y

CONFIG_SOUND=y

CONFIG_SND=m

CONFIG_SND_MIXER_OSS=m
@@ -75,15 +66,14 @@ CONFIG_CRAMFS=y 
CONFIG_MINIX_FS=y

CONFIG_ROMFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=y

CONFIG_NFSD_V3=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_850=m

CONFIG_NLS_ISO8859_1=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_FONTS=y

CONFIG_FONT_ACORN_8x8=y

board/qemu/arm-versatile/readme.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.6.1
 
Tested with QEMU 1.7.0

board/qemu/arm-vexpress/readme.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.6.1
 
Tested with QEMU 1.7.0

board/qemu/microblazebe-mmu/linux-3.12.config→board/qemu/microblazebe-mmu/linux-3.13.config

+3 −12
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="rootfs.cpio"

CONFIG_INITRAMFS_COMPRESSION_GZIP=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

CONFIG_KALLSYMS_ALL=y

CONFIG_KALLSYMS_EXTRA_PASS=y

# CONFIG_HOTPLUG is not set

# CONFIG_BASE_FULL is not set

# CONFIG_FUTEX is not set

# CONFIG_EPOLL is not set
@@ -20,6 +15,7 @@ CONFIG_SLAB=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_OPT_LIB_ASM=y

CONFIG_XILINX_MICROBLAZE0_FAMILY="spartan3adsp"

CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
@@ -40,7 +36,6 @@ CONFIG_PROC_DEVICETREE=y 
CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_XILINX_EMACLITE=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set
@@ -53,16 +48,12 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y 
CONFIG_EXT2_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_CIFS=y

CONFIG_CIFS_STATS=y

CONFIG_CIFS_STATS2=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_EARLY_PRINTK=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set