diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/angstrom-2008.1.conf | 6 | ||||
-rw-r--r-- | conf/distro/include/sane-srcdates.inc | 5 | ||||
-rw-r--r-- | conf/machine/alix.conf | 2 | ||||
-rw-r--r-- | conf/machine/at32stk1000.conf | 2 | ||||
-rw-r--r-- | conf/machine/at91sam9263ek.conf | 2 | ||||
-rw-r--r-- | conf/machine/atngw100.conf | 1 | ||||
-rw-r--r-- | conf/machine/compulab-pxa270.conf | 21 | ||||
-rw-r--r-- | conf/machine/epia.conf | 1 | ||||
-rw-r--r-- | conf/machine/fic-gta01.conf | 2 | ||||
-rw-r--r-- | conf/machine/geodegx.conf | 2 | ||||
-rw-r--r-- | conf/machine/geodelx.conf | 2 | ||||
-rw-r--r-- | conf/machine/guinness.conf | 2 | ||||
-rw-r--r-- | conf/machine/gumstix.conf | 18 | ||||
-rw-r--r-- | conf/machine/i586-generic.conf | 2 | ||||
-rw-r--r-- | conf/machine/i686-generic.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/tune-ppc440e.conf | 4 | ||||
-rw-r--r-- | conf/machine/include/tune-ppc603e.conf | 2 | ||||
-rw-r--r-- | conf/machine/kb9202.conf | 2 | ||||
-rw-r--r-- | conf/machine/netvista.conf | 2 | ||||
-rw-r--r-- | conf/machine/progear.conf | 2 | ||||
-rw-r--r-- | conf/machine/sarge-at91.conf | 2 | ||||
-rw-r--r-- | conf/machine/wrap.conf | 2 | ||||
-rw-r--r-- | conf/machine/x86.conf | 2 | ||||
-rw-r--r-- | conf/machine/xilinx-ml403.conf | 7 |
24 files changed, 80 insertions, 15 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index dcf224f798..655d435994 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -29,8 +29,8 @@ PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12" PREFERRED_VERSION_linux-libc-headers = "2.6.22" #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing. -PREFERRED_VERSION_glibc = "2.6" -PREFERRED_VERSION_glibc-intermediate = "2.6" -PREFERRED_VERSION_glibc-initial = "2.6" +PREFERRED_VERSION_glibc = "2.6.1" +PREFERRED_VERSION_glibc-intermediate = "2.6.1" +PREFERRED_VERSION_glibc-initial = "2.6.1" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 262f452058..75d078e02f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -40,6 +40,9 @@ SRCDATE_psplash ?= "20070330" SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" +# OpenMoko +SRCDATE_uboot-openmoko = "20070820" + # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" @@ -133,7 +136,7 @@ SRCDATE_oprofile ?= "20061011" SRCDATE_portaudio ?= "20060814" SRCDATE_putty ?= "20060814" SRCDATE_python-cairo ?= "20060814" -SRCDATE_qemu-native ?= "20060723" +SRCDATE_qemu-native ?= "20070613" SRCDATE_roadster ?= "20060814" SRCDATE_sctzap ?= "20060814" SRCDATE_tslib ?= "20051101" diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf index adb8f23fa3..77312791dc 100644 --- a/conf/machine/alix.conf +++ b/conf/machine/alix.conf @@ -22,3 +22,5 @@ IMAGE_FSTYPES += "tar.gz" MACHINE_EXTRA_RRECOMMENDS = "\ kernel-modules \ " + +KERNEL_IMAGETYPE = "bzImage" 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/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index ad94420196..4f3ae577a9 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -19,3 +19,5 @@ SERIAL_CONSOLE = "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" require conf/machine/include/tune-arm926ejs.conf + +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/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index b1e7082fd7..c82c2500d1 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -11,8 +11,13 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te" require conf/machine/include/tune-xscale.conf -# used by sysvinit_2 -SERIAL_CONSOLE ?= "38400 ttySA0" +# used by sysvinit_2 package, so rebuild this +# package if you change the SERIAL_CONSOLE setting +# the following is the 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 ttyS1" # used by opie-collections.inc ROOT_FLASH_SIZE ?= "32" @@ -29,3 +34,15 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no- 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 +# - 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 + + diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 5a3b5875a3..ea4b568338 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" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 4649fe130e..cc604a0ada 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -36,7 +36,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 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..c35d3b381e 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -11,6 +11,8 @@ PREFERRED_PROVIDER_xserver = "xserver-xorg" udevdir = "/dev" +KERNEL_IMAGETYPE = "bzImage" + OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf index e259477a7b..9d51cdcead 100644 --- a/conf/machine/gumstix.conf +++ b/conf/machine/gumstix.conf @@ -5,10 +5,18 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix" +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" OLDEST_KERNEL = "2.6.15" +UBOOT_ENTRYPOINT = "a0008000" + #Assume people have some gumstix extension boards MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget bluetooth" @@ -16,6 +24,14 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash" GUMSTIX_400MHZ = "y" +MACHINE_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" + + # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index de620fcd61..2cae2a87dc 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" diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index 5eba33fa97..883d6b4dd0 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" diff --git a/conf/machine/include/tune-ppc440e.conf b/conf/machine/include/tune-ppc440e.conf index 0cfa50c69e..5c47482a54 100644 --- a/conf/machine/include/tune-ppc440e.conf +++ b/conf/machine/include/tune-ppc440e.conf @@ -1,2 +1,2 @@ -TARGET_CC_ARCH = "-mcpu=440fp" -PACKAGE_ARCH = "ppc440" +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 index 7c8714cfc2..1a004d30b5 100644 --- a/conf/machine/include/tune-ppc603e.conf +++ b/conf/machine/include/tune-ppc603e.conf @@ -1,2 +1,2 @@ -TARGET_CC_ARCH = "-mcpu=603e" +TARGET_CC_ARCH = "-mcpu=603e -mhard-float" PACKAGE_ARCH = "ppc603e" diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf index 0e9c0d3b92..6501896780 100644 --- a/conf/machine/kb9202.conf +++ b/conf/machine/kb9202.conf @@ -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/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/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/sarge-at91.conf b/conf/machine/sarge-at91.conf index 6001e69cf7..f1a8b7f271 100644 --- a/conf/machine/sarge-at91.conf +++ b/conf/machine/sarge-at91.conf @@ -21,3 +21,5 @@ 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/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.conf b/conf/machine/x86.conf index e0d4cc96a2..af0cf8996b 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" diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf index a4979d4527..1ab8721508 100644 --- a/conf/machine/xilinx-ml403.conf +++ b/conf/machine/xilinx-ml403.conf @@ -2,18 +2,17 @@ # 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" |