From: Vicente Olivert Riera Date: Fri, 1 Jul 2016 09:27:20 +0000 (+0100) Subject: configs/qemu_mips_malta_defconfig: rename to qemu_mips32r2_malta_defconfig X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=25d7efc85bbcb8844a4d3ae70f728cd7330f3df2;p=buildroot.git configs/qemu_mips_malta_defconfig: rename to qemu_mips32r2_malta_defconfig Signed-off-by: Vicente Olivert Riera Tested-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- diff --git a/board/qemu/mips-malta/linux-4.6.config b/board/qemu/mips-malta/linux-4.6.config deleted file mode 100644 index 3a26ac830f..0000000000 --- a/board/qemu/mips-malta/linux-4.6.config +++ /dev/null @@ -1,30 +0,0 @@ -CONFIG_MIPS_MALTA=y -CONFIG_CPU_MIPS32_R2=y -CONFIG_MIPS_MT_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_SYSVIPC=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_PCI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -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_INPUT_EVDEV=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_CIRRUS=y -CONFIG_USB=y -CONFIG_USB_UHCI_HCD=y -CONFIG_EXT4_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt deleted file mode 100644 index 13f8910b2f..0000000000 --- a/board/qemu/mips-malta/readme.txt +++ /dev/null @@ -1,9 +0,0 @@ -Run the emulation with: - - qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -net nic,model=pcnet -net user - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. No keyboard support has been -enabled. - -Tested with QEMU 2.5.0 diff --git a/board/qemu/mips32r2-malta/linux-4.6.config b/board/qemu/mips32r2-malta/linux-4.6.config new file mode 100644 index 0000000000..3a26ac830f --- /dev/null +++ b/board/qemu/mips32r2-malta/linux-4.6.config @@ -0,0 +1,30 @@ +CONFIG_MIPS_MALTA=y +CONFIG_CPU_MIPS32_R2=y +CONFIG_MIPS_MT_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_SYSVIPC=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_PCI=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +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_INPUT_EVDEV=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FB=y +CONFIG_FB_CIRRUS=y +CONFIG_USB=y +CONFIG_USB_UHCI_HCD=y +CONFIG_EXT4_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y diff --git a/board/qemu/mips32r2-malta/readme.txt b/board/qemu/mips32r2-malta/readme.txt new file mode 100644 index 0000000000..13f8910b2f --- /dev/null +++ b/board/qemu/mips32r2-malta/readme.txt @@ -0,0 +1,9 @@ +Run the emulation with: + + qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -net nic,model=pcnet -net user + +The login prompt will appear in the terminal that started Qemu. The +graphical window is the framebuffer. No keyboard support has been +enabled. + +Tested with QEMU 2.5.0 diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig new file mode 100644 index 0000000000..ed19982752 --- /dev/null +++ b/configs/qemu_mips32r2_malta_defconfig @@ -0,0 +1,25 @@ +# Architecture +BR2_mips=y +BR2_mips_32r2=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Linux headers same as kernel, a 4.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.1" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux-4.6.config" +BR2_LINUX_KERNEL_VMLINUX=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig deleted file mode 100644 index 66b67a505b..0000000000 --- a/configs/qemu_mips_malta_defconfig +++ /dev/null @@ -1,25 +0,0 @@ -# Architecture -BR2_mips=y -BR2_mips_32r2=y - -# System -BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Linux headers same as kernel, a 4.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.1" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-4.6.config" -BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"