From: Gustavo Zacarias Date: Thu, 15 Nov 2012 10:25:39 +0000 (+0000) Subject: qemu/ppc-g3beige: update to use kernel 3.6.6 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=033be287bb07b63e56c952beaf8a5acd18e53fa5;p=buildroot.git qemu/ppc-g3beige: update to use kernel 3.6.6 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- diff --git a/board/qemu/powerpc-g3beige/linux-3.3.config b/board/qemu/powerpc-g3beige/linux-3.3.config deleted file mode 100644 index 098dae30ac..0000000000 --- a/board/qemu/powerpc-g3beige/linux-3.3.config +++ /dev/null @@ -1,86 +0,0 @@ -CONFIG_ALTIVEC=y -CONFIG_EXPERIMENTAL=y -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_COMPAT_BRK=y -CONFIG_SLAB=y -CONFIG_LBDAF=y -CONFIG_PPC_PMAC=y -CONFIG_PPC_OF_BOOT_TRAMPOLINE=y -CONFIG_PPC601_SYNC_FIX=y -CONFIG_HIGHMEM=y -CONFIG_NO_HZ=y -CONFIG_BINFMT_ELF=y -CONFIG_PROC_DEVICETREE=y -CONFIG_PM=y -CONFIG_SECCOMP=y -CONFIG_PCCARD=y -CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y -CONFIG_YENTA=y -CONFIG_ADVANCED_OPTIONS=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_INET_LRO=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_IDE=y -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_PROC_FS=y -CONFIG_BLK_DEV_CMD64X=y -CONFIG_BLK_DEV_IDE_PMAC=y -CONFIG_IEEE1394=y -CONFIG_IEEE1394_OHCI1394=y -CONFIG_IEEE1394_ETH1394=y -CONFIG_IEEE1394_RAWIO=y -CONFIG_IEEE1394_VIDEO1394=y -CONFIG_IEEE1394_DV1394=y -CONFIG_MACINTOSH_DRIVERS=y -CONFIG_ADB=y -CONFIG_ADB_CUDA=y -CONFIG_ADB_PMU=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MACE=y -CONFIG_BMAC=y -CONFIG_HAPPYMEAL=y -CONFIG_SUNGEM=y -CONFIG_CASSINI=y -CONFIG_NET_PCI=y -CONFIG_PCNET32=y -CONFIG_NE2K_PCI=y -CONFIG_8139CP=y -CONFIG_8139TOO=y -CONFIG_8139TOO_PIO=y -CONFIG_SERIO=y -CONFIG_SERIAL_PMACZILOG=y -CONFIG_SERIAL_PMACZILOG_TTYS=y -CONFIG_SERIAL_PMACZILOG_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_SSB=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_PCMCIAHOST=y -CONFIG_SSB_DRIVER_PCICORE=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_MISC_FILESYSTEMS=y -CONFIG_SQUASHFS=y -CONFIG_LIBCRC32C=y -CONFIG_BOOTX_TEXT=y -CONFIG_CRYPTO_HW=y diff --git a/board/qemu/powerpc-g3beige/linux-3.6.config b/board/qemu/powerpc-g3beige/linux-3.6.config new file mode 100644 index 0000000000..098dae30ac --- /dev/null +++ b/board/qemu/powerpc-g3beige/linux-3.6.config @@ -0,0 +1,86 @@ +CONFIG_ALTIVEC=y +CONFIG_EXPERIMENTAL=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_COMPAT_BRK=y +CONFIG_SLAB=y +CONFIG_LBDAF=y +CONFIG_PPC_PMAC=y +CONFIG_PPC_OF_BOOT_TRAMPOLINE=y +CONFIG_PPC601_SYNC_FIX=y +CONFIG_HIGHMEM=y +CONFIG_NO_HZ=y +CONFIG_BINFMT_ELF=y +CONFIG_PROC_DEVICETREE=y +CONFIG_PM=y +CONFIG_SECCOMP=y +CONFIG_PCCARD=y +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y +CONFIG_YENTA=y +CONFIG_ADVANCED_OPTIONS=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_INET_LRO=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_IDE=y +CONFIG_IDE_GD=y +CONFIG_IDE_GD_ATA=y +CONFIG_BLK_DEV_IDECD=y +CONFIG_IDE_PROC_FS=y +CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_IDE_PMAC=y +CONFIG_IEEE1394=y +CONFIG_IEEE1394_OHCI1394=y +CONFIG_IEEE1394_ETH1394=y +CONFIG_IEEE1394_RAWIO=y +CONFIG_IEEE1394_VIDEO1394=y +CONFIG_IEEE1394_DV1394=y +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_ADB=y +CONFIG_ADB_CUDA=y +CONFIG_ADB_PMU=y +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_MACE=y +CONFIG_BMAC=y +CONFIG_HAPPYMEAL=y +CONFIG_SUNGEM=y +CONFIG_CASSINI=y +CONFIG_NET_PCI=y +CONFIG_PCNET32=y +CONFIG_NE2K_PCI=y +CONFIG_8139CP=y +CONFIG_8139TOO=y +CONFIG_8139TOO_PIO=y +CONFIG_SERIO=y +CONFIG_SERIAL_PMACZILOG=y +CONFIG_SERIAL_PMACZILOG_TTYS=y +CONFIG_SERIAL_PMACZILOG_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_SSB=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_PROC_KCORE=y +CONFIG_TMPFS=y +CONFIG_MISC_FILESYSTEMS=y +CONFIG_SQUASHFS=y +CONFIG_LIBCRC32C=y +CONFIG_BOOTX_TEXT=y +CONFIG_CRYPTO_HW=y diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt index a481b11dda..01f0baf8e0 100644 --- a/board/qemu/powerpc-g3beige/readme.txt +++ b/board/qemu/powerpc-g3beige/readme.txt @@ -4,3 +4,5 @@ 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.2.0 diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 1e297e5aa7..420710b94e 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -6,15 +6,15 @@ BR2_powerpc_750=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.3 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_3=y +# Lock to 3.6 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_3_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.3.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.6.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config