diff options
Diffstat (limited to 'conf/machine')
53 files changed, 448 insertions, 146 deletions
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf index 0ee57c407f..05eb2c540c 100644 --- a/conf/machine/am3517-evm.conf +++ b/conf/machine/am3517-evm.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: omap3 EVM -#@DESCRIPTION: Machine configuration for the TI omap3517 EVM +#@NAME: AM3517 EVM +#@DESCRIPTION: Machine configuration for the TI Sitara AM3517 EVM TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" @@ -15,20 +15,22 @@ GUI_MACHINE_CLASS = "smallscreen" require conf/machine/include/omap3.inc -PACKAGE_EXTRA_ARCHS += "omap3517-evm" - # Ship all kernel modules IMAGE_FSTYPES ?= "jffs2 tar.bz2" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" SERIAL_CONSOLE = "115200 ttyS2" +USE_VT = "2" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_VERSION_u-boot = "git" + UBOOT_ARCH = "arm" -UBOOT_MACHINE = "omap3517_evm_config" -XLOAD_MACHINE = "omap3517evm_config" +UBOOT_MACHINE = "am3517_evm_config" +XLOAD_MACHINE = "am3517evm_config" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen ethernet" diff --git a/conf/machine/dm3730-am3715-evm.conf b/conf/machine/am37x-evm.conf index b91acd5fc7..096d9e07ef 100644 --- a/conf/machine/dm3730-am3715-evm.conf +++ b/conf/machine/am37x-evm.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: DM37x/AM37x EVM -#@DESCRIPTION: Machine configuration for the TI DM37x/AM37x EVM +#@NAME: AM37x EVM +#@DESCRIPTION: Machine configuration for the TI AM37x EVM TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" @@ -18,7 +18,7 @@ require conf/machine/include/omap3.inc # Ship all kernel modules IMAGE_FSTYPES ?= "jffs2 tar.bz2" -EXTRA_IMAGECMD_jffs2 = "-lnp " +EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" SERIAL_CONSOLE = "115200 ttyS0" @@ -29,6 +29,7 @@ PREFERRED_VERSION_u-boot = "git" UBOOT_ARCH = "arm" UBOOT_MACHINE = "omap3_evm_config" +XLOAD_MACHINE = "omap3evm_config" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index bcbf23eaa8..ce480193f8 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -40,8 +40,5 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" # UBI: sub-page size: 512 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" - -PREFERRED_VERSION_u-boot = "git" - # and sdio MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/bug20.conf b/conf/machine/bug20.conf index dbc1faf6ea..549743bbad 100644 --- a/conf/machine/bug20.conf +++ b/conf/machine/bug20.conf @@ -8,6 +8,7 @@ XSERVER = "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-glx \ xf86-input-evdev \ + xf86-input-tslib \ xf86-input-mouse \ xf86-video-omapfb \ xf86-input-keyboard" @@ -17,10 +18,10 @@ GUI_MACHINE_CLASS = "bigscreen" require conf/machine/include/omap3.inc -# this kernel is not provided in OE yet PREFERRED_PROVIDER_virtual/kernel = "linux-omap-hah" -IMAGE_FSTYPES += "tar.bz2" +IMAGE_FSTYPES += "tar.bz2 ubi" +EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyS2" diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf index b61c00ca27..64eace2ec8 100644 --- a/conf/machine/da850-omapl138-evm.conf +++ b/conf/machine/da850-omapl138-evm.conf @@ -11,4 +11,19 @@ UBOOT_LOADADDRESS = "0xc0008000" MACHINE_FEATURES = "kernel26 serial ethernet" +# do ubiattach /dev/ubi_ctrl -m 4 +# # From dmesg: +# # UBI: smallest flash I/O unit: 2048 +# # UBI: logical eraseblock size: 126976 bytes +# # from ubiattach stdout: +# # UBI device number 0, total 971 LEBs (123293696 bytes, 117.6 MiB), available 958 LEBs (121643008 bytes, 116.0 MiB), LEB size 126976 bytes (124.0 KiB) +# MKUBIFS_ARGS = "-m 2048 -e 126976 -c 948" +# +# # do ubiattach /dev/ubi_ctrl -m 4 +# # from dmesg: +# # UBI: smallest flash I/O unit: 2048 +# # UBI: physical eraseblock size: 131072 bytes (128 KiB) +# # UBI: sub-page size: 512 +# UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + SERIAL_CONSOLE = "115200 ttyS2" diff --git a/conf/machine/dm37x-evm.conf b/conf/machine/dm37x-evm.conf new file mode 100644 index 0000000000..35fef88cc5 --- /dev/null +++ b/conf/machine/dm37x-evm.conf @@ -0,0 +1,52 @@ +#@TYPE: Machine +#@NAME: DM37x EVM +#@DESCRIPTION: Machine configuration for the TI DM37x EVM +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-tslib \ + xf86-video-omapfb \ + xf86-input-keyboard" + +GUI_MACHINE_CLASS = "smallscreen" + +require conf/machine/include/omap3.inc + +# Ship all kernel modules + +IMAGE_FSTYPES ?= "jffs2 tar.bz2" +EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" + +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_VERSION_u-boot = "git" + +UBOOT_ARCH = "arm" +UBOOT_MACHINE = "omap3_evm_config" +XLOAD_MACHINE = "omap3evm_config" + +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" + +# NOTE: there are NAND and OneNAND versions of this board... + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + diff --git a/conf/machine/efikamx.conf b/conf/machine/efikamx.conf new file mode 100644 index 0000000000..935649b240 --- /dev/null +++ b/conf/machine/efikamx.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@Name: Genisi EFIKA MX Development Platform +#@DESCRIPTION: Machine configuration for the EFIKA development platform (http://www.powerdeveloper.org/platforms/efikamx) + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-efikamx" + +MACHINE_FEATURES = "kernel26 usbhost ext2 alsa" + +#don't try to access tty1 +USE_VT = "0" + +SERIAL_CONSOLE = "115200 ttymxc0" +UBOOT_ENTRYPOINT = "0x90008000" +UBOOT_LOADADDRESS = "0x90008000" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-efikamx" + +#tune for ARMv7/Cortex A8 +require conf/machine/include/tune-cortexa8.inc diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index f85b2a12ee..6c84a1395a 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -29,6 +29,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ kernel-module-h4000-bt \ kernel-module-h4000-pcmcia \ kernel-module-acx \ + keymaps \ " # diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf index 7251de70c1..b6e7f2d0fe 100644 --- a/conf/machine/hawkboard.conf +++ b/conf/machine/hawkboard.conf @@ -14,10 +14,10 @@ MACHINE_FEATURES = "kernel26 serial ethernet ide screen" # do ubiattach /dev/ubi_ctrl -m 4 # From dmesg: # UBI: smallest flash I/O unit: 2048 -# UBI: logical eraseblock size: 129024 bytes +# UBI: logical eraseblock size: 126976 bytes # from ubiattach stdout: -# UBI device number 0, total 960 LEBs -MKUBIFS_ARGS = "-m 2048 -e 129024 -c 960" +# UBI device number 0, total 971 LEBs (123293696 bytes, 117.6 MiB), available 958 LEBs (121643008 bytes, 116.0 MiB), LEB size 126976 bytes (124.0 KiB) +MKUBIFS_ARGS = "-m 2048 -e 126976 -c 948" # do ubiattach /dev/ubi_ctrl -m 4 # from dmesg: diff --git a/conf/machine/htcdream.conf b/conf/machine/htcdream.conf index 89604d5f21..3cf1ebf04c 100644 --- a/conf/machine/htcdream.conf +++ b/conf/machine/htcdream.conf @@ -20,4 +20,13 @@ MACHINE_EXTRA_RRECOMMENDS = "\ PREFERRED_PROVIDER_virtual/kernel = "linux-leviathan" -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" +XSERVER = " \ + xserver-xorg \ + xserver-xorg-extension-glx \ + xserver-xorg-extension-dri \ + xf86-input-tslib \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-video-fbdev \ +" diff --git a/conf/machine/htcleo.conf b/conf/machine/htcleo.conf index 52d4a42b78..f72abaf670 100644 --- a/conf/machine/htcleo.conf +++ b/conf/machine/htcleo.conf @@ -7,4 +7,4 @@ require conf/machine/include/htc-qsd8.inc MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "800" -MACHINE_FEATURES = "kernel26 touchscreen screen phone gps compass usb keyboard" +MACHINE_FEATURES = "kernel26 mmc mmcroot screen serial touchscreen keyboard usbgadget usbhost bluetooth wifi phone compass gsensor lightsensor" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index ab532e33ff..474454ab31 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -45,7 +45,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-acx \ kernel-module-hx4700-acx \ kernel-module-hx4700-bt \ - kernel-module-snd-hx4700-audio" + kernel-module-snd-hx4700-audio \ + keymaps" #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ diff --git a/conf/machine/imote2.conf b/conf/machine/imote2.conf index 24da0d0678..72830e1a57 100644 --- a/conf/machine/imote2.conf +++ b/conf/machine/imote2.conf @@ -3,13 +3,13 @@ #@DESCRIPTION: Machine configuration for Crossbow iMote 2 TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel = "linux-zigbee" PACKAGE_EXTRA_ARCHS = " iwmmxt" KERNEL_IMAGETYPE = "zImage" IMAGE_FSTYPE += "jffs2" -EXTRA_IMAGECMD_jffs2 = "--little-endian -e 0x40000 --pad=0x01DC0000 --eraseblock=0x20000" +EXTRA_IMAGECMD_jffs2 = "--little-endian --pad=0x01DC0000 --eraseblock=0x20000" CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS2,115200 mem=32M" diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index 59d763df69..28ded38611 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-arm926ejs.inc # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r44" +MACHINE_KERNEL_PR = "r48" TARGET_ARCH = "arm" diff --git a/conf/machine/include/htc-qsd8.inc b/conf/machine/include/htc-qsd8.inc index ac3e7d22ee..819646aa42 100644 --- a/conf/machine/include/htc-qsd8.inc +++ b/conf/machine/include/htc-qsd8.inc @@ -8,11 +8,12 @@ XSERVER = " \ xserver-xorg \ xserver-xorg-extension-glx \ xserver-xorg-extension-dri \ - xf86-input-evtouch \ + xf86-input-tslib \ + xf86-input-evtouch \ xf86-input-evdev \ xf86-input-mouse \ xf86-input-keyboard \ - xf86-video-msm \ + xf86-video-fbdev \ " # capability database @@ -22,6 +23,9 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640" # use this for overrides MACHINE_CLASS = "htc-qsd8" +# use uncompressed kernel image +KERNEL_IMAGETYPE = Image + # features MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index 192cbb121b..cf7f0dd603 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -22,7 +22,6 @@ IMAGE_FSTYPES ?= "jffs2 tar.gz" EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" require conf/machine/include/tune-xscale.inc -require conf/machine/include/tune-thumb.inc #------------------------------------------------------------------------------- # Board defaults diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index 75c0f42f7d..d65b5b2c71 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -1,7 +1,16 @@ +# use this for overrides +MACHINE_CLASS = "motorola-ezx" + +# +# Hardware-based properties +# TARGET_ARCH = "arm" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel" +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.inc + +# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first +#require conf/machine/include/tune-iwmmxt.inc #cat /proc/mtd #dev: size erasesize name @@ -10,34 +19,53 @@ PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel" #mtd2: 00580000 00020000 "VFM_Filesystem" #mtd3: 00020000 00020000 "Logo" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone" -MACHINE_FEATURES += " iwmmxt" - +ROOT_FLASH_SIZE = "24" +MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "180" +MACHINE_FEATURES = "alsa apm bluetooth kernel26 keyboard phone screen touchscreen usbgadget usbhost vfat" +MACHINE_FEATURES += " iwmmxt" -# use this for overrides -MACHINE_CLASS = "motorola-ezx" - +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel" +MODUTILS = "26" XSERVER = "xserver-kdrive-fbdev" - -ROOT_FLASH_SIZE = "24" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" +# In order to enable UIBIFS add "uibi and ubifs" +#IMAGE_FSTYPES += "ubi ubifs" + +# From dmesg: +# UBI: smallest flash I/O unit: 1 +# UBI: logical eraseblock size: 131072 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 1 -e 130944 -c 487" -# the EZX phones need a userspace daemon to stop the BP from shutting down the phone -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd" +# from dmesg: +# UBI: smallest flash I/O unit: 1 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 1 -p 128KiB " + + +EXTRA_IMAGEDEPENDS += "moto-boot-usb-native ezx-gen-blob" + +IMAGE_INSTALL_append += "\ + kernel-module-ohci-hcd \ + kernel-module-moto-usb-ipc \ + kernel-module-ts27010mux \ +" # Ezxd needs to be started very early so we need the mux devices in static /dev IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ files/device_table-ezx.txt" -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.inc - SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/include/nios2.inc b/conf/machine/include/nios2.inc new file mode 100644 index 0000000000..ccbfc36111 --- /dev/null +++ b/conf/machine/include/nios2.inc @@ -0,0 +1,40 @@ +#@TYPE: Machine configuration +#@NAME: nios2 +#@DESCRIPTION: generic machine configuration for nios2 with mmu + +# there are some hooks for uclibc in this file +# however uclibc is not working yet + +# LIBC = "uclibc" +LIBC = "glibc" +# and for the angstrom folks +ANGSTROMLIBC = "${LIBC}" + +# fix up target strings +# TARGET_PREFIX = "nios2-linux-uclibc-" +TARGET_PREFIX = "nios2-linux-" +TARGET_VENDOR_nios2 = "" + +# Set default for common nios2-based machines +MACHINE_FEATURES ?= "kernel26" +# Select an appropriate default kernel + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-nios2" + +# Set default for 16MB machines - can be overridden for more or less flash. +ROOT_FLASH_SIZE ?= "12" + +# Allow for rootfs loaded direct from internal hard disk +IMAGE_FSTYPES ?= "jffs2 tar.gz" + +# Set default for common ixp4xx-based machines +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" + +#------------------------------------------------------------------------------- +# Board defaults +#------------------------------------------------------------------------------- +# These values are board specific but they seem to be common to a large number +# of boards so are reasonable defaults. +SERIAL_CONSOLE = "115200 ttyS0" +KERNEL_CONSOLE = "ttyS0,115200n8" +USE_VT = "0" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index d9f41f5c8e..1052296d8a 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -3,13 +3,12 @@ SOC_FAMILY = "omap3" require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r75" +MACHINE_KERNEL_PR = "r88" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" -# Only build u-boot, xload is optional -EXTRA_IMAGEDEPENDS += "u-boot" +EXTRA_IMAGEDEPENDS += "u-boot x-load" diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc index a38ea8857d..852c12a0fd 100644 --- a/conf/machine/include/qemu.inc +++ b/conf/machine/include/qemu.inc @@ -11,3 +11,5 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "230000" # Don't include kernels in standard images RDEPENDS_kernel-base = "" + +EXTRA_IMAGEDEPENDS += "qemu-native" diff --git a/conf/machine/include/tune-arm1136-novfp.inc b/conf/machine/include/tune-arm1136-novfp.inc index e1f7945a0f..58134b7d40 100644 --- a/conf/machine/include/tune-arm1136-novfp.inc +++ b/conf/machine/include/tune-arm1136-novfp.inc @@ -5,6 +5,3 @@ TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" FEED_ARCH = "armv6-novfp" BASE_PACKAGE_ARCH = "armv6-novfp" PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6-novfp" - -# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish -require conf/machine/include/tune-thumb.inc diff --git a/conf/machine/include/tune-arm1136jf-s.inc b/conf/machine/include/tune-arm1136jf-s.inc index c532b9c816..2944cc7166 100644 --- a/conf/machine/include/tune-arm1136jf-s.inc +++ b/conf/machine/include/tune-arm1136jf-s.inc @@ -2,6 +2,3 @@ TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv6" BASE_PACKAGE_ARCH = "armv6" PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6" - -# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish -require conf/machine/include/tune-thumb.inc diff --git a/conf/machine/include/tune-arm1176jzf-s.inc b/conf/machine/include/tune-arm1176jzf-s.inc index b7c5291731..ee2884b0a9 100644 --- a/conf/machine/include/tune-arm1176jzf-s.inc +++ b/conf/machine/include/tune-arm1176jzf-s.inc @@ -2,6 +2,3 @@ TARGET_CC_ARCH = "-march=armv6j -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp FEED_ARCH = "armv6" BASE_PACKAGE_ARCH = "armv6" PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6" - -# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish -require conf/machine/include/tune-thumb.inc diff --git a/conf/machine/include/tune-arm920t.inc b/conf/machine/include/tune-arm920t.inc index 5a373e9d80..fee5c586c9 100644 --- a/conf/machine/include/tune-arm920t.inc +++ b/conf/machine/include/tune-arm920t.inc @@ -2,7 +2,3 @@ FEED_ARCH = "armv4t" BASE_PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" PACKAGE_EXTRA_ARCHS += "armv4 armv4t" - -# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish -require conf/machine/include/tune-thumb.inc - diff --git a/conf/machine/include/tune-arm926ejs.inc b/conf/machine/include/tune-arm926ejs.inc index f6f5064548..f41e460999 100644 --- a/conf/machine/include/tune-arm926ejs.inc +++ b/conf/machine/include/tune-arm926ejs.inc @@ -5,6 +5,3 @@ PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te" # For gcc 4.x you need: TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" BASE_PACKAGE_ARCH = "armv5te" - -# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish -require conf/machine/include/tune-thumb.inc diff --git a/conf/machine/include/tune-arm9tdmi.inc b/conf/machine/include/tune-arm9tdmi.inc index a11ee381d5..d788b5304f 100644 --- a/conf/machine/include/tune-arm9tdmi.inc +++ b/conf/machine/include/tune-arm9tdmi.inc @@ -2,7 +2,3 @@ FEED_ARCH = "armv4t" BASE_PACKAGE_ARCH = "armv4t" PACKAGE_EXTRA_ARCHS += "armv4 armv4t" TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" - -# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish -require conf/machine/include/tune-thumb.inc - diff --git a/conf/machine/include/tune-armv7.inc b/conf/machine/include/tune-armv7.inc index 05ec3da1ac..379a3eb011 100644 --- a/conf/machine/include/tune-armv7.inc +++ b/conf/machine/include/tune-armv7.inc @@ -5,7 +5,3 @@ TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7" BASE_PACKAGE_ARCH = "armv7" - -# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish -require conf/machine/include/tune-thumb.inc - diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc index c8770e0783..7458281172 100644 --- a/conf/machine/include/tune-ep9312.inc +++ b/conf/machine/include/tune-ep9312.inc @@ -5,9 +5,6 @@ PACKAGE_EXTRA_ARCHS += "armv4t ep9312" BASE_PACKAGE_ARCH = "ep9312" FEED_ARCH = "ep9312" -# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish -require conf/machine/include/tune-thumb.inc - FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros" DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer -g" SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}" diff --git a/conf/machine/include/tune-thumb.inc b/conf/machine/include/tune-thumb.inc deleted file mode 100644 index cd88bb4786..0000000000 --- a/conf/machine/include/tune-thumb.inc +++ /dev/null @@ -1,32 +0,0 @@ -#tune file for thumb instructions - -ARM_INSTRUCTION_SET ?= "arm" -# "arm" "thumb" -# The instruction set the compiler should use when generating application -# code. The kernel is always compiled with arm code at present. arm code -# is the original 32 bit ARM instruction set, thumb code is the 16 bit -# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size) -# but requires more instructions (140% for 70% smaller code) so may be -# slower. - -THUMB_INTERWORK ?= "no" -# "yes" "no" -# Whether to compile with code to allow interworking between the two -# instruction sets. This allows thumb code to be executed on a primarily -# arm system and vice versa. It is strongly recommended that DISTROs not -# turn this off - the actual cost is very small. - -OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" -OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" -OVERRIDES .= "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}" - -# Compiler and linker options for application code and kernel code. These -# options ensure that the compiler has the correct settings for the selected -# instruction set and interworking. -ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" -ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" - -# -TARGET_CC_ARCH += "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" -TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -mno-thumb" - diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc index 3a6bd0e659..f0f58bc30d 100644 --- a/conf/machine/include/tune-xscale.inc +++ b/conf/machine/include/tune-xscale.inc @@ -7,7 +7,3 @@ TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" PACKAGE_EXTRA_ARCHS += "${@['armv4b armv4tb armv5teb', 'armv4 armv4t armv5te'][ bb.data.getVar('TARGET_ARCH', d, 1) == 'arm']}" BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('TARGET_ARCH', d, 1) == 'arm']}" - -# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish -require conf/machine/include/tune-thumb.inc - diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 8147c77bc9..0412396f33 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -47,7 +47,7 @@ XSERVER_akita = "xserver-kdrive-1300-fbdev" # spitz uses xserver-xorg PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg" -XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" +XSERVER_spitz = "xserver-xorg xf86-video-fbdev xf86-input-keyboard xf86-input-mouse xf86-input-evdev" PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri" @@ -64,6 +64,12 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_PROVIDER_virtual/kernel_collie = "linux" PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" +# udev-141 is the latest version that works with linux-2.6.26-RP +PREFERRED_PROVIDER_udev-compat_akita = "udev-compat141" +PREFERRED_PROVIDER_udev-compat_spitz = "udev-compat141" +PREFERRED_PROVIDER_udev-compat_c7x0 = "udev-compat141" +PREFERRED_PROVIDER_udev-compat_poodle = "udev-compat141" + # Default bootloader expects "zImage", use "uImage" for u-boot # Note: kexecboot can boot both kind of images ZAURUS_KERNEL_IMAGETYPE ?= "zImage" diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 16a723cd1c..62272c11d1 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -1,7 +1,14 @@ TARGET_ARCH = "powerpc" UBOOT_MACHINE = "Lite5200" -SERIAL_CONSOLE="38400 ttyS0" +SERIAL_CONSOLE="115200 ttyPSC0" IMAGE_FSTYPES = "jffs2 tar.bz2" +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" + +MACHINE_FEATURES = "kernel26 ext2 usbhost pci uboot" + +UBOOT_MACHINE = "Lite5200_config" + require conf/machine/include/tune-ppc603e.inc diff --git a/conf/machine/neek.conf b/conf/machine/neek.conf new file mode 100644 index 0000000000..10866f79c0 --- /dev/null +++ b/conf/machine/neek.conf @@ -0,0 +1,33 @@ +#@TYPE: Machine +#@NAME: NEEK machine +TARGET_ARCH = "nios2" + +# This is a machine configuration file for the +# NEEK (NIOS2 Embedded Evaluation Kit) +# the sof file used to develop/tst this is from +# http://www.nioswiki.com/@api/deki/files/487/=cycloneIII_embedded_evaluation_kit_standard.sof + +PREFERRED_PROVIDER_virtual/kernel = "linux-nios2" + +EXTRA_IMAGECMD_jffs2 = "-lnp " + +# Guesswork +SERIAL_CONSOLE = "115200 ttyS2" + + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + +require conf/machine/include/nios2.inc diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf index 95bfd40b23..0ebd2a0d6d 100644 --- a/conf/machine/om-3d7k.conf +++ b/conf/machine/om-3d7k.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-devel" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2" diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index ede2a2009e..0890d7184b 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -6,16 +6,9 @@ TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" - -# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel -PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.32" - -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 9733269d4f..0b826ded82 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -6,15 +6,9 @@ TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.32" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" - -# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel -PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31" - -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" # Override only for shr as it needs mesa-dri_git and ie angstrom has preferred_version set to 7.6 MACHINE_DRI_MODULES_shr = "glamo" @@ -46,6 +40,9 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-snd-soc-neo1973-gta02-wm8753 \ kernel-module-g-ether \ kernel-module-ar6000 \ + kernel-module-leds-s3c24xx \ + kernel-module-leds-pwm \ + kernel-module-leds-gpio \ " # no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0 @@ -90,5 +87,12 @@ module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753" #2.6.31 is using the same name as it was in gta01 module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" +module_autoload_ar6000 = "ar6000" +module_autoload_btusb = "btusb" +module_autoload_leds-s3c24xx = "leds-s3c24xx" +module_autoload_leds-pwm = "leds-pwm" +module_autoload_leds-gpio = "leds-gpio" + + # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf index b504723afa..7c72ba972a 100644 --- a/conf/machine/omap3-pandora.conf +++ b/conf/machine/omap3-pandora.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" -PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-omap3pandora" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" @@ -63,7 +63,6 @@ UBOOT_LOADADDRESS = "0x80008000" UBOOT_ARCH = "arm" UBOOT_MACHINE = "omap3_pandora_config" -PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora" PREFERRED_PROVIDER_x-load = "x-load-omap3pandora" PREFERRED_VERSION_u-boot-omap3pandora = "git" PREFERRED_VERSION_x-load-omap3pandora = "git" diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf index 097904d886..7bbc8217d6 100644 --- a/conf/machine/omap3evm.conf +++ b/conf/machine/omap3evm.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: omap3 EVM -#@DESCRIPTION: Machine configuration for the TI omap3 EVM +#@NAME: OMAP3 EVM +#@DESCRIPTION: Machine configuration for the TI OMAP3 EVM TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" @@ -18,14 +18,19 @@ require conf/machine/include/omap3.inc # Ship all kernel modules IMAGE_FSTYPES ?= "jffs2 tar.bz2" -EXTRA_IMAGECMD_jffs2 = "-lnp " +EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" SERIAL_CONSOLE = "115200 ttyS0" +USE_VT = "0" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_VERSION_u-boot = "git" + UBOOT_ARCH = "arm" UBOOT_MACHINE = "omap3_evm_config" +XLOAD_MACHINE = "omap3evm_config" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 9fcd76e87f..4989a33e9d 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -5,7 +5,8 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap" +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT="0x10c08000" diff --git a/conf/machine/palmpre.conf b/conf/machine/palmpre.conf index dccc892472..2a62c30728 100644 --- a/conf/machine/palmpre.conf +++ b/conf/machine/palmpre.conf @@ -26,5 +26,6 @@ IMAGE_FSTYPES += "tar.bz2" # Let's keep the following three from the beagleboard machine config UBOOT_MACHINE = "omap3_beagle_config" PREFERRED_VERSION_u-boot = "git" +XLOAD_MACHINE = "omap3530beagle_config" MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone bluetooth touchscreen keyboard wifi" diff --git a/conf/machine/palmz31.conf b/conf/machine/palmz31.conf index 0332952edc..9fb5f7ead9 100644 --- a/conf/machine/palmz31.conf +++ b/conf/machine/palmz31.conf @@ -11,9 +11,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "160" SERIAL_CONSOLE = "115200 ttyS0" -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-thumb.inc - MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \ kernel-module-i2c-algo-pxa \ kernel-module-i2c-dev \ diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf index 502c11a284..9766434690 100644 --- a/conf/machine/palmz72.conf +++ b/conf/machine/palmz72.conf @@ -11,9 +11,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "320" SERIAL_CONSOLE = "115200 ttyS0" -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-thumb.inc - MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \ kernel-module-i2c-algo-pxa \ kernel-module-i2c-dev \ diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index de76527167..606925cdc9 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -11,4 +11,4 @@ KERNEL_IMAGETYPE = "zImage" SERIAL_CONSOLE = "115200 ttyAMA0" -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_PROVIDER_virtual/kernel = "linux" diff --git a/conf/machine/qemumips.conf b/conf/machine/qemumips.conf index aa9c0cb2ed..4a2c1dc5e7 100644 --- a/conf/machine/qemumips.conf +++ b/conf/machine/qemumips.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for running an MIPS r4k platform system under qemu emulation TARGET_ARCH = "mips" - +FEED_ARCH = "${TARGET_ARCH}" require conf/machine/include/qemu.inc require conf/machine/include/tune-mips32.inc diff --git a/conf/machine/qemumipsel.conf b/conf/machine/qemumipsel.conf new file mode 100644 index 0000000000..28cdbcd7c5 --- /dev/null +++ b/conf/machine/qemumipsel.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: qemu MIPS (little-endian) Emulator setup +#@DESCRIPTION: Machine configuration for running an MIPS r4k platform system under qemu emulation + +TARGET_ARCH = "mipsel" +FEED_ARCH = "${TARGET_ARCH}" + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-mips32.inc + +KERNEL_IMAGETYPE = "vmlinux" +KERNEL_OUTPUT = "vmlinux" +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" diff --git a/conf/machine/qemuppc.conf b/conf/machine/qemuppc.conf new file mode 100644 index 0000000000..c2256782c0 --- /dev/null +++ b/conf/machine/qemuppc.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@NAME: QEMU PowerPC Emulator setup +#@DESCRIPTION: Machine configuration for running a PowerPC system under qemu emulation + +TARGET_ARCH = "powerpc" + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-ppc603e.inc + +KERNEL_IMAGETYPE = "vmlinux" +KERNEL_OUTPUT = "vmlinux" + +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" + diff --git a/conf/machine/qemush4.conf b/conf/machine/qemush4.conf new file mode 100644 index 0000000000..8ee723b140 --- /dev/null +++ b/conf/machine/qemush4.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: QEMU SH4 Emulator setup +#@DESCRIPTION: Machine configuration for running a SH4(rts7751r2dplus) system under qemu emulation + +TARGET_ARCH = "sh4" + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-sh4.inc + +KERNEL_IMAGETYPE = "zImage" + +SERIAL_CONSOLE = "115200 ttySC1" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" + diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf index 4b383be204..238493a16e 100644 --- a/conf/machine/qemux86.conf +++ b/conf/machine/qemux86.conf @@ -11,7 +11,7 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_PROVIDER_virtual/kernel = "linux" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/conf/machine/smartqv7.conf b/conf/machine/smartqv7.conf new file mode 100644 index 0000000000..1e4a5e90c9 --- /dev/null +++ b/conf/machine/smartqv7.conf @@ -0,0 +1,27 @@ +#@TYPE: Machine +#@Name: Smartdevices V7 +#@DESCRIPTION: Machine configuration for Smartdevices V7 + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +MACHINE_DISPLAY_WIDTH_PIXELS = "800" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "110" +GUI_MACHINE_CLASS = "bigscreen" +XSERVER = "xserver-kdrive-fbdev" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +MACHINE_KERNEL_PR = "r0" +KERNEL_IMAGETYPE = "zImage" + +# used by sysvinit +SERIAL_CONSOLE = "115200 ttySAC0" + +IMAGE_FSTYPES = "tar.gz" + +MACHINE_FEATURES = "kernel26 apm screen touchscreen alsa usbgadget usbhost" +MACHINE_EXTRA_RRECOMMENDS = "marvell-sdio-fw kernel-modules" + +require conf/machine/include/tune-arm1176jzf-s.inc diff --git a/conf/machine/tqm8540.conf b/conf/machine/tqm8540.conf index 7595f8a5dc..eece2ff4e9 100644 --- a/conf/machine/tqm8540.conf +++ b/conf/machine/tqm8540.conf @@ -10,8 +10,9 @@ MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot jffs2" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "1.3.2" UBOOT_MACHINE = "TQM8540_config" +UBOOT_ENTRYPOINT = "0" +UBOOT_LOADADDRESS = "0" EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000" diff --git a/conf/machine/xilinx-ml507.conf b/conf/machine/xilinx-ml507.conf index 693f904012..8c888b2ae7 100644 --- a/conf/machine/xilinx-ml507.conf +++ b/conf/machine/xilinx-ml507.conf @@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-ml507" KERNEL_IMAGETYPE = "uImage" -MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet" +MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet screen" MACHINE_EXTRA_RECOMMENDS = "kernel-modules" UBOOT_ARCH = "ppc" @@ -30,7 +30,7 @@ PREFERRED_VERSION_u-boot_xilinx-ml507 = "git" # XILINX_BOARD = "ml507" # Don't use tty1 -USE_VT = "0" +# USE_VT = "0" SERIAL_CONSOLE = "9600 ttyS0" # Device nodes add xsa for (system ace) diff --git a/conf/machine/xilinx-virtex4.conf b/conf/machine/xilinx-virtex4.conf new file mode 100644 index 0000000000..eeea44e6ab --- /dev/null +++ b/conf/machine/xilinx-virtex4.conf @@ -0,0 +1,37 @@ +# Copyright (C) 2010, Adrian Alonso <aalonso00@gmail.com> +# Released under the MIT license (see packages/COPYING) +#@TYPE: Machine +#@Name: Xilinx Virtex4 FPGA Development Platform +#@DESCRIPTION: Machine configuration for Xilinx Virtex4 family +# Supported targets +# ML403, ML405, ML410 + +TARGET_ARCH = "powerpc" +TARGET_CPU = "405" +TARGET_FPU = "soft" +#tune for the selected cpu +require conf/machine/include/tune-ppc405.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx" +PREFERRED_VERSION_u-boot_xilinx-virtex4 = "u-boot-xilinx" + +KERNEL_IMAGETYPE = "uImage" + +MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet" +MACHINE_EXTRA_RECOMMENDS = "kernel-modules" + +UBOOT_ENTRYPOINT ?= "0x00000000" +UBOOT_LOADADDRESS ?= "0x00000000" + +# Xilinx EDK override hardware definitions for xilinx-bsp +# Include in your local.conf +# XILINX_BSP_PATH = "complete path for Xilinx XPS project" +# XILINX_BOARD = "ml410" + +# Don't use tty1 +USE_VT = "0" +SERIAL_CONSOLE = "9600 ttyS0" + +# Device nodes add xsa for (system ace) +IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ + files/device_table_add-xsa.txt" diff --git a/conf/machine/xilinx-virtex5.conf b/conf/machine/xilinx-virtex5.conf new file mode 100644 index 0000000000..2e11b96949 --- /dev/null +++ b/conf/machine/xilinx-virtex5.conf @@ -0,0 +1,36 @@ +# Copyright (C) 2010, Adrian Alonso <aalonso00@gmail.com> +# Released under the MIT license (see packages/COPYING) +#@TYPE: Machine +#@Name: Xilinx Virtex5 FPGA Development Platforms +#@DESCRIPTION: Machine configuration for Xilinx Virtex5 boards +# Supported boards ML506, ML507, ML510 + +TARGET_ARCH = "powerpc" +TARGET_CPU = "440" +TARGET_FPU = "soft" +#tune for the 440 cpu +require conf/machine/include/tune-ppc440.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx" +PREFERRED_VERSION_u-boot_xilinx-virtex5 = "u-boot-xilinx" + +KERNEL_IMAGETYPE = "uImage" + +MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet screen" +MACHINE_EXTRA_RECOMMENDS = "kernel-modules" + +UBOOT_ENTRYPOINT ?= "0x00000000" +UBOOT_LOADADDRESS ?= "0x00000000" + +# Xilinx EDK override hardware definitions for xilinx-bsp +# Include in your local.conf +# XILINX_BSP_PATH = "complete path for Xilinx XPS project" +# XILINX_BOARD = "ml507" + +# Don't use tty1 +# USE_VT = "0" +SERIAL_CONSOLE = "9600 ttyS0" + +# Device nodes add xsa for (system ace) +IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ + files/device_table_add-xsa.txt" |