diff options
Diffstat (limited to 'conf/machine')
42 files changed, 357 insertions, 124 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 9930c89c6a..6f71787fa1 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -21,3 +21,7 @@ MACHINE_DISPLAY_PPI = "216" UBOOT_MACHINE = "akita_config" UBOOT_ENTRYPOINT = "0xA1000000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" + +# xserver-kdrive 1.3.0.0 is still the only working version: +XSERVER = "xserver-kdrive-1300-fbdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300" diff --git a/conf/machine/at2440evb.conf b/conf/machine/at2440evb.conf new file mode 100644 index 0000000000..f3fa5edfaf --- /dev/null +++ b/conf/machine/at2440evb.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@Name: Avantech AT2440EVB Dev Board +#@DESCRIPTION: Machine configuration for Avantech AT2440EVB Dev Board + + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttySAC0" + +IMAGE_FSTYPES = "tar.gz" +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "30008000" + +MACHINE_FEATURES = "kernel26 screen touchscreen" + +require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf index 50549dabf6..87311e9be4 100644 --- a/conf/machine/at91cap9adk.conf +++ b/conf/machine/at91cap9adk.conf @@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at91cap9adk_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index 3882c118fb..9a7ca9af62 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" -UBOOT_MACHINE = "at92sam9260ek_config" +UBOOT_MACHINE = "at91sam9260ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf index a3a9be6dc1..79f275f483 100644 --- a/conf/machine/at91sam9261ek.conf +++ b/conf/machine/at91sam9261ek.conf @@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" -UBOOT_MACHINE = "at92sam9261ek_config" +UBOOT_MACHINE = "at91sam9261ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index e633148172..f052170aed 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -10,7 +10,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at91sam9263ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf index 903e953b13..7dc6ba0d53 100644 --- a/conf/machine/at91sam9g20ek.conf +++ b/conf/machine/at91sam9g20ek.conf @@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at91sam9g20ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" @@ -18,8 +17,7 @@ PREFERRED_VERSION_at91bootstrap = "2.10" USE_VT = "0" MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" -#EXTRA_IMAGEDEPENDS += "u-boot" -#EXTRA_IMAGEDEPENDS += "at91bootstrap" +EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf index ba19cb3e00..f7a78dcf75 100644 --- a/conf/machine/at91sam9rlek.conf +++ b/conf/machine/at91sam9rlek.conf @@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" -UBOOT_MACHINE = "at92sam9rlek_config" +UBOOT_MACHINE = "at91sam9rlek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf index 3c21c546b1..956e3f47b5 100644 --- a/conf/machine/cm-x270.conf +++ b/conf/machine/cm-x270.conf @@ -4,7 +4,6 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS ?= "bigscreen" - PREFERRED_PROVIDER_virtual/kernel = "linux" PACKAGE_EXTRA_ARCHS = " iwmmxt" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 96f430f377..47f6e30dfd 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -2,35 +2,17 @@ #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices -TARGET_ARCH = "arm" +require conf/machine/include/zaurus-2.6.inc require conf/machine/include/tune-strongarm.inc -MACHINE_KERNEL_VERSION = "2.6" -KERNEL_IMAGE_MAXSIZE = "1048576" -KERNEL_IMAGETYPE = "zImage" -SERIAL_CONSOLE = "115200 ttySA0" - ROOT_FLASH_SIZE = "14" -# actually 14680064, see EXTRA_IMAGECMD - -PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - -XSERVER ?= "xserver-kdrive-fbdev" - +# actually 14680064 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -IMAGE_LINGUAS ?= "" -IMAGE_FSTYPES ?= "jffs2 tar.gz" - -PCMCIA_MANAGER ?= "pcmciautils" - -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" +XSERVER = "xserver-kdrive-fbdev" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "270" MACHINE_DISPLAY_PPI = "114" - -require conf/machine/include/kexecboot.inc diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf deleted file mode 100644 index f52efc2aab..0000000000 --- a/conf/machine/davinci-dvevm.conf +++ /dev/null @@ -1,24 +0,0 @@ -#@TYPE: Machine -#@NAME: DM6446 cpu on a Davinci EVM board -#@DESCRIPTION: Machine configuration for the TI Davinci EVM board - -TARGET_ARCH = "arm" - -HOTPLUG = "udev" - -PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" - -#PREFERRED_VERSION_u-boot = "1.3.2" -UBOOT_MACHINE = "davinci_dvevm_config" -UBOOT_ENTRYPOINT="0x80008000" - -SERIAL_CONSOLE ?= "115200 ttyS0" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" - -#ROOT_FLASH_SIZE = "29" - -MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" - -require conf/machine/include/tune-arm926ejs.inc - diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf new file mode 100644 index 0000000000..9ef4ff7c7d --- /dev/null +++ b/conf/machine/dm355-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM355 CPUs on a Davinci DM355 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci DM355 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dm355_evm_config" diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf index 5131488577..a488e0b1c8 100644 --- a/conf/machine/dm355-leopard.conf +++ b/conf/machine/dm355-leopard.conf @@ -2,18 +2,14 @@ #@NAME: Leopard "beagle buddy" DM355 based IP cam board #@DESCRIPTION: Machine configuration for the DM355 leopard board +require conf/machine/include/davinci.inc TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" - PREFERRED_VERSION_u-boot = "1.2.0" -UBOOT_MACHINE = "dm355_leopard_config" +UBOOT_MACHINE = "davinci_leopard_config" UBOOT_ENTRYPOINT = "0x80008000" SERIAL_CONSOLE ?= "115200 ttyS0" MACHINE_FEATURES = "kernel26 alsa ethernet usbhost usbgadget mmc" -require conf/machine/include/tune-arm926ejs.inc - diff --git a/conf/machine/dm357-evm.conf b/conf/machine/dm357-evm.conf new file mode 100644 index 0000000000..85e396ec1a --- /dev/null +++ b/conf/machine/dm357-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM357 CPUs on a Davinci DM357 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci DM357 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf new file mode 100644 index 0000000000..de2cc4a759 --- /dev/null +++ b/conf/machine/dm365-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM365 CPUs on a Davinci DM365 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dm365_evm_config" diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf new file mode 100644 index 0000000000..8b048a5474 --- /dev/null +++ b/conf/machine/dm6446-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM644x CPUs on a Davinci DM6446 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/dm6467-evm.conf b/conf/machine/dm6467-evm.conf new file mode 100644 index 0000000000..a7596f17f8 --- /dev/null +++ b/conf/machine/dm6467-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM646x CPUs on a Davinci HD DM6467 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci HD DM6467 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dm6467_evm_config" diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 268ed52b61..6b91d1b951 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 USE_VT = "0" -MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen" +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen maverick" # used by sysvinit_2 SERIAL_CONSOLE = "57600 ttyAM0" @@ -21,9 +21,11 @@ ROOT_FLASH_SIZE = "8" #extra jffs2 tweaks EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 " -#tune for ep93xx cpus -#can be used for crunch support later on +# tune for ep93xx cpus can be used for crunch support but it is not +# recommended to build whole rootfs with it (it boots anyway) +# better would be building separate applications/libraries which makes +# use of floating point operations +# #require conf/machine/include/tune-ep9312.inc - require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index 6fe6a830e6..0ec6782076 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "i486" -require conf/machine/include/tune-geodegx.inc +require conf/machine/include/tune-geode.inc PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" @@ -14,4 +14,4 @@ udevdir = "/dev" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf index de4d9ca16e..f8874fd966 100644 --- a/conf/machine/geodelx.conf +++ b/conf/machine/geodelx.conf @@ -1,14 +1,15 @@ -TARGET_ARCH = "i486" +# Machine file for devices with the AMD Geode LX processor +# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) -require conf/machine/include/tune-geodelx.inc +TARGET_ARCH = "i486" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" +require conf/machine/include/tune-geode.inc -PREFERRED_PROVIDER_virtual/kernel="linux-geodelx" - -SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}" +PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" +SELECTED_OPTIMIZATION_pn-glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}" diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc new file mode 100644 index 0000000000..af9dc0ff9c --- /dev/null +++ b/conf/machine/include/davinci.inc @@ -0,0 +1,25 @@ +require conf/machine/include/tune-arm926ejs.inc + +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r8" + +TARGET_ARCH = "arm" + +KERNEL_IMAGETYPE = "uImage" + +PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +UBOOT_MACHINE = "davinci_dvevm_config" + +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" + +#EXTRA_IMAGEDEPENDS += "u-boot ubl" + +SERIAL_CONSOLE ?= "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +#ROOT_FLASH_SIZE = "29" + +MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa" diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc index 1835af4727..6ee1ddc3fa 100644 --- a/conf/machine/include/kexecboot.inc +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -1,16 +1,13 @@ -# kexecboot specific config options - -# NOTE: include this file after zaurus-2.6.inc for zaurus machines +# initramfs-kexecboot specific config options MACHINE_FEATURES_append = " kexecboot " -IMAGE_FSTYPES += " tar.gz " EXTRA_IMAGEDEPENDS += "linux-kexecboot" -# Include Kernel image in kexecboot enabled images +# Include kernel image in kexecboot enabled images RDEPENDS_kernel-base = "kernel-image" -# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels +# we store kernel images in rootfs and only a minimal initramfs kernel in nand for booting other kernels DONT_CHECK_KERNELSIZE ?= "1" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index 3f0b8003f5..c185deb555 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r4" +MACHINE_KERNEL_PR = "r8" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 9f48f750e7..8e90453d4c 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,13 +1,30 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r33" +MACHINE_KERNEL_PR = "r37" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" -EXTRA_IMAGEDEPENDS += "u-boot x-load" +# Only build u-boot, xload is optional +EXTRA_IMAGEDEPENDS += "u-boot" MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " + +# TI DVSDK stuff: +CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530" +CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530" +DSPCFG ?= "OMAP3530SHMEM" +DSPLINKDSPCFG ?= "OMAP3530SHMEM" +DSPLINKGPPOS ?= "OMAPLSP" +GPPOS ?= "OMAPLSP" +DSPLINKPLATFORM ?= "OMAP3530" +DSPLINKSOC ?= "3530" +DSPPOWERSOC ?= "omap3530" +LPMDSPPOWERSOC ?= "omap3530" +PLATFORM ?= "omap3530" +TARGET ?= "o3530_al" +XDC_PLATFORM ?= ti.platforms.evm3530 + diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc index cf3de9c56f..c8770e0783 100644 --- a/conf/machine/include/tune-ep9312.inc +++ b/conf/machine/include/tune-ep9312.inc @@ -1,11 +1,14 @@ -TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" -# add "-mfp=maverick" for newer gcc versions > 4.0 +TARGET_CC_ARCH = "-mcpu=ep9312 -mfpu=maverick -mfloat-abi=softfp" #set arch to ep9312 for all generated packages -PACKAGE_EXTRA_ARCHS += "armv4 armv4t ep9312" +PACKAGE_EXTRA_ARCHS += "armv4t ep9312" BASE_PACKAGE_ARCH = "ep9312" FEED_ARCH = "ep9312" # Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish require conf/machine/include/tune-thumb.inc +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros" +DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer -g" +SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}" +BUILD_OPTIMIZATION = "-O" diff --git a/conf/machine/include/tune-geodegx.inc b/conf/machine/include/tune-geode.inc index cae285a91c..eda332a74e 100644 --- a/conf/machine/include/tune-geodegx.inc +++ b/conf/machine/include/tune-geode.inc @@ -1,6 +1,5 @@ -TARGET_CC_ARCH = "-march=geode" +TARGET_CC_ARCH = "-march=geode -mtune=geode" BASE_PACKAGE_ARCH = "geode" PACKAGE_EXTRA_ARCHS += "x86 i386 geode" FEED_ARCH = "geode" - diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc deleted file mode 100644 index 63e6678947..0000000000 --- a/conf/machine/include/tune-geodelx.inc +++ /dev/null @@ -1,9 +0,0 @@ -# Geode CPU has it's own target in GCC 4.3 -# in older versions k6-2 is closest -# -TARGET_CC_ARCH = "-march=geode" -BASE_PACKAGE_ARCH = "geode" -PACKAGE_EXTRA_ARCHS += "x86 i386 geode" - -FEED_ARCH = "geode" - diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index c6dafc19d9..ba923f9515 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -1,10 +1,8 @@ -# Zaurus specific configuration for kernel 2.6 +# Zaurus common settings # Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" -MACHINE_KERNEL_VERSION = "2.6" - ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" @@ -17,34 +15,38 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f EXTRA_IMAGEDEPENDS += "zaurus-installer" SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE_collie = "115200 ttySA0" -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" +PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" PCMCIA_MANAGER ?= "pcmciautils" -IMAGE_FSTYPES += "jffs2" +IMAGE_FSTYPES += "jffs2 tar.gz" MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" -MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " MACHINE_FEATURES_append_spitz = " usbhost " +MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" +MACHINE_EXTRA_RDEPENDS_collie = "" -# Fixme ? -######### +# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel # Here we just need snd modules MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -KERNEL_IMAGE_MAXSIZE = "1294336" +# For tosa: OHCI suspend/resume fixup +# wlan-ng is now in kernel (2.6.29) +# Fixme ? module-snd for tosa +MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" -ZAURUS_KERNEL_IMAGETYPE ?= "zImage" -KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" +# Fixme ? module-snd for collie +MACHINE_EXTRA_RRECOMMENDS_collie = "" -require conf/machine/include/kexecboot.inc +require conf/machine/include/zaurus-kernel.inc +require conf/machine/include/initramfs-kexecboot.inc diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc new file mode 100644 index 0000000000..d9f1c1ba85 --- /dev/null +++ b/conf/machine/include/zaurus-kernel.inc @@ -0,0 +1,13 @@ +# Zaurus common kernel settings + +MACHINE_KERNEL_VERSION = "2.6" + +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_PROVIDER_virtual/kernel_collie = "linux" +PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" + +KERNEL_IMAGE_MAXSIZE = "1294336" +KERNEL_IMAGE_MAXSIZE_collie = "1048576" + +ZAURUS_KERNEL_IMAGETYPE ?= "zImage" +KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf index f46d4f5822..37311ad965 100644 --- a/conf/machine/micro2440.conf +++ b/conf/machine/micro2440.conf @@ -4,21 +4,35 @@ TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux = "2.6.29" +IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ + files/device_table_add-s3c_serial.txt" + +PREFERRED_VERSION_u-boot = "git" +UBOOT_MACHINE = "mini2440_config" +UBOOT_ENTRYPOINT = "30008000" + +PREFERRED_PROVIDER_virtual/kernel = "linux-mini2440" + +# This can be used as alternative, stable kernel +# PREFERRED_PROVIDER_virtual/kernel = "linux" +# PREFERRED_VERSION_linux = "2.6.29" + |