From: Gustavo Zacarias Date: Tue, 7 Oct 2014 12:29:51 +0000 (-0300) Subject: qemu/ppc-g3beige: update to the latest versions X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df6a3dbec0c18b96f8a0bceacf31140475437ce1;p=buildroot.git qemu/ppc-g3beige: update to the latest versions Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- diff --git a/board/qemu/powerpc-g3beige/linux-3.16.config b/board/qemu/powerpc-g3beige/linux-3.16.config deleted file mode 100644 index a8dd1f6a48..0000000000 --- a/board/qemu/powerpc-g3beige/linux-3.16.config +++ /dev/null @@ -1,47 +0,0 @@ -CONFIG_ALTIVEC=y -CONFIG_SYSVIPC=y -CONFIG_NO_HZ=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_PPC601_SYNC_FIX=y -CONFIG_HIGHMEM=y -CONFIG_PCCARD=y -CONFIG_YENTA=y -CONFIG_ADVANCED_OPTIONS=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_CONNECTOR=y -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_CMD64X=y -CONFIG_BLK_DEV_IDE_PMAC=y -CONFIG_ADB=y -CONFIG_ADB_CUDA=y -CONFIG_ADB_PMU=y -CONFIG_NETDEVICES=y -CONFIG_PCNET32=y -CONFIG_MACE=y -CONFIG_BMAC=y -CONFIG_NE2K_PCI=y -CONFIG_8139CP=y -CONFIG_8139TOO=y -CONFIG_HAPPYMEAL=y -CONFIG_SUNGEM=y -CONFIG_CASSINI=y -CONFIG_SERIAL_PMACZILOG=y -CONFIG_SERIAL_PMACZILOG_TTYS=y -CONFIG_SERIAL_PMACZILOG_CONSOLE=y -CONFIG_SSB=y -CONFIG_SSB_PCMCIAHOST=y -CONFIG_SSB_DRIVER_PCICORE=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_SQUASHFS=y -CONFIG_LIBCRC32C=y -CONFIG_BOOTX_TEXT=y diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt deleted file mode 100644 index e71683091d..0000000000 --- a/board/qemu/powerpc-g3beige/readme.txt +++ /dev/null @@ -1,8 +0,0 @@ -Run the emulation with: - - qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. - -Tested with QEMU 2.1.0 diff --git a/board/qemu/ppc-g3beige/linux-3.17.config b/board/qemu/ppc-g3beige/linux-3.17.config new file mode 100644 index 0000000000..cf84c75018 --- /dev/null +++ b/board/qemu/ppc-g3beige/linux-3.17.config @@ -0,0 +1,45 @@ +CONFIG_ALTIVEC=y +CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_SLAB=y +CONFIG_PPC601_SYNC_FIX=y +CONFIG_HIGHMEM=y +CONFIG_PCCARD=y +CONFIG_YENTA=y +CONFIG_ADVANCED_OPTIONS=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_CONNECTOR=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_IDE=y +CONFIG_BLK_DEV_IDECD=y +CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_IDE_PMAC=y +CONFIG_ADB=y +CONFIG_ADB_CUDA=y +CONFIG_ADB_PMU=y +CONFIG_NETDEVICES=y +CONFIG_PCNET32=y +CONFIG_MACE=y +CONFIG_BMAC=y +CONFIG_NE2K_PCI=y +CONFIG_8139CP=y +CONFIG_8139TOO=y +CONFIG_HAPPYMEAL=y +CONFIG_SUNGEM=y +CONFIG_CASSINI=y +CONFIG_SERIAL_PMACZILOG=y +CONFIG_SERIAL_PMACZILOG_TTYS=y +CONFIG_SERIAL_PMACZILOG_CONSOLE=y +CONFIG_SSB=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_EXT4_FS=y +CONFIG_PROC_KCORE=y +CONFIG_TMPFS=y +CONFIG_SQUASHFS=y +CONFIG_LIBCRC32C=y +CONFIG_BOOTX_TEXT=y diff --git a/board/qemu/ppc-g3beige/readme.txt b/board/qemu/ppc-g3beige/readme.txt new file mode 100644 index 0000000000..d227650456 --- /dev/null +++ b/board/qemu/ppc-g3beige/readme.txt @@ -0,0 +1,8 @@ +Run the emulation with: + + qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user + +The login prompt will appear in the terminal that started Qemu. The +graphical window is the framebuffer. + +Tested with QEMU 2.1.2 diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index ad2de80d92..5aa715726e 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -6,17 +6,17 @@ BR2_powerpc_750=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.16 headers to avoid breaking with newer kernels +# Lock to 3.17 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.16.3" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_16=y +BR2_DEFAULT_KERNEL_VERSION="3.17" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.16.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux-3.17.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config