diff options
author | Koen Kooi <koen@openembedded.org> | 2008-01-15 09:18:57 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2008-01-15 09:18:57 +0000 |
commit | f0d173cd5077621891f8298dc259476c72719bc0 (patch) | |
tree | 2c9dc33c25bc107bff37418605793ebb2c279fef /conf | |
parent | fa04db1991f2372697d20bd79eb47fdeb784dd69 (diff) | |
parent | 405afb504f29cfeaf139558ffbef32d37b435828 (diff) |
propagate from branch 'org.openembedded.dev' (head 6d44b490ec30acc0370a045d7b1eb3eae2b73ab9)
to branch 'org.openembedded.dev.avr32' (head 6793a5c97e2e2221d152d0e63239c891b2c4ec5e)
Diffstat (limited to 'conf')
28 files changed, 69 insertions, 43 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 82c31cb64a..156b5b21a3 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1305,7 +1305,7 @@ PREFERRED_VERSION_nano ?= "2.0.6" PREFERRED_VERSION_nasm-native ?= "0.98.38" PREFERRED_VERSION_nautilus ?= "2.12.2" PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5" -PREFERRED_VERSION_navit ?= "0.0.1" +PREFERRED_VERSION_navit ?= "0.0.3" PREFERRED_VERSION_nbd ?= "2.8.7" PREFERRED_VERSION_ncftp ?= "3.2.0" PREFERRED_VERSION_ncmpc ?= "0.11.1" @@ -1538,7 +1538,6 @@ PREFERRED_VERSION_python-pylinda ?= "0.6" PREFERRED_VERSION_python-pylint ?= "0.13.2" PREFERRED_VERSION_python-pymetar ?= "0.11" PREFERRED_VERSION_python-pymp3 ?= "0.3.4" -PREFERRED_VERSION_python-pyqt ?= "4.3" PREFERRED_VERSION_python-pyrad ?= "0.8" PREFERRED_VERSION_python-pyraf ?= "1.4" PREFERRED_VERSION_python-pyreverse ?= "0.5.2" @@ -1560,7 +1559,6 @@ PREFERRED_VERSION_python-scons-native ?= "0.97" PREFERRED_VERSION_python-setuptools ?= "0.6c6" PREFERRED_VERSION_python-sgmlop ?= "1.1" PREFERRED_VERSION_python-simplejson ?= "1.7.1" -PREFERRED_VERSION_python-sip ?= "4.7" PREFERRED_VERSION_python-snmplib ?= "0.1.1" PREFERRED_VERSION_python-soappy ?= "0.11.6" PREFERRED_VERSION_python-spydi ?= "0.9.7" @@ -1721,7 +1719,6 @@ PREFERRED_VERSION_sidplayer ?= "1.5.0" PREFERRED_VERSION_silo ?= "1.4.8" PREFERRED_VERSION_simh ?= "3.7-1" PREFERRED_VERSION_simpad-utilities ?= "1.0" -PREFERRED_VERSION_sip-native ?= "4.7" PREFERRED_VERSION_sip3-native ?= "4.0.1" PREFERRED_VERSION_sipsak ?= "0.9.6" PREFERRED_VERSION_skippy-xd ?= "0.5.0" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 11cee727c5..fe216800c3 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -153,6 +153,7 @@ FEED_ARCH_nslu2be = "armv5teb" # armv6 FEED_ARCH_mx31ads = "armv6" +FEED_ARCH_mx31moboard = "armv6" FEED_ARCH_nokia800 = "armv6" FEED_ARCH_omap2420h4 = "armv6" FEED_ARCH_omap2430sdp = "armv6" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 8f82eb4611..23e3ed3243 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20071206" +EFL_SRCDATE = "20080110" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -88,6 +88,7 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}" SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" +SRCDATE_python-edbus ?= "${EFL_SRCDATE}" SRCDATE_python-emotion ?= "${EFL_SRCDATE}" SRCDATE_python-epsilon ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" @@ -106,7 +107,8 @@ SRCDATE_entice ?= "${EFL_SRCDATE}" SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" SRCDATE_e-wm ?= "${EFL_SRCDATE}" -SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_enna = "20080116" +#SRCDATE_enna ?= "${EFL_SRCDATE}" SRCDATE_exquisite ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index af96ae435a..fb369a8ea3 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,7 +43,7 @@ SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "957" -SRCREV_pn-linux-openmoko ?= "3238" +SRCREV_pn-linux-openmoko ?= "3801" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" @@ -104,7 +104,7 @@ SRCREV_pn-openmoko-stylus-demo-simple ?= "1818" SRCREV_pn-openmoko-taskmanager ?= "1663" SRCREV_pn-openmoko-tasks ?= "320" SRCREV_pn-openmoko-tasks2 ?= "361" -SRCREV_pn-openmoko-terminal2 ?= "3542" +SRCREV_pn-openmoko-terminal2 ?= "3764" SRCREV_pn-openmoko-theme-standard ?= "2370" SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" SRCREV_pn-openmoko-theme-standard2 ?= "3425" @@ -118,6 +118,7 @@ SRCREV_pn-openocd-native ?= "206" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" SRCREV_pn-python-formencode = "3148" +SRCREV_pn-python-gsmd = "127" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index e3ddd2165b..fc679a0b68 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -4,6 +4,7 @@ #@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform #----------------------------------------------------------------------------- +require conf/distro/include/preferred-om-2008-versions.inc require conf/distro/include/angstrom-2007-for-openmoko.inc # @@ -47,11 +48,6 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd" # Same kernel runs on both these machines PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}" -# Same touchscreen on both these machines -PACKAGE_ARCH_pn-pointercal_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-pointercal_fic-gta02 = "${MACHINE_CLASS}" -SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta01 = "0" -SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta02 = "0" # Same kernel so same usb PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}" diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf index fc760f9ea0..92e5ac5b39 100644 --- a/conf/distro/openwrt-sdk.conf +++ b/conf/distro/openwrt-sdk.conf @@ -18,9 +18,12 @@ require conf/distro/generic-uclibc.conf # Header # DISTRO_NAME = "OpenWRT" +DISTRO_REVISION = "2" + +IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" # This is what lives in SDK ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" # Make sure that we have correct package dependencies for SDK-provided libs. -ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc" +ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index c91bdcfc92..b9e6f6e6aa 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices TARGET_ARCH = "arm" +TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110" MACHINE_KERNEL_VERSION ?= "2.6" require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc @@ -13,13 +14,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" - IMAGE_LINGUAS = "" - IMAGE_FSTYPES ?= "jffs2 tar.gz" -require conf/machine/include/tune-strongarm.inc - ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index baa2e55dc1..ad0c64bef2 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -44,6 +44,3 @@ EXTRA_IMAGEDEPENDS += "dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc -# set partition to flash kernel into -MTD_KERNEL_PARTITION = "/dev/mtd2" - diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index 2b2d016089..dad60e20c8 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -46,6 +46,3 @@ include conf/machine/include/tune-arm920t.inc # build YAFFS2 IMAGE_FSTYPES ?= "jffs2 yaffs2" -# set partition to flash kernel into -MTD_KERNEL_PARTITION = "/dev/mtd2" - diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index c037226154..6f0e37b803 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.inc +require conf/machine/include/tune-strongarm1100.inc # h3700, h3800 have 32, but let that be the bonus ROOT_FLASH_SIZE = "16" diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf index 6bf89999bf..f7f025413d 100644 --- a/conf/machine/htcalpine.conf +++ b/conf/machine/htcalpine.conf @@ -15,7 +15,7 @@ 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 irda bluetooth usbgadget screen vfat" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf index afaa6fc294..b3debb633c 100644 --- a/conf/machine/htcapache.conf +++ b/conf/machine/htcapache.conf @@ -15,7 +15,7 @@ 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 irda bluetooth usbgadget screen vfat" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index a5feeb2d69..f95cb70833 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "128" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf index 003406bd88..472e5d69e6 100644 --- a/conf/machine/htchimalaya.conf +++ b/conf/machine/htchimalaya.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf index a577cc78d2..2ae1419bae 100644 --- a/conf/machine/htcsable.conf +++ b/conf/machine/htcsable.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "240" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf index 016247213d..b311afe1b4 100644 --- a/conf/machine/htctornado.conf +++ b/conf/machine/htctornado.conf @@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux-tornado-omap2" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat phone" MACHINE_EXTRA_RDEPENDS = "alsa-state" diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf index 34255a1536..515700d9e6 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.inc +require conf/machine/include/tune-strongarm1100.inc ROOT_FLASH_SIZE = "16" VOLATILE_STORAGE_SIZE = "32" diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc index bc80185fa0..8f8ccafeb1 100644 --- a/conf/machine/include/collie-2.6.inc +++ b/conf/machine/include/collie-2.6.inc @@ -12,7 +12,7 @@ zaurus_make_installkit () { rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ mkdir ${IMAGE_NAME}-installkit/ # Get the latest kernel using the zImage-<machine>.bin symlink - cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin + cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage if [ "${MACHINE}" = "spitz" ]; then cp gnu-tar ${IMAGE_NAME}-installkit/ cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index 87571c0db0..da88b1494f 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -11,8 +11,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" #mtd2: 00580000 00020000 "VFM_Filesystem" #mtd3: 00020000 00020000 "Logo" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" -MACHINE_FEATURES += "iwmmxt" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone" +MACHINE_FEATURES += " iwmmxt" MACHINE_DISPLAY_WIDTH_PIXELS = "240" diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc index d84f1efb26..26d1e3f8ca 100644 --- a/conf/machine/include/qemu.inc +++ b/conf/machine/include/qemu.inc @@ -1,7 +1,6 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_INSTALL += "gaim sylpheed" MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc deleted file mode 100644 index 8654c996ef..0000000000 --- a/conf/machine/include/tune-strongarm.inc +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-march=armv4 -mtune=xscale" - diff --git a/conf/machine/include/tune-strongarm1100.inc b/conf/machine/include/tune-strongarm1100.inc new file mode 100644 index 0000000000..f136710409 --- /dev/null +++ b/conf/machine/include/tune-strongarm1100.inc @@ -0,0 +1,5 @@ +# This machine lists common configuration options for Strongarm 1100 devices +# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type + +TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100" + diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 3f84138ac8..eb020dbcba 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -49,7 +49,7 @@ zaurus_make_installkit () { mkdir ${IMAGE_NAME}-installkit/ # Get the latest kernel using the zImage-<machine>.bin symlink - cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin + cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage if [ "${MACHINE}" = "spitz" ]; then cp gnu-tar ${IMAGE_NAME}-installkit/ diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index 72fff1ed5e..a42dd8c127 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.inc +require conf/machine/include/tune-strongarm1100.inc diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 8741eb4ff6..ee9117e406 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -require conf/machine/include/tune-strongarm.inc +require conf/machine/include/tune-strongarm1100.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf new file mode 100644 index 0000000000..c918404d6c --- /dev/null +++ b/conf/machine/mx31moboard.conf @@ -0,0 +1,33 @@ +#@TYPE: Machine +#@Name: EPFL mx31MoBoard +#@DESCRIPTION: Machine configuration for EPFL MX31MoBoard +#@Website: http://mobots.epfl.ch/mx31MoBoard.html + +TARGET_ARCH = "arm" +TARGET_FPU_arm = "hard" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" + +GUI_MACHINE_CLASS = "smallscreen" +PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +require conf/machine/include/tune-arm1136jf-s.inc + +# +# usb networking +# +module_conf_g_ether = "alias usb0 g_ether" + +# used by sysvinit_2 +SERIAL_CONSOLE = "-L 115200 ttymxc0 vt100" + +# used by opie-collections.inc +ROOT_FLASH_SIZE = "32" + +# to avoid annoying jffs2 messages +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000" + +IMAGE_FSTYPES += "tar.gz" + diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf index d7d35cfda1..87c260856d 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.inc +require conf/machine/include/tune-strongarm1100.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 6334d34171..e187ee1e75 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat" include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc -require conf/machine/include/tune-strongarm.inc +require conf/machine/include/tune-strongarm1100.inc ROOT_FLASH_SIZE = "16" |