diff options
Diffstat (limited to 'conf/machine')
43 files changed, 300 insertions, 73 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 4afa515c32..ae089a17a8 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc PACKAGE_EXTRA_ARCHS += "iwmmxt" diff --git a/conf/machine/at91sam9m10ekes.conf b/conf/machine/at91sam9m10ekes.conf index 63d97a88ef..9b00e64127 100644 --- a/conf/machine/at91sam9m10ekes.conf +++ b/conf/machine/at91sam9m10ekes.conf @@ -13,10 +13,14 @@ include conf/machine/include/at91-lcd.inc # Supported u-boot machines #UBOOT_MACHINE = "at91sam9m10g45ek_nandflash_config" #UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_config" -UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config" +#UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config" #UBOOT_MACHINE = "at91sam9m10g45ek_config" +UBOOT_MACHINE = "at91sam9m10g45ek_sd" -AT91BOOTSTRAP_BOARD = "at91sam9g45df at91sam9g45ek at91sam9g45nf" +#UBOOT_MACHINES = "at91sam9m10g45ek_sd at91sam9m10g45ek_nandflash at91sam9m10g45ek_dataflash" +UBOOT_MACHINES = "at91sam9m10g45ek_sd at91sam9m10g45ek_nandflash at91sam9m10g45ek_dataflash" + +AT91BOOTSTRAP_BOARD = "at91sam9m10dfes at91sam9m10ekes at91sam9m10nfes at91sam9m10sdu" MACHINE_FEATURES += "usbhost" diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index ce480193f8..bd2b8dd81c 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -15,13 +15,13 @@ GUI_MACHINE_CLASS = "bigscreen" require conf/machine/include/omap3.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap" IMAGE_FSTYPES += "tar.bz2 ubi" EXTRA_IMAGECMD_jffs2 = "-lnp " # Guesswork -SERIAL_CONSOLE = "115200 ttyS2" +SERIAL_CONSOLE = "115200 ttyO2" UBOOT_MACHINE = "omap3_beagle_config" diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf index fd4aba48f8..68c37bfe0e 100644 --- a/conf/machine/ben-nanonote.conf +++ b/conf/machine/ben-nanonote.conf @@ -5,13 +5,22 @@ TARGET_ARCH = "mipsel" require conf/machine/include/tune-mips32.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben-nanonote" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel_jlime = "linux-jlime-ben-nanonote" # With 2.6.37 there is not yet uImage target (pending patches) #KERNEL_IMAGETYPE = "uImage" KERNEL_IMAGETYPE = "vmlinux.bin" -IMAGE_FSTYPES ?= "jffs2" +CMDLINE = "console=ttyS0,57600n8 console=tty0 mem=32M" + +UBOOT_LOADADDRESS = "0x80010000" + +# Dynamic entrypoint +#UBOOT_ENTRYPOINT = +UBOOT_ENTRYSYMBOL = "kernel_entry" + +IMAGE_FSTYPES ?= "jffs2 tar.gz" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" @@ -23,10 +32,3 @@ MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "320" MACHINE_DISPLAY_HEIGHT_PIXELS = "240" LOGO_SIZE = "qvga" - -################################## -# build kexecboot kernel while -# making sure rootfs is compatible -################################## - -# require conf/machine/include/initramfs-kexecboot.inc diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf index e45629d191..1d301c7c85 100644 --- a/conf/machine/bug.conf +++ b/conf/machine/bug.conf @@ -21,7 +21,8 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "240" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ xf86-input-evdev \ - xf86-input-tslib \ xf86-input-mouse \ xf86-video-fbdev \ xf86-input-keyboard" + +PREFERRED_PROVIDER_udev-compat = "udev-compat141" diff --git a/conf/machine/bug20.conf b/conf/machine/bug20.conf index 95ce49c7f5..36de8eb685 100644 --- a/conf/machine/bug20.conf +++ b/conf/machine/bug20.conf @@ -20,7 +20,8 @@ GUI_MACHINE_CLASS = "bigscreen" require conf/machine/include/omap3.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-omap-hah" +PREFERRED_PROVIDER_virtual/kernel = "linux-bug20-linaro" +MACHINE_KERNEL_PR = "r103" IMAGE_FSTYPES += "tar.bz2 ubi" EXTRA_IMAGECMD_jffs2 = "-lnp " diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 68c9ba4263..f5ec1325a2 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc # NAND factory-default diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 66995e9b09..a0d710cbfc 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "14" diff --git a/conf/machine/exopcslate.conf b/conf/machine/exopcslate.conf new file mode 100644 index 0000000000..d7eb86bf53 --- /dev/null +++ b/conf/machine/exopcslate.conf @@ -0,0 +1,42 @@ +#@TYPE: Machine +#@NAME: exocpslate +#@DESCRIPTION: Machine configuration for the ExoPC Slate machine + + +TARGET_ARCH = "i686" + +PREFERRED_VERSION_linux = "2.6.37" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xserver-xorg-extension-glx \ + xserver-xorg-extension-dri \ + xf86-input-tslib \ + xf86-input-evdev \ + xf86-input-evtouch \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-video-fbdev \ +" + + +KERNEL_IMAGETYPE = "bzImage" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +IMAGE_FSTYPES ?= "tar.gz" +IMAGE_DEVICE_TABLES = " \ + files/device_table-minimal.txt \ + files/device_table_add-loop.txt \ + files/device_table_add-scsi.txt \ +" + +MACHINE_FEATURES = "kernel26 apm alsa bluetooth wifi vfat phone screen touchscreen keyboard pci usbhost acpi ext2 ext3 ext4 x86" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" + +module_autoload_hci_usb = "hci_usb" +module_autoload_g_ether = "g_ether" + +require conf/machine/include/tune-atom.inc + diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index eec87a3ed5..19e76625f3 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -6,7 +6,11 @@ TARGET_ARCH = "arm" # Set preferred providers PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" +PREFERRED_PROVIDER_virtual/kernel = "linux" + +KERNEL_IMAGETYPE = "uImage" +UBOOT_LOADADDRESS = "0x30108000" +UBOOT_ENTRYPOINT = "0x30108000" # Set features for task-base MACHINE_GUI_CLASS = "smallscreen" diff --git a/conf/machine/htcdream.conf b/conf/machine/htcdream.conf index 998b8fdf62..1e38fd67c3 100644 --- a/conf/machine/htcdream.conf +++ b/conf/machine/htcdream.conf @@ -26,7 +26,6 @@ XSERVER = " \ xserver-xorg \ xserver-xorg-extension-glx \ xserver-xorg-extension-dri \ - xf86-input-tslib \ xf86-input-evdev \ xf86-input-mouse \ xf86-input-keyboard \ diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 474454ab31..70e4a1efae 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -29,13 +29,14 @@ MACHINE_FEATURES += "iwmmxt" # # Software/packages selection # -PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux" PCMCIA_MANAGER = "pcmciautils" MODUTILS = "26" -XSERVER = "xserver-kdrive-w100" - -PREFERRED_VERSION_orinoco-modules = "0.15rc1" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-video-fbdev" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" MACHINE_EXTRA_RRECOMMENDS = "\ diff --git a/conf/machine/include/at91-2.6.30.inc b/conf/machine/include/at91-2.6.30.inc index e245b15363..37a7188cbb 100644 --- a/conf/machine/include/at91-2.6.30.inc +++ b/conf/machine/include/at91-2.6.30.inc @@ -7,10 +7,10 @@ SOC_FAMILY = "at91" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.30" -PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13" -PREFERRED_VERSION_at91bootstrap = "2.13" +PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap" +PREFERRED_VERSION_at91bootstrap = "3.0" -PREFERRED_PROVIDER_u-boot = "u-boot_2009.11" +PREFERRED_PROVIDER_u-boot = "u-boot" PREFERRED_VERSION_u-boot = "2009.11" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/include/imx28.inc b/conf/machine/include/imx28.inc new file mode 100644 index 0000000000..b50f000a3b --- /dev/null +++ b/conf/machine/include/imx28.inc @@ -0,0 +1,19 @@ +SOC_FAMILY = "mx28" +TARGET_ARCH = "arm" + +require conf/machine/include/tune-arm926ejs.inc + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" + +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r0" + +KERNEL_IMAGETYPE = "uImage" + +UBOOT_ENTRYPOINT = "0x40008000" +UBOOT_LOADADDRESS = "0x40008000" + +EXTRA_IMAGEDEPENDS += "u-boot" + +IMAGE_FSTYPES += "jffs2 tar.bz2" + diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 9700a7aa3f..c762d41797 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" 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 = "r100" +MACHINE_KERNEL_PR = "r102" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/include/palmpre.inc b/conf/machine/include/palmpre.inc index f5d64052c8..7c22bccbc2 100644 --- a/conf/machine/include/palmpre.inc +++ b/conf/machine/include/palmpre.inc @@ -19,7 +19,7 @@ require conf/machine/include/omap3.inc # Copied from include/omap3.inc (as we do not use linux-omap recipes): # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r93" +MACHINE_KERNEL_PR = "r94" PREFERRED_PROVIDER_virtual/kernel = "linux-palmpre" @@ -34,10 +34,12 @@ MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone blueto MACHINE_EXTRA_RDEPENDS = " \ tsmd \ read-tokens \ - tellbootie \ lvm2 \ palmpre-audio-scripts \ compat-wireless-2.6-old \ + kernel-module-sirloin-wifi \ + marvell-license \ + marvell-sdio-fw \ " PREFERRED_PROVIDER_udev-compat = "udev-compat141" diff --git a/conf/machine/include/ti814x.inc b/conf/machine/include/ti814x.inc index 8fa7ee9a49..3e7ee76367 100644 --- a/conf/machine/include/ti814x.inc +++ b/conf/machine/include/ti814x.inc @@ -3,7 +3,7 @@ SOC_FAMILY = "ti814x" require conf/machine/include/tune-cortexa8.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-omap3" +PREFERRED_PROVIDER_virtual/kernel = "linux-ti81xx-psp" PREFERRED_PROVIDER_virtual/bootloader = "u-boot" # Increase this everytime you change something in the kernel diff --git a/conf/machine/include/ti816x.inc b/conf/machine/include/ti816x.inc index ef562647e9..57bd89f00f 100644 --- a/conf/machine/include/ti816x.inc +++ b/conf/machine/include/ti816x.inc @@ -3,16 +3,16 @@ SOC_FAMILY = "ti816x" require conf/machine/include/tune-cortexa8.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-omap3" +PREFERRED_PROVIDER_virtual/kernel = "linux-ti81xx-psp" PREFERRED_PROVIDER_virtual/bootloader = "u-boot" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r1" +MACHINE_KERNEL_PR = "r2" KERNEL_IMAGETYPE = "uImage" UBOOT_ARCH = "arm" -UBOOT_MACHINE = "ti816x_evm_config" +UBOOT_MACHINE = "ti8168_evm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc index 44058c12be..01c41d3001 100644 --- a/conf/machine/include/tune-atom.inc +++ b/conf/machine/include/tune-atom.inc @@ -6,4 +6,4 @@ TARGET_CC_ARCH = "-march=core2" #TARGET_CC_ARCH = "-march=i686 -mtune=atom" BASE_PACKAGE_ARCH = "i686" FEED_ARCH = "i686" -PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
\ No newline at end of file +PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586 i686" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc index fe57c9ccc0..ac584e3e38 100644 --- a/conf/machine/include/tune-strongarm.inc +++ b/conf/machine/include/tune-strongarm.inc @@ -6,3 +6,6 @@ TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" FEED_ARCH = "armv4" BASE_PACKAGE_ARCH = "armv4" PACKAGE_EXTRA_ARCHS += "armv4" + +ARM_INSTRUCTION_SET = "arm" +THUMB_INTERWORK = "no" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus.inc index 862424a01c..9cbe056bdb 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus.inc @@ -22,9 +22,12 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ cat ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" - EXTRA_IMAGEDEPENDS += "zaurus-installer" +IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ + files/device_table_add-scsi.txt \ + files/device_table_add-loop.txt \ + " ######### # xserver (FIXME: xserver-xorg is in testing on spitz) @@ -55,24 +58,16 @@ PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri" # kernel ######## -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" - -# Starting with 2.6.32 linux-rp is deprecated for some models -#PREFERRED_PROVIDER_virtual/kernel = "linux" -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" +PREFERRED_PROVIDER_virtual/kernel = "linux" # Default bootloader expects "zImage", use "uImage" for u-boot # Note: kexecboot can boot both kind of images ZAURUS_KERNEL_IMAGETYPE ?= "zImage" KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" +# sane defaults for devices with only 32Mb RAM (see man xz) +XZ_COMPRESSION_LEVEL = "-e -7" + # kernel bootlogo LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}' @@ -87,26 +82,23 @@ SERIAL_CONSOLE_collie = "115200 ttySA0" PCMCIA_MANAGER ?= "pcmciautils" +CMDLINE_akita = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" +CMDLINE_c7x0 = "console=ttyS0,115200n8 console=tty1" +CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1" +CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" +CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" +CMDLINE_tosa = "console=ttyS0,115200n8 console=tty1" + MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" -MACHINE_FEATURES_append_akita = " usbhost " -MACHINE_FEATURES_append_spitz = " usbhost " +MACHINE_FEATURES_append_akita = " usbhost" +MACHINE_FEATURES_append_spitz = " usbhost" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" MACHINE_EXTRA_RDEPENDS_collie = "zaurusd" -# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel -# Fixme ? module-snd for collie -MACHINE_EXTRA_RRECOMMENDS_collie = "" -MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" -MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" -MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" -MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -# For tosa: OHCI suspend/resume fixup -# wlan-ng is now in kernel (2.6.29) -# Fixme ? module-snd for tosa -MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" - +# Still actual? OHCI suspend/resume fixup +# MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" ################################## # build kexecboot kernel while @@ -114,3 +106,25 @@ MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" ################################## require conf/machine/include/initramfs-kexecboot.inc + +# FIXME +# blindly import from linux-rp.inc (2.6.2x) +# +module_autoload_pxaficp_ir = "pxaficp_ir" +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_pcmcia_core = "pcmcia_core" +module_autoload_pxa2xx_cs = "pxa2xx_cs" +module_autoload_ohci-hcd_tosa = "ohci-hcd" +module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi" +module_autoload_snd-soc-spitz_akita = "snd-soc-spitz" +module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz" +module_autoload_snd-soc-poodle_poodle = "snd-soc-poodle" +module_autoload_locomo-spi_collie = "locomo-spi" +module_autoload_mmc_block_collie = "mmc_block" +module_autoload_mmc_spi = "mmc-spi" +module_autoload_locomokbd_collie = "locomokbd" +module_autoload_sa1100-cs_collie = "sa1100_cs" +module_autoload_collie-ts_collie = "collie-ts" +module_autoload_leds-locomo_collie = "leds-locomo" +module_autoload_power_collie = "power" +# Fixme ? module-snd for tosa diff --git a/conf/machine/mx28evk.conf b/conf/machine/mx28evk.conf new file mode 100644 index 0000000000..823b5026db --- /dev/null +++ b/conf/machine/mx28evk.conf @@ -0,0 +1,23 @@ +#@Name: Freescale i.MX28 Evaluation Kit +#@DESCRIPTION: Machine configuration for Freescale i.MX28 Evaluation Kit +#@Homepage: http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=MCIMX28EVKJ&fr=g + +UBOOT_MACHINE = "mx28_evk_config" + +PREFERRED_PROVIDER_virtual/kernel = "linux-imx" + +MACHINE_FEATURES = "kernel26 apm alsa ext2 usbhost usbgadget screen" + +MACHINE_GUI_CLASS = "bigscreen" +LOGO_SIZE = "vga" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +require conf/machine/include/imx28.inc + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyAM0" + +ROOT_FLASH_SIZE = "128" + diff --git a/conf/machine/nexusone.conf b/conf/machine/nexusone.conf new file mode 100644 index 0000000000..83422302a1 --- /dev/null +++ b/conf/machine/nexusone.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: Nexus One +#@DESCRIPTION: Machine configuration for Nexus One smartphone + +require conf/machine/include/htc-qsd8.inc + +XSERVER = " \ + xserver-xorg \ + xserver-xorg-extension-glx \ + xserver-xorg-extension-dri \ + xf86-input-evdev \ + xf86-video-fbdev \ +" + +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "800" + +PREFERRED_PROVIDER_virtual/kernel = "linux-nexusone" + +KERNEL_IMAGETYPE = "zImage" + +MACHINE_FEATURES = "kernel26 mmc mmcroot screen touchscreen usbgadget wifi phone" diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf index 39409afc81..4b4009261c 100644 --- a/conf/machine/nokia900.conf +++ b/conf/machine/nokia900.conf @@ -6,6 +6,7 @@ TARGET_ARCH = "arm" SOC_FAMILY = "omap3" require conf/machine/include/tune-cortexa8.inc +require conf/machine/include/initramfs-kexecboot.inc PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ @@ -48,6 +49,15 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-twl4030-pwrbutton \ kernel-module-wl1251-spi \ kernel-module-ubifs \ + kernel-module-af-packet \ + kernel-module-snd-soc-rx51 \ + kernel-module-snd-soc-tlv320aic3x \ + kernel-module-snd-soc-omap \ + kernel-module-musb-hdrc \ + kernel-module-twl4030-usb \ + kernel-module-bq27x00-battery \ + kernel-module-cmt-speech \ + kernel-module-hsi-char \ " GUI_MACHINE_CLASS = "bigscreen" @@ -55,6 +65,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "800" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" KERNEL_IMAGETYPE = "uImage" +KERNEL_IMAGETYPE_pn-linux-kexecboot = "zImage" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" @@ -83,16 +94,28 @@ UBINIZE_ARGS = "-m 2048 -p 131072 -s 2048 -O 2048" IMAGE_FSTYPES ?= "jffs2 tar.gz" -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel = "linux-nokia900-meego" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat keyboard" -module_autoload_g_ether = "g_ether" - +module_autoload_rtc-twl = "rtc-twl" +module_autoload_g-nokia = "g-nokia" +module_autoload_musb-hdrc = "musb-hdrc" +module_autoload_twl4030-usb = "twl4030-usb" +module_autoload_omap-ssi = "omap-ssi" +module_autoload_isp1704-charger = "isp1704-charger" +module_autoload_bq27x00-battery = "bq27x00-battery" +module_autoload_af-packet = "af-packet" +module_autoload_snd-soc-rx51 = "snd-soc-rx51" +module_autoload_snd-soc-tlv320aic3x = "snd-soc-tlv320aic3x" +module_autoload_wl1251-spi = "wl1251-spi" +module_autoload_snd-soc-omap = "snd-soc-omap" +module_autoload_cmt-speech = "cmt-speech" +module_autoload_hsi-char = "hsi-char" # Copied from include/omap3.inc (as we do not use linux-omap recipes): # # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r58" +MACHINE_KERNEL_PR = "r65" diff --git a/conf/machine/nonworking/.mtn2git_empty b/conf/machine/nonworking/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/conf/machine/nonworking/.mtn2git_empty +++ /dev/null diff --git a/conf/machine/er0100.conf b/conf/machine/nonworking/er0100.conf index f20d6ae8e3..f20d6ae8e3 100644 --- a/conf/machine/er0100.conf +++ b/conf/machine/nonworking/er0100.conf diff --git a/conf/machine/geodegx.conf b/conf/machine/nonworking/geodegx.conf index 0ec6782076..0ec6782076 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/nonworking/geodegx.conf diff --git a/conf/machine/hx2000.conf b/conf/machine/nonworking/hx2000.conf index c9957e2b2f..c9957e2b2f 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/nonworking/hx2000.conf diff --git a/conf/machine/mnci.conf b/conf/machine/nonworking/mnci.conf index 9f6a0d8385..9f6a0d8385 100644 --- a/conf/machine/mnci.conf +++ b/conf/machine/nonworking/mnci.conf diff --git a/conf/machine/mtx-1.conf b/conf/machine/nonworking/mtx-1.conf index 7db19696fa..7db19696fa 100644 --- a/conf/machine/mtx-1.conf +++ b/conf/machine/nonworking/mtx-1.conf diff --git a/conf/machine/mtx-2.conf b/conf/machine/nonworking/mtx-2.conf index 67cc5bf185..67cc5bf185 100644 --- a/conf/machine/mtx-2.conf +++ b/conf/machine/nonworking/mtx-2.conf diff --git a/conf/machine/wrt54.conf b/conf/machine/nonworking/wrt54.conf index 1b07df2666..1b07df2666 100644 --- a/conf/machine/wrt54.conf +++ b/conf/machine/nonworking/wrt54.conf diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index d952ad75d9..d14b0fdd9a 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -21,7 +21,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" XSERVER ?= "xserver-xorg \ - xf86-input-tslib \ xf86-input-evdev \ xf86-video-fbdev \ xf86-input-keyboard \ diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index bd103ce55e..033190cce1 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -23,7 +23,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" XSERVER ?= "xserver-xorg \ - xf86-input-tslib \ xf86-input-evdev \ xf86-video-glamo \ xf86-input-keyboard \ @@ -37,6 +36,8 @@ READER_UI = "gtk" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-s3cmci \ + kernel-module-snd-soc-s3c24xx \ + kernel-module-snd-soc-wm8753 \ kernel-module-snd-soc-neo1973-wm8753 \ kernel-module-snd-soc-neo1973-gta02-wm8753 \ kernel-module-g-ether \ @@ -87,6 +88,8 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native qi qi-ubi" 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_snd-soc-wm8753 = "snd-soc-wm8753" +module_autoload_snd-soc-s3c24xx = "snd-soc-s3c24xx" module_autoload_ar6000 = "ar6000" module_autoload_btusb = "btusb" diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf index 88389250f2..1bdf4fd19a 100644 --- a/conf/machine/p2020rdb.conf +++ b/conf/machine/p2020rdb.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "powerpc" -PREFERRED_PROVIDER_virtual/kernel ?= "linux" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-powerpc-fsl" MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" diff --git a/conf/machine/picosam9.conf b/conf/machine/picosam9.conf new file mode 100644 index 0000000000..8e727003e5 --- /dev/null +++ b/conf/machine/picosam9.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@Name: pico-SAM9G45 (http://www.mini-box.com/pico-SAM9G45-X) +#@DESCRIPTION: Machine configuration for the picoSAM9G45 board with a at91sam9g45 processor + +# More information can be found here: +# http://arm.mini-box.com/index.php?title=Compiling_Angstrom_for_pico-SAM9G45 +# Images tested: base-image and x11-image + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/kernel = "picosam9" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +MACHINE_FEATURES += "usbhost kernel26 apm vfat screen touchscreen ethernet wifi bluetooth" + +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index db7a7809a7..d1bcb154b2 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "22" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf index 238493a16e..d58e3df3d7 100644 --- a/conf/machine/qemux86.conf +++ b/conf/machine/qemux86.conf @@ -2,8 +2,8 @@ #@NAME: qemu x86 Emulator setup #@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation -require conf/machine/include/qemu.inc require conf/machine/i686-generic.conf +require conf/machine/include/qemu.inc MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 0b5331eb44..4019bca4fb 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc MACHINE_FEATURES += "iwmmxt" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index fd1e477465..ab12b8bd56 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-6000 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "28" diff --git a/conf/machine/vmx25.conf b/conf/machine/vmx25.conf index 2d82dd2ae4..e8adfd5baa 100644 --- a/conf/machine/vmx25.conf +++ b/conf/machine/vmx25.conf @@ -31,3 +31,9 @@ require conf/machine/include/tune-arm926ejs.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttymxc0" + +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n \ + --pad ; sumtool --eraseblock=0x20000 -n \ + --littleendian --pad \ + -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary" diff --git a/conf/machine/vulcano-g20.conf b/conf/machine/vulcano-g20.conf new file mode 100644 index 0000000000..98072f5da5 --- /dev/null +++ b/conf/machine/vulcano-g20.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@Name: Metodo2 Vulcano G20 Board +#@DESCRIPTION: Machine configuration for Metodo2 VulcanoG20 module with AT91SAM9G20 + +include conf/machine/include/at91-2.6.30.inc + +#PREFERRED_VERSION_linux = "2.6.30" + +# Has linux config file in OpenEmbedded +#LINUX26_DEFCONFIG = "at91sam9g20ek_defconfig" + +UBOOT_MACHINE = "vulcano-g20_nandflash_config" +#UBOOT_MACHINE = "vulcano-g20_dataflash_cs1_config" +# UBOOT_MACHINE = "vulcano-g20_config" + +AT91BOOTSTRAP_BOARD = "vulcano-g20 vulcano-g20df vulcano-g20nf" + +MACHINE_FEATURES += "usbhost" + +#Vulcano with 64MB NAND +#EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -s 0x200 -n -e 16KiB" diff --git a/conf/machine/warpcomm.conf b/conf/machine/warpcomm.conf new file mode 100644 index 0000000000..01d9c5e360 --- /dev/null +++ b/conf/machine/warpcomm.conf @@ -0,0 +1,21 @@ +#@NAME: ARM based Warpcomm + +MACHINE_EXTRA_RDEPENDS = "u-boot-utils" +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" + +# 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 4096 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 4096" + +# 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/kirkwood.inc |