diff options
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/adsp-bf537-stamp.conf | 2 | ||||
-rw-r--r-- | conf/machine/adzs-bf538f-ezlite.conf | 3 | ||||
-rw-r--r-- | conf/machine/adzs-bf548-ezlite.conf | 19 | ||||
-rw-r--r-- | conf/machine/at91sam9260ek.conf | 2 | ||||
-rw-r--r-- | conf/machine/at91sam9261ek.conf | 2 | ||||
-rw-r--r-- | conf/machine/bd-neon.conf | 11 | ||||
-rw-r--r-- | conf/machine/dht-walnut.conf | 1 | ||||
-rw-r--r-- | conf/machine/em-x270.conf | 68 | ||||
-rw-r--r-- | conf/machine/epia.conf | 1 | ||||
-rw-r--r-- | conf/machine/fic-gta01.conf | 3 | ||||
-rw-r--r-- | conf/machine/fic-gta02.conf | 5 | ||||
-rw-r--r-- | conf/machine/ghi270.conf | 46 | ||||
-rw-r--r-- | conf/machine/i586-generic.conf | 1 | ||||
-rw-r--r-- | conf/machine/i686-generic.conf | 1 | ||||
-rw-r--r-- | conf/machine/magicbox.conf | 1 | ||||
-rw-r--r-- | conf/machine/magician.conf | 5 | ||||
-rw-r--r-- | conf/machine/sequoia.conf | 1 | ||||
-rw-r--r-- | conf/machine/x86-32-nocona.conf | 2 | ||||
-rw-r--r-- | conf/machine/x86-prescott.conf | 2 |
19 files changed, 154 insertions, 22 deletions
diff --git a/conf/machine/adsp-bf537-stamp.conf b/conf/machine/adsp-bf537-stamp.conf index 2a8fd640e7..2bbbf48666 100644 --- a/conf/machine/adsp-bf537-stamp.conf +++ b/conf/machine/adsp-bf537-stamp.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "bfin" -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel = "linux-bfin" PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 diff --git a/conf/machine/adzs-bf538f-ezlite.conf b/conf/machine/adzs-bf538f-ezlite.conf index 5078789402..9548b22b90 100644 --- a/conf/machine/adzs-bf538f-ezlite.conf +++ b/conf/machine/adzs-bf538f-ezlite.conf @@ -2,10 +2,9 @@ #@Name: Analog Devices blackfin platfrom #@DESCRIPTION: ADSP-BF538(F) EZ-KIT Board (http://www.analog.com/en/epHSProd/0,,BF538-HARDWARE,00.html) - TARGET_ARCH = "bfin" -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel = "linux-bfin" PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 diff --git a/conf/machine/adzs-bf548-ezlite.conf b/conf/machine/adzs-bf548-ezlite.conf new file mode 100644 index 0000000000..35c9217339 --- /dev/null +++ b/conf/machine/adzs-bf548-ezlite.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@Name: Analog Devices blackfin platfrom +#@DESCRIPTION: ADSP-BF548 EZ-LITE KIT Board (http://www.analog.com/en/epHSProd/0,,BF548-HARDWARE,00.html) + +TARGET_ARCH = "bfin" + +KERNEL_IMAGETYPE = "vmlinux" + +PREFERRED_PROVIDER_virtual/kernel = "linux-bfin" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200" + diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index f00938cc4e..07616915aa 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -19,4 +19,4 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" SERIAL_CONSOLE = "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" -require.inc/machine/include/tune-arm926ejs.inc +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf index e59dacbc86..b6ccd7ef0d 100644 --- a/conf/machine/at91sam9261ek.conf +++ b/conf/machine/at91sam9261ek.conf @@ -19,4 +19,4 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" SERIAL_CONSOLE = "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" -require.inc/machine/include/tune-arm926ejs.inc +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf index bd6354a2e4..fe7ff724fd 100644 --- a/conf/machine/bd-neon.conf +++ b/conf/machine/bd-neon.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Boundary Devices NEON -#@DESCRIPTION: Machine.inciguration for the Boundary Devices NEON board +#@DESCRIPTION: Machine configuration for the Boundary Devices NEON board # # Hardware-based properties @@ -9,10 +9,10 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require.inc/machine/include/tune-xscale.inc +require conf/machine/include/tune-xscale.inc # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#require.inc/machine/include/tune-iwmmxt.inc +#require conf/machine/include/tune-iwmmxt.inc ROOT_FLASH_SIZE = "60" VOLATILE_STORAGE_SIZE = "128" @@ -22,10 +22,11 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget screen uboot" # # Software/packages selection # -PREFERRED_PROVIDER_virtual/kernel = "linux-bd-neon-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PERFERRED_VERSION_linux = "2.6.22" + MODUTILS = "26" XSERVER = "xserver-kdrive-fbdev" -MACHINE_TASK_PROVIDER = "task-base" PREFERRED_VERSION_u-boot = "1.1.2" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index ead6a83282..c31aecd550 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -11,7 +11,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" UBOOT_ENTRYPOINT = "0" MACHINE_FEATURES = "kernel26 ext2" -MACHINE_TASK_PROVIDER = "task-base" TARGET_CPU = "405" OLDEST_KERNEL = "2.6.18" diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf new file mode 100644 index 0000000000..95ba519d3b --- /dev/null +++ b/conf/machine/em-x270.conf @@ -0,0 +1,68 @@ +#@TYPE: Machine +#@NAME: EM-X270 +#@DESCRIPTION: Machine configuration for the CompuLab EM-X270 with a pxa27x CPU + +# +# Hardware-based properties +# +TARGET_ARCH = "arm" +GUI_MACHINE_CLASS ?= "bigscreen" + +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " +PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" + +# 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 + +require conf/machine/include/tune-xscale.inc + +ROOT_FLASH_SIZE = "128" +IMAGE_CMD_jffs2 = " \ +/usr/sbin/mkfs.jffs2 --root=${IMAGE_ROOTFS} \ + --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + --eraseblock=0x20000 --pad --faketime -n; \ +/usr/sbin/sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 0x20000 -p; \ + cd ${DEPLOY_DIR_IMAGE}; \ + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ + ln -fs ${IMAGE_NAME}.rootfs-summary.jffs2 \ + ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \ +" + +#VOLATILE_STORAGE_SIZE = "128" +MACHINE_DISPLAY_WIDTH_PIXELS ?= "480" +MACHINE_DISPLAY_HEIGHT_PIXELS ?= "640" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth wifi usbhost usbgadget screen phone " + +# +# Software/packages selection +# + +#PCMCIA_MANAGER = "pcmciautils" +PREFERRED_VERSION_em-x270 = "2.6.23" +MODUTILS = "26" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +#PREFERRED_VERSION_orinoco-modules = "0.15rc1" + +MACHINE_EXTRA_RDEPENDS = "" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-utf8 \ + " + +# +# Modules autoload and other boot properties +# +module_autoload_evdev = "evdev" +module_autoload_mmc_block = "mmc_block" +module_autoload_pxa27x_udc = "pxa27x_udc" + +#FIXME: this should be controlled by a userspace utility later. +module_autoload_g_ether = "g_ether" + +SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 69d5e66171..b423f83f00 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -13,6 +13,5 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" -MACHINE_TASK_PROVIDER = "task-base" require conf/machine/include/tune-c3.inc diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index ffd3584da6..bd14df5814 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -5,7 +5,8 @@ #----------------------------------------------------------------------------- TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" +MACHINE_CLASS = "neo1973" +PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index ac85afc48c..1760424fc8 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -5,7 +5,8 @@ #----------------------------------------------------------------------------- TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" +MACHINE_CLASS = "neo1973" +PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" @@ -46,4 +47,4 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" include conf/machine/include/tune-arm920t.inc # build YAFFS2 -IMAGE_FSTYPES =+ "yaffs2" +IMAGE_FSTYPES ?= "jffs2 yaffs2" diff --git a/conf/machine/ghi270.conf b/conf/machine/ghi270.conf new file mode 100644 index 0000000000..3536485cab --- /dev/null +++ b/conf/machine/ghi270.conf @@ -0,0 +1,46 @@ +#@TYPE: Machine +#@NAME: GHI270 / DuraMax H / DuraMaxHG +#@DESCRIPTION: Machine configuration for the GHI270 platform with a pxa27x CPU + +# +# Hardware-based properties +# +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " + +# 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 + +EXTRA_IMAGECMD_jffs2_ghi270 = "-p -n -e 16KiB" + +ROOT_FLASH_SIZE = "64" +VOLATILE_STORAGE_SIZE = "64" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.21-hh11" + +PCMCIA_MANAGER = "pcmciautils" +MODUTILS = "26" + +#PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" + +#PREFERRED_VERSION_orinoco-modules = "0.15rc1" + +# +# Modules autoload and other boot properties +# + +#FIXME: this should be controlled by a userspace utility later. +module_autoload_g_ether = "g_ether" + +SERIAL_CONSOLE = "115200 ttySA0" diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index 53e088da1c..f2a1869b99 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -21,7 +21,6 @@ IMAGE_FSTYPES = "ext2.gz" MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -MACHINE_TASK_PROVIDER = "task-base" #tune for pentium cpu diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index b8e73f3085..5399316cd5 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -20,7 +20,6 @@ IMAGE_FSTYPES = "ext2.gz" MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -MACHINE_TASK_PROVIDER = "task-base" #tune for pentium pro cpu require conf/machine/include/tune-pentiumpro.inc diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf index 178c242056..9839b6d69e 100644 --- a/conf/machine/magicbox.conf +++ b/conf/machine/magicbox.conf @@ -12,7 +12,6 @@ PACKAGE_EXTRA_ARCHS = "ppc405" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" MACHINE_FEATURES = "kernel26" -MACHINE_TASK_PROVIDER = "task-base" TARGET_CPU = "405" OLDEST_KERNEL = "2.6.18" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index f7451cccb0..900b24b751 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -14,11 +14,13 @@ 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 -ROOT_FLASH_SIZE = "80" +ROOT_FLASH_SIZE = "60" VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "142" MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" MACHINE_FEATURES += "iwmmxt" @@ -34,6 +36,7 @@ IMAGE_FSTYPES = "tar.bz2" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" MODUTILS = "26" XSERVER = "xserver-kdrive-fbdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_VERSION_orinoco-modules = "0.15rc1" diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf index 72f0a8feb2..b391f4e277 100644 --- a/conf/machine/sequoia.conf +++ b/conf/machine/sequoia.conf @@ -11,7 +11,6 @@ PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc440e" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" MACHINE_FEATURES = "kernel26 usbhost" -MACHINE_TASK_PROVIDER = "task-base" #don't try to access tty1 USE_VT = "0" diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf index e52454ed52..20b5a11770 100644 --- a/conf/machine/x86-32-nocona.conf +++ b/conf/machine/x86-32-nocona.conf @@ -19,5 +19,5 @@ IMAGE_FSTYPES = "ext2.gz" MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -MACHINE_TASK_PROVIDER = "task-base" + diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf index bd96c387b6..6a91bc39fb 100644 --- a/conf/machine/x86-prescott.conf +++ b/conf/machine/x86-prescott.conf @@ -18,5 +18,5 @@ IMAGE_FSTYPES = "ext2.gz" MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -MACHINE_TASK_PROVIDER = "task-base" + |