diff options
Diffstat (limited to 'conf/machine')
165 files changed, 584 insertions, 312 deletions
diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf index de450b14d1..22718b806e 100644 --- a/conf/machine/acern30.conf +++ b/conf/machine/acern30.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -35,4 +35,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index de94f560f9..0f5eaca9cc 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -6,5 +6,8 @@ require conf/machine/include/zaurus-2.6.inc require conf/machine/include/zaurus-clamshell.inc PACKAGE_EXTRA_ARCHS += "iwmmxt" +MACHINE_FEATURES += "iwmmxt" + +IMAGE_FSTYPES ?= "jffs2" ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf index adb8f23fa3..29af29a3b8 100644 --- a/conf/machine/alix.conf +++ b/conf/machine/alix.conf @@ -5,9 +5,9 @@ # http://pcengines.ch/alix1c.htm # i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html -TARGET_ARCH = "i686" +TARGET_ARCH = "i586" -PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" +PACKAGE_EXTRA_ARCHS = "x86 i386 i486 geode" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" @@ -17,8 +17,12 @@ GLIBC_EXTRA_OECONF = "--with-tls" MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi" +require conf/machine/include/tune-geodelx.conf + IMAGE_FSTYPES += "tar.gz" MACHINE_EXTRA_RRECOMMENDS = "\ kernel-modules \ " + +KERNEL_IMAGETYPE = "bzImage" diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index c17bf7d520..349dd8eddb 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -20,7 +20,7 @@ GUI_MACHINE_CLASS="smallscreen" PREFERRED_VERSION_u-boot = "1.1.4" -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc IMAGE_ROOTFS_SIZE_ext2 = "8192" IMAGE_ROOTFS_SIZE_ext2.gz = "8192" diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf index 6c159a5f0c..ef7e8a2a39 100644 --- a/conf/machine/asus620.conf +++ b/conf/machine/asus620.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf index 7d8d8815f0..814641df8f 100644 --- a/conf/machine/asus730.conf +++ b/conf/machine/asus730.conf @@ -9,10 +9,10 @@ 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.conf +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.conf +#require conf/machine/include/tune-iwmmxt.inc ROOT_FLASH_SIZE = "64" VOLATILE_STORAGE_SIZE = "64" diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index faa4785fb4..2231f80ed2 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -19,3 +19,5 @@ SERIAL_CONSOLE = "115200" # used by some images ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" + +KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf new file mode 100644 index 0000000000..e8903a960a --- /dev/null +++ b/conf/machine/at91sam9260ek.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@Name: Atmel AT91SAM9260EK Development Platform +#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf new file mode 100644 index 0000000000..489575cd2b --- /dev/null +++ b/conf/machine/at91sam9261ek.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@Name: Atmel AT91SAM9261EK Development Platform +#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index ad94420196..bf45d25c43 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -18,4 +18,6 @@ SERIAL_CONSOLE = "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc + +KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index b725831321..4df1030570 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -18,3 +18,4 @@ SERIAL_CONSOLE = "115200" ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" +KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf index 32d7a2cdca..0dda9492e9 100644 --- a/conf/machine/aximx50.conf +++ b/conf/machine/aximx50.conf @@ -9,10 +9,10 @@ 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.conf +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.conf +#require conf/machine/include/tune-iwmmxt.inc ROOT_FLASH_SIZE = "256" VOLATILE_STORAGE_SIZE = "64" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 6862a8095f..20fc2fb873 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -10,5 +10,5 @@ IMAGE_FSTYPES ?= "jffs2" ROOT_FLASH_SIZE = "25" # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. -XSERVER = "xserver-kdrive-w100" +XSERVER = "xserver-kdrive-imageon" diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf new file mode 100644 index 0000000000..c712c3728e --- /dev/null +++ b/conf/machine/cm-x270.conf @@ -0,0 +1,59 @@ +#@TYPE: Machine +#@Name: Compulab cm-x270 +#@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module +#OLDEST_KERNEL = "2.6.16" +TARGET_ARCH = "arm" +PREFERRED_VERSION_compulab-pxa270 = "2.6.22" +GUI_MACHINE_CLASS ?= "bigscreen" + +PREFERRED_PROVIDER_virtual/kernel = "compulab-pxa270" +PACKAGE_EXTRA_ARCHS = "armv4 armv5te" + +require conf/machine/include/tune-xscale.inc + +# console serial port. If you have a L module +# the below works. If you have a W module, add +# the following line to your local.conf: +# CMX270_CONSOLE_SERIAL_PORT = "ttyS0" + +# the following is for the cm-x270 L module +CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1" + +# used by sysvinit_2 package, so rebuild this +# package if you change the SERIAL_CONSOLE setting +# the following is the port for the cm-x270 L module +# I think the W module would use ttyS0, but has +# not been tested. This can be overwritten in +# local.conf +SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}" + +# used by opie-collections.inc +ROOT_FLASH_SIZE ?= "32" + +# for NAND flash. +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\ + 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_LINK_NAME}.rootfs-summary.jffs2; \ + ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \ + " + +MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" + +# to program the compulab NAND flash, the following scheme is suggested. Create +# a small rootfs that can fit in NOR flash using the following config: +# - Angstrom distro +# - uclibc (set ANGSTROM_MODE = "uclibc" in local.conf) +# - angstrom-minimal-image-with-mtd-utils bitbake target +# - put the following in your local.conf +# - IMAGE_FSTYPES = "jffs2 tar cpio.gz" +# now, when you build the image, a cpio.gz will be generated +# that can be used as an initramfs. You can boot into this image and then +# program the main rootfs jffs2 image in NAND flash using mtd-utils +# you can select booting the initramfs, or the main nand rootfs by using +# the "ramdisk on", or "ramdisk off" commands in the bootloader +# + + diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 429463cc87..c91bdcfc92 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" MACHINE_KERNEL_VERSION ?= "2.6" -require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf +require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc PREFERRED_PROVIDER_xserver = "xserver-kdrive" @@ -18,7 +18,7 @@ IMAGE_LINGUAS = "" IMAGE_FSTYPES ?= "jffs2 tar.gz" -require conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf deleted file mode 100644 index b1e7082fd7..0000000000 --- a/conf/machine/compulab-pxa270.conf +++ /dev/null @@ -1,31 +0,0 @@ -#@TYPE: Machine -#@Name: Compulab PXA270 system -#@DESCRIPTION: Machine configuration for Compulab PXA270 system -#OLDEST_KERNEL = "2.6.16" -TARGET_ARCH = "arm" -PREFERRED_VERSION_compulab-pxa270 = "2.6.22" -GUI_MACHINE_CLASS ?= "bigscreen" - -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" -PACKAGE_EXTRA_ARCHS = "armv4 armv5te" - -require conf/machine/include/tune-xscale.conf - -# used by sysvinit_2 -SERIAL_CONSOLE ?= "38400 ttySA0" - -# used by opie-collections.inc -ROOT_FLASH_SIZE ?= "32" - -# for NAND flash. -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no-cleanmarkers;\ - 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_LINK_NAME}.rootfs-summary.jffs2; \ - ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \ - " - -MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" - diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf index 10b4450384..02e8e457f1 100644 --- a/conf/machine/davinci-dvevm.conf +++ b/conf/machine/davinci-dvevm.conf @@ -21,5 +21,5 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index c7266fee00..db9f26861c 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" PREFERRED_VERSION_u-boot = "1.1.6" UBOOT_MACHINE = "pxa255_idp_config" -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index 0ca65b79a9..ead6a83282 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -5,9 +5,10 @@ #@DESCRIPTION: Machine configuration for the DHT-Walnut 405GP development platform TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405" +PACKAGE_EXTRA_ARCHS = "ppc ppc405" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" +UBOOT_ENTRYPOINT = "0" MACHINE_FEATURES = "kernel26 ext2" MACHINE_TASK_PROVIDER = "task-base" @@ -22,5 +23,5 @@ SERIAL_CONSOLE = "115200 ttyS0" #tune for the 405 cpu -require conf/machine/include/tune-ppc405.conf +require conf/machine/include/tune-ppc405.inc diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index ca1a7be8ff..5a2fb2dacf 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -16,4 +16,4 @@ USE_VT = "0" SERIAL_CONSOLE = "115200 ttyPSC0" #tune for the MPC5200B cpu -require conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.inc diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 32f59aabd1..16d8c7097c 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -24,7 +24,7 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 " #tune for ep93xx cpus #can be used for crunch support later on -#require conf/machine/include/tune-ep9312.conf +#require conf/machine/include/tune-ep9312.inc -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 5a3b5875a3..0750e4d646 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -5,6 +5,7 @@ PACKAGE_EXTRA_ARCHS = "i386 i486" PREFERRED_PROVIDER_virtual/kernel = "linux-epia" OLDEST_KERNEL = "2.6.5" +KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" @@ -14,6 +15,4 @@ IMAGE_FSTYPES = "ext2.gz" MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" MACHINE_TASK_PROVIDER = "task-base" - -require conf/machine/include/tune-c3.conf - +require conf/machine/include/tune-c3.inc diff --git a/conf/machine/er0100.conf b/conf/machine/er0100.conf new file mode 100644 index 0000000000..211091d929 --- /dev/null +++ b/conf/machine/er0100.conf @@ -0,0 +1,46 @@ +#@TYPE: Machine +#@NAME: iRex Iliad e-ink reader +#@DESCRIPTION: Machine configuration for the iRex Iliad e-ink reader + +# +# Hardware-based properties +# + +# CPU: Intel (now Marvell) PXA255 + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.inc + +# Fix us: + +#ROOT_FLASH_SIZE = "80" +#VOLATILE_STORAGE_SIZE = "64" +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "768" +MACHINE_DISPLAY_HEIGHT_PIXELS = "1024" +MACHINE_FEATURES = "kernel24 touchscreen apm alsa pcmcia wifi usbgadget usbhost screen" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-er0100" +PCMCIA_MANAGER = "pcmcia-cs" +MODUTILS = "24" +XSERVER = "xserver-kdrive-fbdev" + + +# +# Modules autoload and other boot properties +# +module_autoload_evdev = "evdev" +module_autoload_pcmcia = "pcmcia" + +#FIXME: this should be controlled by a userspace utility later. +module_autoload_g_ether = "g_ether" + +USE_VT = "0" +SERIAL_CONSOLE = "-L ttyS2 115200 vt100" + diff --git a/conf/machine/eteng500.conf b/conf/machine/eteng500.conf index 7734461a03..91e3dbb5a0 100644 --- a/conf/machine/eteng500.conf +++ b/conf/machine/eteng500.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -34,4 +34,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 4649fe130e..ffd3584da6 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -7,9 +7,14 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" -PREFERRED_PROVIDER_virtual/kernel = "linux-gta01" +PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" +UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone" +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "285" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ @@ -36,7 +41,7 @@ ROOT_FLASH_SIZE = "60" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools -EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" +EXTRA_IMAGEDEPENDS += "dfu-util-native" # tune for S3C24x0 -include conf/machine/include/tune-arm920t.conf +include conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index c9e1e73814..99eb9f0832 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -1,15 +1,20 @@ #----------------------------------------------------------------------------- #@TYPE: Machine #@NAME: FIC GTA02 (Neo1973) -#@DESCRIPTION: Machine configuration for the FIC Neo1973.2 GSM phone +#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone #----------------------------------------------------------------------------- TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" -PREFERRED_PROVIDER_virtual/kernel = "linux-gta02" +PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" +UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi" +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "285" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ @@ -38,4 +43,4 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" # tune for S3C24x0 -include conf/machine/include/tune-arm920t.conf +include conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/fsg3be.conf b/conf/machine/fsg3be.conf index a909a0f43c..c6859227cb 100644 --- a/conf/machine/fsg3be.conf +++ b/conf/machine/fsg3be.conf @@ -17,7 +17,7 @@ KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4" PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3" -require conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.inc # No room for jffs2 - the rootfs needs to be installed directly to disk IMAGE_FSTYPES = "tar.gz" diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index 7f9c35cbc5..d1ea1b311e 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -8,3 +8,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" udevdir = "/dev" + +KERNEL_IMAGETYPE = "bzImage" diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf index 841f4a8418..835a581801 100644 --- a/conf/machine/geodelx.conf +++ b/conf/machine/geodelx.conf @@ -5,3 +5,5 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_PROVIDER_virtual/kernel="linux-geodelx" SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}" + +KERNEL_IMAGETYPE = "bzImage" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 1996a1603b..626e755b1f 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -11,11 +11,13 @@ PREFERRED_PROVIDER_xserver = "xserver-xorg" udevdir = "/dev" +KERNEL_IMAGETYPE = "bzImage" + OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen" -#require conf/machine/include/tune-athlonmp.conf +#require conf/machine/include/tune-athlonmp.inc diff --git a/conf/machine/gumstix-connex.conf b/conf/machine/gumstix-connex.conf new file mode 100644 index 0000000000..5bca152500 --- /dev/null +++ b/conf/machine/gumstix-connex.conf @@ -0,0 +1,8 @@ +require conf/machine/include/gumstix.inc + +RDEPENDS_kernel-base = "" + +MACHINE_FEATURES += " usbgadget " + +GUMSTIX_400MHZ = "y" + diff --git a/conf/machine/gumstix-verdex.conf b/conf/machine/gumstix-verdex.conf new file mode 100644 index 0000000000..dc44342e65 --- /dev/null +++ b/conf/machine/gumstix-verdex.conf @@ -0,0 +1,8 @@ +require conf/machine/include/gumstix.inc + +RDEPENDS_kernel-base = "" + +PACKAGE_EXTRA_ARCHS += " iwmmxt " + +MACHINE_FEATURES += " usbhost " + diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf deleted file mode 100644 index e259477a7b..0000000000 --- a/conf/machine/gumstix.conf +++ /dev/null @@ -1,26 +0,0 @@ -#@TYPE: Machine -#@Name: Gumstix pxa2xx boards -#@DESCRIPTION: Gumstix pxa2xx boards - -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " - -PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix" - -OLDEST_KERNEL = "2.6.15" - -#Assume people have some gumstix extension boards -MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget bluetooth" - -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash" - -GUMSTIX_400MHZ = "y" - -# used by sysvinit_2 -SERIAL_CONSOLE = "115200 ttyS0 vt100" - -#don't try to access tty1 -USE_VT = "0" - -require conf/machine/include/tune-xscale.conf - diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 131b6512e0..15390d2d56 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc VOLATILE_STORAGE_SIZE = "64" ROOT_FLASH_SIZE = "16" @@ -21,7 +21,6 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" # Software/packages selection # PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index bc30eb780b..409eacaed5 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -23,5 +23,5 @@ SERIAL_CONSOLE = "115200 ttySAC2 vt100" USE_VT = "0" # tune for armv4t -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index ecaebb8535..60a732ffa6 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " #Compile with armv5te optimizations, incompatible with armv4(t) cpus -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc #Set some hints for metadata VOLATILE_STORAGE_SIZE = "64" @@ -37,4 +37,4 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index fe204f0be4..9cf8272b51 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 " -require conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.inc # h3700, h3800 have 32, but let that be the bonus ROOT_FLASH_SIZE = "16" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 8612be2ddc..f475e20c46 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index c28e651b47..f56bee00e8 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -43,4 +43,4 @@ module_conf_acx = "blacklist acx" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index 87cc4c6210..6ed836c1de 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te h5xxx" -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index a44d2d328f..711ffd314c 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -10,7 +10,7 @@ PACKAGE_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" #Use OMAP 1510 cpu specifig arm9tdmi options for gcc -require conf/machine/include/tune-arm9tdmi.conf +require conf/machine/include/tune-arm9tdmi.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf index 7cd36f16ae..63ab097a89 100644 --- a/conf/machine/htcalpine.conf +++ b/conf/machine/htcalpine.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf index b46ac688cc..1b44742874 100644 --- a/conf/machine/htcapache.conf +++ b/conf/machine/htcapache.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index 5150b86b77..44454f3902 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "128" @@ -21,7 +21,6 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget # Software/packages selection # PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" @@ -56,4 +55,4 @@ module_conf_acx = "blacklist acx" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf index 1edd224496..8430cb57d4 100644 --- a/conf/machine/htchimalaya.conf +++ b/conf/machine/htchimalaya.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -33,4 +33,4 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf index 5fb2bb4cd4..f9326475e6 100644 --- a/conf/machine/htcsable.conf +++ b/conf/machine/htcsable.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -33,4 +33,4 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf index ca77ec9c04..af91bcbb9f 100644 --- a/conf/machine/htctornado.conf +++ b/conf/machine/htctornado.conf @@ -25,4 +25,4 @@ ROOT_FLASH_SIZE = "30" EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n" # cpu tuning -include conf/machine/include/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index a33510290f..c3e7cf710e 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -9,15 +9,16 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = " armv4t armv5te iwmmxt" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.conf +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.conf +#require conf/machine/include/tune-iwmmxt.inc MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone" +MACHINE_FEATURES += "iwmmxt" # # Software/packages selection diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf index f7b0a89ee1..38b0c011be 100644 --- a/conf/machine/htcwallaby.conf +++ b/conf/machine/htcwallaby.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 " -require conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "16" VOLATILE_STORAGE_SIZE = "32" diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index 279b273a70..c0d9016407 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -15,11 +15,11 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ -e 256KiB -p" -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES ?= "jffs2 tar.bz2" MODUTILS = "26" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" PCMCIA_MANAGER = "pcmciautils" @@ -30,10 +30,10 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.conf +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.conf +#require conf/machine/include/tune-iwmmxt.inc module_autoload_evdev = "evdev" module_autoload_pcmcia = "pcmcia" @@ -44,3 +44,7 @@ module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" + +# Don't include kernels in standard images +RDEPENDS_kernel-base = "" +KERNEL_IMAGETYPE = "zImage" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index d7f852079a..87e03a7bdd 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -9,10 +9,10 @@ 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.conf +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.conf +#require conf/machine/include/tune-iwmmxt.inc ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" @@ -20,6 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" +MACHINE_FEATURES += "iwmmxt" # # Software/packages selection @@ -29,7 +30,6 @@ PCMCIA_MANAGER = "pcmciautils" MODUTILS = "26" XSERVER = "xserver-kdrive-w100" -PREFERRED_VERSION_xserver-kdrive = "1.2.0" PREFERRED_VERSION_orinoco-modules = "0.15rc1" diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index de620fcd61..0ef522441b 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -12,6 +12,8 @@ PACKAGE_EXTRA_ARCHS = "x86 i386 i486" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" OLDEST_KERNEL = "2.6.18" +KERNEL_IMAGETYPE = "bzImage" + GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" @@ -22,3 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" +#tune for pentium cpu +require conf/machine/include/tune-pentium.inc + diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index 5eba33fa97..8ff87553ba 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -11,6 +11,8 @@ PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" OLDEST_KERNEL = "2.6.20" +KERNEL_IMAGETYPE = "bzImage" + GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" @@ -20,3 +22,6 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 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/include/LAB-settings.conf b/conf/machine/include/LAB-settings.inc index d0100c9968..d0100c9968 100644 --- a/conf/machine/include/LAB-settings.conf +++ b/conf/machine/include/LAB-settings.inc diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.inc index eed8de9ab9..eed8de9ab9 100644 --- a/conf/machine/include/collie-2.4.conf +++ b/conf/machine/include/collie-2.4.inc diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.inc index f22ffce6c2..f22ffce6c2 100644 --- a/conf/machine/include/collie-2.6.conf +++ b/conf/machine/include/collie-2.6.inc diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc new file mode 100644 index 0000000000..fc5fd4e136 --- /dev/null +++ b/conf/machine/include/gumstix.inc @@ -0,0 +1,48 @@ +#@TYPE: Machine +#@Name: Gumstix pxa2xx boards +#@DESCRIPTION: Gumstix pxa2xx boards + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " + +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" + +module_autoload_pxamci = "pxamci" +module_autoload_mmc_block = "mmc_block" +module_autoload_gumstix_gadget = "gumstix_gadget" +module_autoload_g_ether = "g_ether" +module_autoload_smc91x = "smc91x" +module_autoload_smc911x = "smc911x" + +UBOOT_ENTRYPOINT = "a0008000" + +#Assume people have some gumstix extension boards +MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth" + +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash" + +# Install all kernel modules +#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-modules" + +# Install only selected kernel modules, comment out line above also +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \ + kernel-module-rtc-core \ + kernel-module-rtc-dev \ + kernel-module-rtc-proc \ + kernel-module-rtc-sa1100 \ + kernel-module-rtc-sysfs \ + kernel-module-smc91x \ + kernel-module-gumstix-smc91x \ + kernel-module-smc911x \ + kernel-module-gumstix-smc911x \ + " + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0 vt100" + +#don't try to access tty1 +USE_VT = "0" + +require conf/machine/include/tune-xscale.inc + diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.inc index 6f0d5b20eb..175ec80e6a 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.inc @@ -10,8 +10,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -require conf/machine/include/tune-xscale.conf -require conf/machine/include/tune-thumb.conf +require conf/machine/include/tune-xscale.inc +require conf/machine/include/tune-thumb.inc #------------------------------------------------------------------------------- # Board defaults diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.inc index 064db79b29..632a9ed4cc 100644 --- a/conf/machine/include/lsppc.conf +++ b/conf/machine/include/lsppc.inc @@ -23,4 +23,4 @@ IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" IMAGE_FSTYPES = "tar.gz" #tune for the MPC5200B cpu -require conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.inc diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index c1eac82e3b..87571c0db0 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -1,12 +1,9 @@ - TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" -EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" - #cat /proc/mtd #dev: size erasesize name #mtd0: 00020000 00008000 "Bootloader" @@ -15,19 +12,28 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" #mtd3: 00020000 00020000 "Logo" MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" +MACHINE_FEATURES += "iwmmxt" + -#the EZX phones need a userspace daemon to stop the BP from shutting down the phone -MACHINE_EXTRA_RDEPENDS += "opentapi" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "180" ROOT_FLASH_SIZE = "24" +EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" + EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" -# Opentapi needs to be started very early so we need the mux devices in static /dev +# the EZX phones need a userspace daemon to stop the BP from shutting down the phone +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd" + +# 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.conf +require conf/machine/include/tune-xscale.inc SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/include/motorola-ezx.conf b/conf/machine/include/motorola-ezx.conf deleted file mode 100644 index e87f6aa70f..0000000000 --- a/conf/machine/include/motorola-ezx.conf +++ /dev/null @@ -1,41 +0,0 @@ -# choose the proper kernel for this hardware -PREFERRED_PROVIDER_virtual/kernel = "ezx-kernels" -# we don't need support for kernel 2.4 -MODUTILS = "26" -# build tar.gz for SD/MMC/Transflash and jffs2 for later when we have mtd -IMAGE_FSTYPES = "tar.gz jffs2" - -BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils apm irda-utils udev-utils ppp ppp-dialin module-init-tools" - -# -# disable all modules until we have something that boots... -# - -# Ethernet modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" -# NFS Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" -# Crypto Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5" -# SMB and CRAMFS -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs" -# Serial Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs" -# Bluetooth Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ -# kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ -# kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" -# Infrared Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ -# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" -# -# USB Gadget Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ -# kernel-module-g-serial kernel-module-g-ether" -# -# Sound Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss" -#BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc -# kernel-module-snd-timer kernel-module-snd-pcm \ -# kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" -# diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.inc index 821ebc4c03..5eb7806f6f 100644 --- a/conf/machine/include/palm.conf +++ b/conf/machine/include/palm.inc @@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" SERIAL_CONSOLE = "115200 ttyS0" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2" @@ -57,7 +57,7 @@ module_autoload_snd-timer = "snd-timer" module_autoload_soundcore = "soundcore" module_autoload_wm97xx-ts = "wm97xx-ts" module_autoload_pxa27x-keyboard = "pxa27x-keyboard" -module_autoload_palmtx-battery = "palmtx-battery" +module_autoload_palmtx_battery = "palmtx_battery" module_autoload_palmz72_battery = "palmz72_battery" module_autoload_i2c-dev = "i2c-dev" module_autoload_i2c-pxa = "i2c-pxa" diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.inc index fa24a3281b..fa24a3281b 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.inc diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.inc index 26b78a6a9d..d84f1efb26 100644 --- a/conf/machine/include/qemu.conf +++ b/conf/machine/include/qemu.inc @@ -7,5 +7,8 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" IMAGE_FSTYPES ?= "tar.bz2 ext2" -ROOT_FLASH_SIZE = "200" -IMAGE_ROOTFS_SIZE_ext2 = "200000" +ROOT_FLASH_SIZE = "230" +IMAGE_ROOTFS_SIZE_ext2 ?= "230000" + +# Don't include kernels in standard images +RDEPENDS_kernel-base = "" diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.inc index 06f12f532f..06f12f532f 100644 --- a/conf/machine/include/simpad-2.4.conf +++ b/conf/machine/include/simpad-2.4.inc diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.inc index e485c7bf2a..e485c7bf2a 100644 --- a/conf/machine/include/simpad-2.6.conf +++ b/conf/machine/include/simpad-2.6.inc diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.inc index 68316f36bf..a69df825c0 100644 --- a/conf/machine/include/tune-arm1136jf-s.conf +++ b/conf/machine/include/tune-arm1136jf-s.inc @@ -1,2 +1,3 @@ TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp" -PACKAGE_ARCH = "armv6"
\ No newline at end of file +FEED_ARCH = "armv6" +PACKAGE_ARCH = "armv6" diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.inc index 373bf46727..b142d3325a 100644 --- a/conf/machine/include/tune-arm920t.conf +++ b/conf/machine/include/tune-arm920t.inc @@ -1,3 +1,4 @@ +FEED_ARCH = "armv4t" PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.inc index 31fe8868ca..c3e8d7aefc 100644 --- a/conf/machine/include/tune-arm926ejs.conf +++ b/conf/machine/include/tune-arm926ejs.inc @@ -1,3 +1,5 @@ +FEED_ARCH = "armv5te" + # For gcc 3.x you need: #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" # For gcc 4.x you need: diff --git a/conf/machine/include/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.inc index d097b07739..d097b07739 100644 --- a/conf/machine/include/tune-arm9tdmi.conf +++ b/conf/machine/include/tune-arm9tdmi.inc diff --git a/conf/machine/include/tune-athlonmp.conf b/conf/machine/include/tune-athlonmp.inc index b2d0e703db..b2d0e703db 100644 --- a/conf/machine/include/tune-athlonmp.conf +++ b/conf/machine/include/tune-athlonmp.inc diff --git a/conf/machine/include/tune-c3.conf b/conf/machine/include/tune-c3.inc index e6a522af10..e6a522af10 100644 --- a/conf/machine/include/tune-c3.conf +++ b/conf/machine/include/tune-c3.inc diff --git a/conf/machine/include/tune-ep9312.conf b/conf/machine/include/tune-ep9312.inc index 0982cf2a13..0982cf2a13 100644 --- a/conf/machine/include/tune-ep9312.conf +++ b/conf/machine/include/tune-ep9312.inc diff --git a/conf/machine/include/tune-geodelx.conf b/conf/machine/include/tune-geodelx.conf new file mode 100644 index 0000000000..335fadec6e --- /dev/null +++ b/conf/machine/include/tune-geodelx.conf @@ -0,0 +1,6 @@ +# Geode CPU has it's own target in GCC 4.3 +# in older versions k6-2 is closest +# +TARGET_CC_ARCH = "-march=k6-2" +PACKAGE_ARCH = "geode" + diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.inc index 8376faca74..8376faca74 100644 --- a/conf/machine/include/tune-iwmmxt.conf +++ b/conf/machine/include/tune-iwmmxt.inc diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc new file mode 100644 index 0000000000..7b1a517895 --- /dev/null +++ b/conf/machine/include/tune-pentium.inc @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-mcpu=pentium" +PACKAGE_ARCH = "i586" + diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc new file mode 100644 index 0000000000..aa9a8dfa1d --- /dev/null +++ b/conf/machine/include/tune-pentiumpro.inc @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-mcpu=pentiumpro" +PACKAGE_ARCH = "i686" + diff --git a/conf/machine/include/tune-ppc405.conf b/conf/machine/include/tune-ppc405.inc index cf8f58c115..cf8f58c115 100644 --- a/conf/machine/include/tune-ppc405.conf +++ b/conf/machine/include/tune-ppc405.inc diff --git a/conf/machine/include/tune-ppc440.conf b/conf/machine/include/tune-ppc440.inc index dff8dce684..dff8dce684 100644 --- a/conf/machine/include/tune-ppc440.conf +++ b/conf/machine/include/tune-ppc440.inc diff --git a/conf/machine/include/tune-ppc440e.conf b/conf/machine/include/tune-ppc440e.conf deleted file mode 100644 index 0cfa50c69e..0000000000 --- a/conf/machine/include/tune-ppc440e.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=440fp" -PACKAGE_ARCH = "ppc440" diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc new file mode 100644 index 0000000000..5c47482a54 --- /dev/null +++ b/conf/machine/include/tune-ppc440e.inc @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-mcpu=440fp -mhard-float" +PACKAGE_ARCH = "ppc440e" diff --git a/conf/machine/include/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.conf deleted file mode 100644 index 7c8714cfc2..0000000000 --- a/conf/machine/include/tune-ppc603e.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=603e" -PACKAGE_ARCH = "ppc603e" diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc new file mode 100644 index 0000000000..1a004d30b5 --- /dev/null +++ b/conf/machine/include/tune-ppc603e.inc @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-mcpu=603e -mhard-float" +PACKAGE_ARCH = "ppc603e" diff --git a/conf/machine/include/tune-ppce500.conf b/conf/machine/include/tune-ppce500.inc index 11717eba70..11717eba70 100644 --- a/conf/machine/include/tune-ppce500.conf +++ b/conf/machine/include/tune-ppce500.inc diff --git a/conf/machine/include/tune-sh3.conf b/conf/machine/include/tune-sh3.inc index 192dd8fd22..192dd8fd22 100644 --- a/conf/machine/include/tune-sh3.conf +++ b/conf/machine/include/tune-sh3.inc diff --git a/conf/machine/include/tune-sh4.conf b/conf/machine/include/tune-sh4.inc index 866f7f89d5..866f7f89d5 100644 --- a/conf/machine/include/tune-sh4.conf +++ b/conf/machine/include/tune-sh4.inc diff --git a/conf/machine/include/tune-strongarm.conf b/conf/machine/include/tune-strongarm.inc index 8654c996ef..8654c996ef 100644 --- a/conf/machine/include/tune-strongarm.conf +++ b/conf/machine/include/tune-strongarm.inc diff --git a/conf/machine/include/tune-supersparc.conf b/conf/machine/include/tune-supersparc.inc index 1b1ec1207f..1b1ec1207f 100644 --- a/conf/machine/include/tune-supersparc.conf +++ b/conf/machine/include/tune-supersparc.inc diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.inc index a25cb5320c..a25cb5320c 100644 --- a/conf/machine/include/tune-thumb.conf +++ b/conf/machine/include/tune-thumb.inc diff --git a/conf/machine/include/tune-x86-nocona.inc b/conf/machine/include/tune-x86-nocona.inc new file mode 100644 index 0000000000..f1189a171e --- /dev/null +++ b/conf/machine/include/tune-x86-nocona.inc @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-march=nocona" +TARGET_CC_KERNEL_ARCH = "-march=nocona" diff --git a/conf/machine/include/tune-x86-prescott.inc b/conf/machine/include/tune-x86-prescott.inc new file mode 100644 index 0000000000..f3ec4e956a --- /dev/null +++ b/conf/machine/include/tune-x86-prescott.inc @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-march=prescott" +TARGET_CC_KERNEL_ARCH = "-march=prescott" diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.inc index 1d212946e4..f14aee9aed 100644 --- a/conf/machine/include/tune-xscale.conf +++ b/conf/machine/include/tune-xscale.inc @@ -1,3 +1,5 @@ +FEED_ARCH = "armv5te" + TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index a9702cfce2..979a6bd484 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -1,5 +1,5 @@ # Zaurus Clamshell specific configuration for kernel 2.6 -# Don't forget to include zaurus-clamshell.conf as well +# Don't forget to include zaurus-clamshell.inc as well TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" @@ -11,14 +11,12 @@ ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" +IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" EXTRA_IMAGEDEPENDS += "zaurus-updater" -IMAGE_FSTYPES ?= "jffs2 tar.gz" - # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf +include conf/machine/include/tune-xscale.inc SERIAL_CONSOLE = "115200 ttyS0" @@ -39,6 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" GUI_MACHINE_CLASS = "bigscreen" +GUI_MACHINE_CLASS_collie = "smallscreen" GUI_MACHINE_CLASS_poodle = "smallscreen" MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" @@ -67,3 +66,7 @@ zaurus_make_installkit () { md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5 rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ } + +# Don't include kernels in standard images for Zaurus machines +RDEPENDS_kernel-base = "" +KERNEL_IMAGETYPE = "zImage" diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index f208852d3a..756024a3a7 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -6,6 +6,6 @@ TARGET_ARCH = "armeb" PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" -require conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.inc EXTRA_IMAGECMD_jffs2 += "--big-endian" diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf index d39fa1f603..622db3ec27 100644 --- a/conf/machine/ixp4xxle.conf +++ b/conf/machine/ixp4xxle.conf @@ -6,6 +6,6 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" -require conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.inc EXTRA_IMAGECMD_jffs2 += " --little-endian" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index 385af0864a..72fff1ed5e 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" SERIAL_CONSOLE = "115200 ttySA0" -require conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.inc diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index 40d3848df7..a322f1a60c 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "sh3" -require conf/machine/include/tune-sh3.conf +require conf/machine/include/tune-sh3.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index f08fb6f253..461d0c8326 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -require conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf index 0e9c0d3b92..5b88f457fa 100644 --- a/conf/machine/kb9202.conf +++ b/conf/machine/kb9202.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux" PACKAGE_EXTRA_ARCHS = "armv4 armv4t" -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc # used by sysvinit_2 # Needs at91 serial port @@ -18,3 +18,5 @@ require conf/machine/include/tune-arm920t.conf ROOT_FLASH_SIZE = "12" MACHINE_FEATURES = "kernel26 usbhost usbgadget irda" + +KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/ks8695.conf b/conf/machine/ks8695.conf index 5d214f7cfb..0b0d31742f 100644 --- a/conf/machine/ks8695.conf +++ b/conf/machine/ks8695.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 26d2d655ce..b67d3dc500 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -5,4 +5,4 @@ SERIAL_CONSOLE="38400 ttyS0" IMAGE_FSTYPES = "jffs2 tar.bz2" -require conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.inc diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index 2038aa483f..a046c5d00c 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -9,7 +9,7 @@ GUI_MACHINE_CLASS = "smallscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf index c191349498..f4fd23eec9 100644 --- a/conf/machine/looxc550.conf +++ b/conf/machine/looxc550.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf index 15477f59c6..2df6ce0802 100644 --- a/conf/machine/lsarm.conf +++ b/conf/machine/lsarm.conf @@ -14,7 +14,7 @@ PREFERRED_PROVIDER_virtual/bootloader = "" USE_DEVFS = "0" -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc IMAGE_FSTYPES = "tar.gz" diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf index ac22703de9..9841678887 100644 --- a/conf/machine/lsppchd.conf +++ b/conf/machine/lsppchd.conf @@ -3,6 +3,6 @@ #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD UBOOT_MACHINE = "linkstation_HDLAN" IMAGE_FSTYPES = "tar.gz" -require conf/machine/include/lsppc.conf +require conf/machine/include/lsppc.inc INHERIT += "lsppchd-image" diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf index 9f03febba6..1472155a22 100644 --- a/conf/machine/lsppchg.conf +++ b/conf/machine/lsppchg.conf @@ -3,6 +3,6 @@ #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG UBOOT_MACHINE = "linkstation_HGLAN" IMAGE_FSTYPES = "tar.gz" -require conf/machine/include/lsppc.conf +require conf/machine/include/lsppc.inc INHERIT += "lsppchg-image" diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf index 756e064c6a..178c242056 100644 --- a/conf/machine/magicbox.conf +++ b/conf/machine/magicbox.conf @@ -27,5 +27,5 @@ EXTRA_IMAGECMD_squashfs-lzma = " -be -all-root -nopad -noappend -root-owned" #tune for the 405 cpu -require conf/machine/include/tune-ppc405.conf +require conf/machine/include/tune-ppc405.inc diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index fab936707b..f7451cccb0 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -9,10 +9,10 @@ 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.conf +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.conf +#require conf/machine/include/tune-iwmmxt.inc ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" @@ -20,6 +20,8 @@ MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" +MACHINE_FEATURES += "iwmmxt" + # # We don't support jffs2 installations (yet). diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index 291c68ebd2..a6681a9030 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf index 020c5075a3..ac7a6c19f3 100644 --- a/conf/machine/mtx-3.conf +++ b/conf/machine/mtx-3.conf @@ -9,7 +9,7 @@ # For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3" diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf index 160b9fd207..0a092563fe 100644 --- a/conf/machine/mx21ads.conf +++ b/conf/machine/mx21ads.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index 55a29186e3..e600af8bf2 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -require conf/machine/include/tune-arm1136jf-s.conf +require conf/machine/include/tune-arm1136jf-s.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index f275d617de..89f79fa185 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -24,4 +24,4 @@ EXTRA_IMAGECMD = "--little-endian" EXTRA_IMAGEDEPENDS = "openssl-native" IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf index 5f035c33fa..b265503ff5 100644 --- a/conf/machine/navman-icn330.conf +++ b/conf/machine/navman-icn330.conf @@ -11,7 +11,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" #Compile with armv5te optimizations, incompatible with armv4(t) cpus -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc #Set some hints for metadata VOLATILE_STORAGE_SIZE = "32" diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index 3baf1c2878..1c9fc7af9d 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -31,4 +31,4 @@ GUI_MACHINE_CLASS = "bigscreen" #The initrd needs /initrd present to be able to do pivot_root ROOTFS_POSTPROCESS_COMMAND += " mkdir -p ${IMAGE_ROOTFS}/initrd; " -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index e7aeab7389..8d6cd2d220 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -9,6 +9,8 @@ PACKAGE_EXTRA_ARCHS = "netvista" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" XSERVER = "xserver-kdrive-vesa" +KERNEL_IMAGETYPE = "bzImage" + # todo: convert to task-base # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 1affae1389..0e308b0a67 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -8,13 +8,13 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_tslib = "tslib-maemo" -XSERVER = "xserver-kdrive-omap" +XSERVER = "xserver-kdrive-xomap" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc #size of the root partition (yes, it is 123 MB) ROOT_FLASH_SIZE = "123" diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index e31438819e..703fc1984d 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -10,7 +10,7 @@ XSERVER = "xserver-kdrive-xomap" GUI_MACHINE_CLASS = "bigscreen" TARGET_FPU = "hard" -include conf/machine/include/tune-arm1136jf-s.conf +include conf/machine/include/tune-arm1136jf-s.inc ROOT_FLASH_SIZE = "174" EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 104bbdb397..3162eb3342 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -12,7 +12,7 @@ OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH} ROOT_FLASH_SIZE ?= "6" -require conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.inc EXTRA_IMAGECMD_jffs2 += "--big-endian" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 86c4ce7a31..1aced19de2 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -12,7 +12,7 @@ OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH} ROOT_FLASH_SIZE ?= "6" -require conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.inc EXTRA_IMAGECMD_jffs2 += "--little-endian" diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 0b26436bf5..3dc19a4a31 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 0b26436bf5..3dc19a4a31 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 0b26436bf5..9a97150981 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -1,12 +1,12 @@ #@TYPE: Machine -#@NAME: OMAP1610 cpu on an H2 board -#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor +#@NAME: OMAP1710 cpu on an H2 board +#@DESCRIPTION: Machine configuration for the OMAP H3 development board with a 1710 processor TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index a9e1a00cc5..82be4e3f79 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -1,17 +1,16 @@ #@TYPE: Machine -#@NAME: OMAP1610 cpu on an H2 board -#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor +#@NAME: OMAP2420 cpu on an H4 board +#@DESCRIPTION: Machine configuration for the OMAP H4 development board with a 2420 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te armv6te" - +PACKAGE_EXTRA_ARCHS = "armv4t armv5te armv6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" - -BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" +PREFERRED_VERSION_u-boot = "1.1.4" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -require conf/machine/include/tune-arm926ejs.conf +MACHINE_FEATURES = "kernel26" + +require conf/machine/include/tune-arm1136jf-s.inc diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf index f13fa7def2..39e6896b3b 100644 --- a/conf/machine/omap2430sdp.conf +++ b/conf/machine/omap2430sdp.conf @@ -13,4 +13,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" MACHINE_FEATURES = "kernel26" -require conf/machine/include/tune-arm1136jf-s.conf +require conf/machine/include/tune-arm1136jf-s.inc diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 946a619d3f..abd50b116a 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -3,13 +3,10 @@ #@DESCRIPTION: Machine configuration for the OMAP Starter Kit with a 5912 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te" - -HOTPLUG = "udev" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" # PREFERRED_VERSION_u-boot = "1.1.6" @@ -26,28 +23,11 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \ kernel-module-nls-iso8859-1 \ kernel-module-nls-cp437 \ kernel-module-nls-base \ - kernel-module-vfat" - -require conf/machine/include/tune-arm926ejs.conf - -# old modules setup - partially need to be added into MACHINE_EXTRA_RRECOMMENDS - -# PCMCIA Modules -##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia" -##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf" - -# IDE modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk" -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core" + kernel-module-vfat \ + kernel-module-ohci-hcd \ + " -# DOS and VFAT modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1" -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base" -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat" +RDEPENDS_kernel-base = "" -# Video er LCD Driver -##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea" -##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor" +require conf/machine/include/tune-arm926ejs.inc -# DSP Interface -##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp" diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index 3d1d90fbd8..bbeaf3a4a2 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -2,7 +2,7 @@ #@NAME: Palm LifeDrive #@DESCRIPTION: Machine configuration for the Palm LifeDrive -require conf/machine/include/palm.conf +require conf/machine/include/palm.inc ROOT_FLASH_SIZE = "100" @@ -10,6 +10,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "320" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" MACHINE_FEATURES += "pcmcia wifi" +MACHINE_FEATURES += "iwmmxt" MACHINE_EXTRA_RRECOMMENDS += "\ diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf index 4d1032dae8..272c0dca1c 100644 --- a/conf/machine/palmt650.conf +++ b/conf/machine/palmt650.conf @@ -2,7 +2,7 @@ #@NAME: Palm Treo 650 #@DESCRIPTION: Machine configuration for the Palm Treo 650 -require conf/machine/include/palm.conf +require conf/machine/include/palm.inc ROOT_FLASH_SIZE = "100" diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf index 1852455e2b..b984667e8a 100644 --- a/conf/machine/palmt680.conf +++ b/conf/machine/palmt680.conf @@ -2,7 +2,7 @@ #@NAME: Palm Treo 680 #@DESCRIPTION: Machine configuration for the Palm Treo 680 -require conf/machine/include/palm.conf +require conf/machine/include/palm.inc ROOT_FLASH_SIZE = "100" diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf index 24d13c1381..28db830d0a 100644 --- a/conf/machine/palmtc.conf +++ b/conf/machine/palmtc.conf @@ -2,7 +2,7 @@ #@NAME: Palm TC #@DESCRIPTION: Machine configuration for the Palm Tungsten C -require conf/machine/include/palm.conf +require conf/machine/include/palm.inc MACHINE_FEATURES += "wifi" diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf index 1f6d5c377d..ab78e881b8 100644 --- a/conf/machine/palmtt.conf +++ b/conf/machine/palmtt.conf @@ -15,4 +15,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/palmtt3.conf b/conf/machine/palmtt3.conf index b4d65284ae..3834feb2c5 100644 --- a/conf/machine/palmtt3.conf +++ b/conf/machine/palmtt3.conf @@ -2,7 +2,7 @@ #@NAME: Palm Tungsten|T3 #@DESCRIPTION: Machine configuration for the Palm Tungsten|T3 -require conf/machine/include/palm.conf +require conf/machine/include/palm.inc ROOT_FLASH_SIZE = "100" diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf index d2de3fa87b..997c1572e0 100644 --- a/conf/machine/palmtt5.conf +++ b/conf/machine/palmtt5.conf @@ -2,7 +2,7 @@ #@NAME: Palm Tungsten T5 #@DESCRIPTION: Machine configuration for the Palm Tungsten T5 -require conf/machine/include/palm.conf +require conf/machine/include/palm.inc ROOT_FLASH_SIZE = "100" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf index 9f1f079cdc..e1991c8b32 100644 --- a/conf/machine/palmtx.conf +++ b/conf/machine/palmtx.conf @@ -2,7 +2,7 @@ #@NAME: Palm TX #@DESCRIPTION: Machine configuration for the Palm TX -require conf/machine/include/palm.conf +require conf/machine/include/palm.inc MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "320" @@ -15,4 +15,15 @@ SERIAL_CONSOLE = "115200 ttyS0" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ kernel-module-wm97xx-ts \ - kernel-module-palmtx-battery" + kernel-module-palmtx-battery \ + kernel-module-palmtx-border \ + kernel-module-bcm2035-uart \ + kernel-module-palmtx-pcmcia \ + kernel-module-pcmcia-core \ + kernel-module-pda-power \ + kernel-module-pxa2xx-core \ + kernel-module-snd-pxa2xx-ac97 \ + kernel-module-snd-pxa2xx-pcm" + + +module_autoload_g_ether = "g_ether" diff --git a/conf/machine/palmz31.conf b/conf/machine/palmz31.conf index da074a80bf..0332952edc 100644 --- a/conf/machine/palmz31.conf +++ b/conf/machine/palmz31.conf @@ -2,7 +2,7 @@ #@NAME: Palm Zire 31 #@DESCRIPTION: Machine configuration for the Palm Zire 31 -require conf/machine/include/palm.conf +require conf/machine/include/palm.inc ROOT_FLASH_SIZE = "16" MACHINE_GUI_CLASS = "smallscreen" @@ -12,7 +12,7 @@ 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.conf +require conf/machine/include/tune-thumb.inc MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \ kernel-module-i2c-algo-pxa \ diff --git a/conf/machine/palmz71.conf b/conf/machine/palmz71.conf index 4be181e961..7837c5d564 100644 --- a/conf/machine/palmz71.conf +++ b/conf/machine/palmz71.conf @@ -12,4 +12,4 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf index a654877d36..502c11a284 100644 --- a/conf/machine/palmz72.conf +++ b/conf/machine/palmz72.conf @@ -2,7 +2,7 @@ #@NAME: Palm Zire 72 #@DESCRIPTION: Machine configuration for the Palm Zire 72 -require conf/machine/include/palm.conf +require conf/machine/include/palm.inc ROOT_FLASH_SIZE = "100" MACHINE_GUI_CLASS = "bigscreen" @@ -12,7 +12,7 @@ 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.conf +require conf/machine/include/tune-thumb.inc MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \ kernel-module-i2c-algo-pxa \ diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index eee1edd53e..0fbd9d1578 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -4,4 +4,6 @@ require conf/machine/include/zaurus-2.6.inc +IMAGE_FSTYPES ?= "jffs2" + ROOT_FLASH_SIZE = "22" diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf index 7c293d9ebf..ffa7dad468 100644 --- a/conf/machine/progear.conf +++ b/conf/machine/progear.conf @@ -9,6 +9,8 @@ PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +KERNEL_IMAGETYPE = "bzImage" + OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index 0e8a081df5..4306a6b22d 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -5,8 +5,10 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" -require conf/machine/include/qemu.conf -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/qemu.inc +require conf/machine/include/tune-arm926ejs.inc + +KERNEL_IMAGETYPE = "zImage" SERIAL_CONSOLE = "115200 ttyAMA0" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf index 60aa12ad7f..2378a9990e 100644 --- a/conf/machine/qemux86.conf +++ b/conf/machine/qemux86.conf @@ -5,7 +5,9 @@ TARGET_ARCH = "i586" PACKAGE_EXTRA_ARCHS = "x86" -require conf/machine/include/qemu.conf +require conf/machine/include/qemu.inc + +KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/rokr-e2.conf b/conf/machine/rokr-e2.conf deleted file mode 100644 index ccd496c03d..0000000000 --- a/conf/machine/rokr-e2.conf +++ /dev/null @@ -1,9 +0,0 @@ -#@TYPE: Machine -#@NAME: Motorola EZX rokr e2 -#@DESCRIPTION: Machine configuration for the Motorola GSM phones rokr e2 - -require conf/machine/include/motorola-ezx-base.inc - -#no touchscreen -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" - diff --git a/conf/machine/rokre2.conf b/conf/machine/rokre2.conf new file mode 100644 index 0000000000..1a99c877ce --- /dev/null +++ b/conf/machine/rokre2.conf @@ -0,0 +1,10 @@ +#@TYPE: Machine +#@NAME: Motorola EZX ROKR E2 +#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E2 + +require conf/machine/include/motorola-ezx-base.inc + +# there is no touchscreen +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen" +MACHINE_FEATURES += "iwmmxt" + diff --git a/conf/machine/rokre6.conf b/conf/machine/rokre6.conf new file mode 100644 index 0000000000..044a65c9fa --- /dev/null +++ b/conf/machine/rokre6.conf @@ -0,0 +1,6 @@ +#@TYPE: Machine +#@NAME: Motorola EZX ROKR E6 +#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E6 + +require conf/machine/include/motorola-ezx-base.inc + diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf index d49679e820..ba2c956d87 100644 --- a/conf/machine/rx1950.conf +++ b/conf/machine/rx1950.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -34,4 +34,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index f0bd1fefd2..4b3acc0a85 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" @@ -38,4 +38,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -require conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/sarge-at91.conf b/conf/machine/sarge-at91.conf index 6001e69cf7..60026a39b5 100644 --- a/conf/machine/sarge-at91.conf +++ b/conf/machine/sarge-at91.conf @@ -14,10 +14,12 @@ IMAGE_FSTYPES = "tar.gz" MACHINE_FEATURES = "kernel26" -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc PREFERRED_PROVIDER_virtual/kernel = "linux" # device has own patchset for u-boot 1.1.6 PREFERRED_VERSION_u-boot = "1.1.6" PREFERRED_VERSION_linux = "2.6.21" + +KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf index a6f31ab84a..72f0a8feb2 100644 --- a/conf/machine/sequoia.conf +++ b/conf/machine/sequoia.conf @@ -25,4 +25,4 @@ ERASEBLOCK_SIZE = "0x10000" IMAGE_FSTYPES = "jffs2" #tune for the AMCC440 cpu -require conf/machine/include/tune-ppc440e.conf +require conf/machine/include/tune-ppc440e.inc diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf index 61bec7f6f2..d7d35cfda1 100644 --- a/conf/machine/shark.conf +++ b/conf/machine/shark.conf @@ -15,7 +15,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100" ROOT_FLASH_SIZE = "16" USE_VT = "0" -require conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.inc MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2" MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay " diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 8e2cc276d8..3b527293df 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -8,8 +8,8 @@ TARGET_ARCH = "arm" MACHINE_FEATURES = " apm pcmcia irda screen touchscreen " -include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf -require conf/machine/include/tune-strongarm.conf +include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc +require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "16" diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf index 903685e8dd..b11ca6e972 100644 --- a/conf/machine/smdk2440.conf +++ b/conf/machine/smdk2440.conf @@ -15,4 +15,4 @@ IMAGE_FSTYPES = "tar.gz" MACHINE_FEATURES = "kernel26 apm screen" -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf index 0f7419f80b..d3fccf1352 100644 --- a/conf/machine/smdk2443.conf +++ b/conf/machine/smdk2443.conf @@ -7,6 +7,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443" +UBOOT_ENTRYPOINT = "30008000" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySAC0" @@ -15,4 +16,4 @@ IMAGE_FSTYPES = "tar.gz" MACHINE_FEATURES = "kernel26 apm screen" -require conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 3199065606..32060d090c 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -5,6 +5,8 @@ require conf/machine/include/zaurus-2.6.inc require conf/machine/include/zaurus-clamshell.inc +MACHINE_FEATURES += "iwmmxt" + PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PACKAGE_EXTRA_ARCHS += "iwmmxt" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index 0898da1520..519c565061 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -20,4 +20,4 @@ EXTRA_IMAGECMD = "--big-endian" ERASEBLOCK_SIZE = "0x10000" IMAGE_FSTYPES = "jffs2" -require conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.inc diff --git a/conf/machine/titan.conf b/conf/machine/titan.conf index bbf1e23b15..9fba78a651 100644 --- a/conf/machine/titan.conf +++ b/conf/machine/titan.conf @@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-titan-sh4" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" # SH4 specific settings -require conf/machine/include/tune-sh4.conf +require conf/machine/include/tune-sh4.inc # Serial console settings for sysvinit SERIAL_CONSOLE = "38400 ttySC1" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 83227ee0c4..d70db72f38 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -4,6 +4,8 @@ require conf/machine/include/zaurus-2.6.inc +IMAGE_FSTYPES ?= "jffs2" + # newer kernels does not build PREFERRED_VERSION_linux-rp = "2.6.17" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index ab98a07278..2dbe3ea863 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -14,5 +14,5 @@ SERIAL_CONSOLE = "38400 ttyS0" KERNEL_CONSOLE = "ttys0,38400" USE_VT = "0" -require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/ts72xx.conf b/conf/machine/ts72xx.conf new file mode 100644 index 0000000000..632f3044cc --- /dev/null +++ b/conf/machine/ts72xx.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@Name: Technologic Systems TS-72xx SBC +#@DESCRIPTION: Machine configuration for Technologic Systems TS-72xx SBC + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen" + +# default is 2.6.22.6 +#PREFERRED_VERSION_linux = "2.6.23-rc5" + +SERIAL_CONSOLE = "115200 ttyAM0" +USE_VT = "0" +CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/om2007.2/ts72xx/tmp/deploy/glibc/images/ts72xx/nfs_root" + +require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index 33e0427a8e..5c86a5fa2b 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -25,4 +25,4 @@ IMAGE_FSTYPES = "jffs2" EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=0x20000" IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" -require conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.inc diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf index 34d6775932..d73c80214c 100644 --- a/conf/machine/wrap.conf +++ b/conf/machine/wrap.conf @@ -32,3 +32,5 @@ IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt" # glibc GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" + +KERNEL_IMAGETYPE = "bzImage" diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf new file mode 100644 index 0000000000..ad5badf84a --- /dev/null +++ b/conf/machine/x86-32-nocona.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: x86-nocona +#@DESCRIPTION: Machine configuration for Intel 'Nocona' processor in 32-bit mode +# + +TARGET_ARCH = "i686" +MACHINE_ARCH = "x86-32-nocona" +PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686" + +require conf/machine/include/tune-x86-nocona.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +OLDEST_KERNEL = "2.6.20" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +IMAGE_FSTYPES = "ext2.gz" + +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" +MACHINE_TASK_PROVIDER = "task-base" + diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf new file mode 100644 index 0000000000..b4021a6496 --- /dev/null +++ b/conf/machine/x86-prescott.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: x86-prescott +#@DESCRIPTION: Machine configuration for a generic i686 machine + +TARGET_ARCH = "i686" +MACHINE_ARCH = "x86-prescott" +PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686" + +require conf/machine/include/tune-x86-prescott.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +OLDEST_KERNEL = "2.6.20" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +IMAGE_FSTYPES = "ext2.gz" + +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" +MACHINE_TASK_PROVIDER = "task-base" + diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf index e0d4cc96a2..51757e950c 100644 --- a/conf/machine/x86.conf +++ b/conf/machine/x86.conf @@ -7,6 +7,8 @@ TARGET_ARCH = "i486" # TARGET_VENDOR = "-oe" PACKAGE_EXTRA_ARCHS = "x86" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" + +KERNEL_IMAGETYPE = "bzImage" # todo: convert to task-base # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" @@ -18,4 +20,4 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -#require conf/machine/include/tune-x86.conf +#require conf/machine/include/tune-x86.inc diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf index a4979d4527..9b51b87a7f 100644 --- a/conf/machine/xilinx-ml403.conf +++ b/conf/machine/xilinx-ml403.conf @@ -2,21 +2,20 @@ # Released under the MIT license (see packages/COPYING) #@TYPE: Machine #@Name: Xilinx ML403 FPGA Development Platform -#@DESCRIPTION: Machine configuration for Xilinx ML403 (softcore ppc) development platform \ -http://www.xilinx.com/ml403 +#@DESCRIPTION: Machine configuration for Xilinx ML403 (softcore ppc) development platform http://www.xilinx.com/ml403 TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc405" -PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" +PREFERRED_PROVIDER_virtual/kernel = "linux-ml403-slab-2.6.x" MACHINE_FEATURES = "kernel26 ext2" TARGET_CPU = "405" -OLDEST_KERNEL = "2.6.12" +#OLDEST_KERNEL = "2.6.20" SERIAL_CONSOLE = "115200 ttyS0" #tune for the 405 cpu -require conf/machine/include/tune-ppc405.conf +require conf/machine/include/tune-ppc405.inc diff --git a/conf/machine/xilinx-ml410.conf b/conf/machine/xilinx-ml410.conf index 9adb26e43e..ea61b7a7fd 100644 --- a/conf/machine/xilinx-ml410.conf +++ b/conf/machine/xilinx-ml410.conf @@ -18,5 +18,5 @@ OLDEST_KERNEL = "2.6.12" SERIAL_CONSOLE = "115200 ttyS0" #tune for the 405 cpu -require conf/machine/include/tune-ppc405.conf +require conf/machine/include/tune-ppc405.inc |