From 24dc165e69127f086ed7eb6970c64f91393e84ef Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 5 Sep 2010 12:03:49 -0700 Subject: bitbake.conf: Redefine STAGING_DIR_JAVA to point to target sysroot by default Signed-off-by: Khem Raj --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 677c76a2f7..b0994995cb 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -295,7 +295,6 @@ B = "${S}" STAGING_DIR = "${TMPDIR}/sysroots" -STAGING_DIR_JAVA = "${STAGING_DIR}/java" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}" @@ -321,6 +320,7 @@ STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" # This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine # specific packages - hack around it for now. STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" +STAGING_DIR_JAVA = "${STAGING_DATADIR}/java" STAGING_DIR_SDK = "${STAGING_DIR}/${SDK_SYS}" -- cgit 1.2.3-korg From ea3dc4fee9ae74183f7fa9aa3ff06d0151f51da6 Mon Sep 17 00:00:00 2001 From: Filip Zyzniewski Date: Fri, 27 Aug 2010 23:32:16 +0200 Subject: jlime: fix glibc include Obsolete glibc include caused SyntaxErrors in uclibc bb files. --- conf/distro/jlime-2010.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index f62ca9970e..8df92ee321 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -87,7 +87,7 @@ TARGET_FPU_mipsel = "soft" TARGET_FPU_mips = "soft" LIBC = "glibc" -require conf/distro/include/${LIBC}.inc +require conf/distro/include/sane-toolchain-${LIBC}.inc PREFERRED_VERSION_linux-libc-headers = "2.6.31" PREFERRED_VERSION_glibc-initial = "2.9" -- cgit 1.2.3-korg From d2cbace664ae590f9b92311578f11918ed3d400a Mon Sep 17 00:00:00 2001 From: Filip Zyzniewski Date: Sat, 28 Aug 2010 00:00:15 +0200 Subject: jlime: set virtual/libc preferred provider. base-image has virtual/libc in dependences and so needs it specified. --- conf/distro/jlime-2010.1.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index 8df92ee321..3daaf2787b 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -89,6 +89,7 @@ TARGET_FPU_mips = "soft" LIBC = "glibc" require conf/distro/include/sane-toolchain-${LIBC}.inc +PREFERRED_PROVIDER_virtual/libc = "${LIBC}" PREFERRED_VERSION_linux-libc-headers = "2.6.31" PREFERRED_VERSION_glibc-initial = "2.9" PREFERRED_VERSION_glibc = "2.9" -- cgit 1.2.3-korg From 254e5fc2ca70b27365074c8883fc716003be99c9 Mon Sep 17 00:00:00 2001 From: Filip Zyzniewski Date: Sat, 28 Aug 2010 00:02:18 +0200 Subject: jlime: bumped up coreutils-native version. version 7.2 is not available in OE tree anymore. --- conf/distro/jlime-2010.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index 3daaf2787b..ebde763a6d 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -73,7 +73,7 @@ PREFERRED_VERSION_gcc-cross-initial = "4.4.2" PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2" PREFERRED_VERSION_binutils = "2.20" PREFERRED_VERSION_binutils-cross = "2.20" -PREFERRED_VERSION_coreutils-native = "7.2" +PREFERRED_VERSION_coreutils-native = "8.5" # # Target OS & FPU system -- cgit 1.2.3-korg From ab5e49c5861a43ae0cab72c2d7b58987ec55c6e9 Mon Sep 17 00:00:00 2001 From: Filip Zyzniewski Date: Sat, 28 Aug 2010 13:59:41 +0200 Subject: jlime: switched from OABI to EABI. note: should we set TARGET_OS to linux-gnueabi even if distro supports machines other than ARM? --- conf/distro/jlime-2010.1.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index ebde763a6d..0579296f6f 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -78,7 +78,7 @@ PREFERRED_VERSION_coreutils-native = "8.5" # # Target OS & FPU system # -TARGET_OS = "linux" +TARGET_OS = "linux-gnueabi" TARGET_FPU_sh = "soft" TARGET_FPU_arm = "soft" @@ -86,6 +86,8 @@ TARGET_FPU_armeb = "soft" TARGET_FPU_mipsel = "soft" TARGET_FPU_mips = "soft" +DISTRO_FEATURES += " eabi " + LIBC = "glibc" require conf/distro/include/sane-toolchain-${LIBC}.inc -- cgit 1.2.3-korg From 701fec42f47ad69ea6c5c2af27b70efa3eaba4aa Mon Sep 17 00:00:00 2001 From: Filip Zyzniewski Date: Sat, 28 Aug 2010 15:28:39 +0200 Subject: jlime: removed some of PREFERRED_VERSION entries It seems that these hold back packages without a real reason. --- conf/distro/jlime-2010.1.conf | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'conf') diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index 0579296f6f..d63becfc1e 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -67,14 +67,6 @@ PREFERRED_PROVIDER_gtk+ = "gtk+" PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static" PREFERRED_PROVIDER_bluez-libs = "bluez-libs" -PREFERRED_VERSION_gcc = "4.4.2" -PREFERRED_VERSION_gcc-cross = "4.4.2" -PREFERRED_VERSION_gcc-cross-initial = "4.4.2" -PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2" -PREFERRED_VERSION_binutils = "2.20" -PREFERRED_VERSION_binutils-cross = "2.20" -PREFERRED_VERSION_coreutils-native = "8.5" - # # Target OS & FPU system # @@ -92,9 +84,7 @@ LIBC = "glibc" require conf/distro/include/sane-toolchain-${LIBC}.inc PREFERRED_PROVIDER_virtual/libc = "${LIBC}" -PREFERRED_VERSION_linux-libc-headers = "2.6.31" -PREFERRED_VERSION_glibc-initial = "2.9" -PREFERRED_VERSION_glibc = "2.9" +PREFERRED_VERSION_linux-libc-headers = "2.6.34" # # Bootstrap & Init @@ -112,13 +102,9 @@ PREFERRED_PROVIDER_virtual/libx11-native = "libx11-native" PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib" PREFERRED_PROVIDER_tslib = "tslib" -PREFERRED_VERSION_mesa = "7.6" -PREFERRED_VERSION_mesa-dri = "7.6" -PREFERRED_VERSION_mesa-xlib = "7.6" SERVER ?= " xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mousexf86-video-fbdev " # # General Userspace # require conf/distro/include/preferred-opie-versions-1.2.4.inc -PREFERRED_VERSION_cdparanoia = "10.2" -- cgit 1.2.3-korg From 046e7fe8049ecdf29da1885797c14baa6f49c757 Mon Sep 17 00:00:00 2001 From: Filip Zyzniewski Date: Sat, 28 Aug 2010 22:34:51 +0200 Subject: jlime: minor changes based on minimal.conf Our config file got a bit outdated. --- conf/distro/jlime-2010.1.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index d63becfc1e..19919d6695 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -80,8 +80,11 @@ TARGET_FPU_mips = "soft" DISTRO_FEATURES += " eabi " -LIBC = "glibc" -require conf/distro/include/sane-toolchain-${LIBC}.inc +LIBC ?= "eglibc" +require conf/distro/include/sane-toolchain.inc +require conf/distro/include/arm-thumb.inc + + PREFERRED_PROVIDER_virtual/libc = "${LIBC}" PREFERRED_VERSION_linux-libc-headers = "2.6.34" -- cgit 1.2.3-korg From 20f28f911712260d6fe86c1e421807fa879310c5 Mon Sep 17 00:00:00 2001 From: Filip Zyzniewski Date: Sat, 28 Aug 2010 23:26:57 +0200 Subject: jlime: using glibc-2.11 version 2.12 is pulled from svn now. no reason for that level of bleeding edge. --- conf/distro/jlime-2010.1.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index 19919d6695..37e71d35b1 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -87,6 +87,8 @@ require conf/distro/include/arm-thumb.inc PREFERRED_PROVIDER_virtual/libc = "${LIBC}" +PREFERRED_VERSION_eglibc ?= "2.11" +PREFERRED_VERSION_eglibc-initial ?= "2.11" PREFERRED_VERSION_linux-libc-headers = "2.6.34" # -- cgit 1.2.3-korg From b487e344fc79127ae3fba54461e5f8bfba395a3c Mon Sep 17 00:00:00 2001 From: Filip Zyzniewski Date: Tue, 31 Aug 2010 08:25:20 +0200 Subject: jornada7xx: fix for bug #4951 Added bluez-dtl1-workaround to avoid: * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-base: * bluez-dtl1-workaround * * opkg_install_cmd: Cannot install package task-base. --- conf/machine/jornada7xx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 8741eb4ff6..64fca12069 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -9,4 +9,4 @@ require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen vfat" -MACHINE_EXTRA_RDEPENDS = "kernel-modules" +MACHINE_EXTRA_RDEPENDS = "kernel-modules bluez-dtl1-workaround" -- cgit 1.2.3-korg From 8cfa7531a02e1c8380508b3dbed653427bf04c36 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Sep 2010 11:03:57 -0700 Subject: Per the TSC decision, make packaged-staging default For now, just ensures its inherited. In the future, we can merge / simplify staging.bbclass with packaged-staging.bbclass as appropriate. Signed-off-by: Chris Larson --- classes/base.bbclass | 1 + conf/distro/angstrom-2008.1.conf | 3 --- conf/distro/angstrom-2010.x.conf | 3 --- conf/distro/include/slugos.inc | 2 +- conf/distro/kaeilos-2010.conf | 3 --- conf/distro/kaeilos.conf | 3 --- conf/distro/minimal.conf | 6 ------ conf/distro/shr.conf | 6 ------ 8 files changed, 2 insertions(+), 25 deletions(-) (limited to 'conf') diff --git a/classes/base.bbclass b/classes/base.bbclass index 299e875191..1ffbe01706 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -2,6 +2,7 @@ BB_DEFAULT_TASK ?= "build" inherit patch inherit staging +inherit packaged-staging inherit packagedata inherit mirrors diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 8f66ae929b..ec4f21e864 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -20,9 +20,6 @@ DISTRO_PR = ".6" OLDEST_KERNEL ?= "2.6.16" -#build staging from packages -INHERIT += "packaged-staging" - require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/angstrom-2008-preferred-versions.inc diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf index 8260647517..b8724503e8 100644 --- a/conf/distro/angstrom-2010.x.conf +++ b/conf/distro/angstrom-2010.x.conf @@ -25,9 +25,6 @@ DISTRO_PR = ".7" OLDEST_KERNEL ?= "2.6.16" -#build staging from packages -INHERIT += "packaged-staging" - require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/angstrom-2010-preferred-versions.inc diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 430e85904d..4c509c6aef 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -53,7 +53,7 @@ USE_NLS_glib-2.0 = "yes" USE_NLS_glib-2.0-native = "yes" USE_NLS_gcc-cross = "no" -INHERIT += "package_ipk debian testlab packaged-staging siteinfo" +INHERIT += "package_ipk debian testlab siteinfo" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. diff --git a/conf/distro/kaeilos-2010.conf b/conf/distro/kaeilos-2010.conf index 4828dce873..0101705dc7 100644 --- a/conf/distro/kaeilos-2010.conf +++ b/conf/distro/kaeilos-2010.conf @@ -18,9 +18,6 @@ DISTRO_PR = ".1" OLDEST_KERNEL ?= "2.6.28" -#build staging from packages -INHERIT += "packaged-staging" - require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/kaeilos-2009-preferred-versions.inc diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index 78a69f110f..1287ea1dac 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -20,9 +20,6 @@ DISTRO_PR = ".5" OLDEST_KERNEL ?= "2.6.16" -#build staging from packages -INHERIT += "packaged-staging" - require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/kaeilos-2009-preferred-versions.inc diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 2f3a8217a8..376ffdee02 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -45,12 +45,6 @@ DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK' # libfoo -> libfoo0-2 (etc) INHERIT += "debian" -############################################################################# -# STAGING AREA -############################################################################# -# Controlled by packaging system -INHERIT += "packaged-staging" - ############################################################################# # PACKAGING & FEEDS ############################################################################# diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 1191d8c88c..9dd1c3e30d 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -121,12 +121,6 @@ DISTRO_FEATURES += " tk " # libfoo -> libfoo0-2 (etc) INHERIT += "debian" -############################################################################# -# STAGING AREA -############################################################################# -# Controlled by packaging system -INHERIT += "packaged-staging" - ############################################################################# # PACKAGING & FEEDS ############################################################################# -- cgit 1.2.3-korg From 5a7d77d927a934a6c8ce0cb6fb552f679f34877a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 10 Sep 2010 08:58:20 +0200 Subject: linux-omap-psp 2.6.32: OMAP: DSS2: OMAPFB: swap front and back porches for both hsync and vsync Framebuffer's left and right margins are relative to the active pixel area. Front and back porches are relative to the sync area. Left margin was wrongly assigned to front porch (and right to back), this patch fixes it. --- conf/machine/include/omap3.inc | 2 +- recipes/linux/linux-omap-psp-2.6.32/porches.patch | 55 +++++++++++++++++++++++ recipes/linux/linux-omap-psp_2.6.32.bb | 1 + 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-omap-psp-2.6.32/porches.patch (limited to 'conf') diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 1052296d8a..60ec0ff42a 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -3,7 +3,7 @@ SOC_FAMILY = "omap3" 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 = "r88" +MACHINE_KERNEL_PR = "r89" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/linux/linux-omap-psp-2.6.32/porches.patch b/recipes/linux/linux-omap-psp-2.6.32/porches.patch new file mode 100644 index 0000000000..630af6f1bd --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/porches.patch @@ -0,0 +1,55 @@ +From 00a84122fd2c1974f6dc79fce11a34154caab848 Mon Sep 17 00:00:00 2001 +From: Tasslehoff Kjappfot +Date: Wed, 8 Sep 2010 12:46:14 +0200 +Subject: [PATCH] OMAP: DSS2: OMAPFB: swap front and back porches for both hsync and vsync + +Framebuffer's left and right margins are relative to the active pixel +area. Front and back porches are relative to the sync area. + +Left margin was wrongly assigned to front porch (and right to back), +this patch fixes it. + +Signed-off-by: tasskjapp@gmail.com +Reviewed-by: Russ.Dill@gmail.com +Signed-off-by: Tomi Valkeinen +--- + drivers/video/omap2/omapfb/omapfb-main.c | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c +index 39f53b1..bddfca6 100644 +--- a/drivers/video/omap2/omapfb/omapfb-main.c ++++ b/drivers/video/omap2/omapfb/omapfb-main.c +@@ -714,10 +714,10 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var) + var->pixclock = timings.pixel_clock != 0 ? + KHZ2PICOS(timings.pixel_clock) : + 0; +- var->left_margin = timings.hfp; +- var->right_margin = timings.hbp; +- var->upper_margin = timings.vfp; +- var->lower_margin = timings.vbp; ++ var->left_margin = timings.hbp; ++ var->right_margin = timings.hfp; ++ var->upper_margin = timings.vbp; ++ var->lower_margin = timings.vfp; + var->hsync_len = timings.hsw; + var->vsync_len = timings.vsw; + } else { +@@ -2059,10 +2059,10 @@ static int omapfb_mode_to_timings(const char *mode_str, + + if (r != 0) { + timings->pixel_clock = PICOS2KHZ(var.pixclock); +- timings->hfp = var.left_margin; +- timings->hbp = var.right_margin; +- timings->vfp = var.upper_margin; +- timings->vbp = var.lower_margin; ++ timings->hbp = var.left_margin; ++ timings->hfp = var.right_margin; ++ timings->vbp = var.upper_margin; ++ timings->vfp = var.lower_margin; + timings->hsw = var.hsync_len; + timings->vsw = var.vsync_len; + timings->x_res = var.xres; +-- +1.6.1 + diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index 2a49dbe8c0..3d31f7d973 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -133,6 +133,7 @@ SRC_URI = "git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=gi file://cam/0001-Move-sensor-rest-to-after-applying-power.patch \ file://0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch \ file://cam/0001-omap3beagle-Add-camera-bootarg.patch \ + file://porches.patch \ file://defconfig" SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ -- cgit 1.2.3-korg From 968f7364735fdb490ecceda9badf742e4948b57b Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 10 Sep 2010 19:03:18 +0200 Subject: mini6410.conf: Initial support for S3C6410 based Mini6410 board. --- conf/machine/mini6410.conf | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 conf/machine/mini6410.conf (limited to 'conf') diff --git a/conf/machine/mini6410.conf b/conf/machine/mini6410.conf new file mode 100644 index 0000000000..494de25131 --- /dev/null +++ b/conf/machine/mini6410.conf @@ -0,0 +1,48 @@ +#@TYPE: Machine +#@Name: FriendlyARM Mini6410 +#@DESCRIPTION: Machine configuration for FriendlyARM Mini6410 Dev Board + +TARGET_ARCH = "arm" + +# Definitions matching the default kit display +MACHINE_DISPLAY_WIDTH_PIXELS ?= "480" +MACHINE_DISPLAY_HEIGHT_PIXELS ?= "272" +MACHINE_DISPLAY_ORIENTATION ?= "0" +MACHINE_DISPLAY_PPI ?= "120" +GUI_MACHINE_CLASS = "bigscreen" + +SERIAL_CONSOLE ?= "115200 ttySAC0" +UBOOT_ENTRYPOINT = "50008000" + +# Software selections +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-tslib \ + xf86-video-fbdev \ + xf86-input-keyboard \ + xf86-input-mouse \ +" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +# Filesystem parameter +ROOT_FLASH_SIZE ?= "128" + +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 512" +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + +EXTRA_IMAGECMD_jffs2 = " -e 128KiB -l -p ; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 128KiB -p -l " + +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" +MACHINE_FEATURES = "kernel26 alsa ext2 keyboard screen touchscreen usbgadget usbhost vfat" + +# Output files +KERNEL_IMAGETYPE = "uImage" +IMAGE_FSTYPES = "tar.bz2 ubi" + + +require conf/machine/include/tune-arm1176jzf-s.inc + -- cgit 1.2.3-korg From 87733772de08806fbc90bb8205451fe4bc99c2b8 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Sat, 11 Sep 2010 05:45:32 +0000 Subject: chumby-falconwing: Add machine definition Adds the machine definition for chumby Falconwing-based boards Signed-off-by: Sean Cross Signed-off-by: Tom Rini --- conf/machine/chumby-falconwing.conf | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 conf/machine/chumby-falconwing.conf (limited to 'conf') diff --git a/conf/machine/chumby-falconwing.conf b/conf/machine/chumby-falconwing.conf new file mode 100644 index 0000000000..e451c5ce49 --- /dev/null +++ b/conf/machine/chumby-falconwing.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@Name: chumby Falconwing i.MX233-based boards +#@DESCRIPTION: Machine configuration for chumby Falconwing platform + +TARGET_ARCH = "arm" + +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "320" +MACHINE_DISPLAY_HEIGHT_PIXELS = "240" + +PREFERRED_PROVIDER_virtual/kernel = "linux-imx" +PREFERRED_PROVIDER_virtual/bootloader = "bootstream-chumby-falconwing" + +require conf/machine/include/tune-arm926ejs.inc + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyAM0" + +ROOT_FLASH_SIZE = "128" + +MACHINE_FEATURES = "kernel26 usbhost touchscreen ext2 ext3 vfat keyboard alsa" +IMAGE_FSTYPES = "ext3.gz tar.gz" -- cgit 1.2.3-korg From 631e3bf70c4beea7092cb33d222fc00bf5f96db4 Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Fri, 10 Sep 2010 10:54:14 +0000 Subject: rx1950: change default kernel to linux-2.6.35 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Vasily Khoruzhick Signed-off-by: Eric Bénard --- conf/machine/rx1950.conf | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'conf') diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf index fb70437bd8..d43a2dc8db 100644 --- a/conf/machine/rx1950.conf +++ b/conf/machine/rx1950.conf @@ -20,17 +20,9 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda wifi usbgadget screen vfa # # Software/packages selection # -PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.35" PCMCIA_MANAGER = "pcmciautils" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" - -# -# Modules autoload and other boot properties -# -module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" - -require conf/machine/include/LAB-settings.inc -- cgit 1.2.3-korg From 8909526b2efd809396383b4c22d97bd6d1e5ec2f Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 12 Sep 2010 12:13:24 +0200 Subject: linux-2.6.28 : nokia900: update patchset and unbreak compilation with gcc 4.4 The gcc patch was indicated to me by felipec in #maemo on freenode GNUtoo|laptop: http://article.gmane.org/gmane.linux.ports.arm.omap/28461 The nokia patch was updated to kernel_2.6.28-20101501+0m5.diff.gz I was also told in #openmoko-cdevelon freenode by dos11 that PR had to be bumped only in the machine config: dos11 meant: GNUtoo|laptop: only macine conf --- conf/machine/nokia900.conf | 2 +- recipes/linux/linux-2.6.28/nokia900/defconfig | 162 +++++++++------------ .../nokia900/gcc_4.4_endianess_macros.patch | 24 +++ recipes/linux/linux_2.6.28.bb | 7 +- 4 files changed, 98 insertions(+), 97 deletions(-) create mode 100644 recipes/linux/linux-2.6.28/nokia900/gcc_4.4_endianess_macros.patch (limited to 'conf') diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf index 4ceb936c61..b0abee2a46 100644 --- a/conf/machine/nokia900.conf +++ b/conf/machine/nokia900.conf @@ -35,4 +35,4 @@ MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat" # Copied from include/omap3.inc (as we do not use linux-omap recipes): # # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r52" +MACHINE_KERNEL_PR = "r53" diff --git a/recipes/linux/linux-2.6.28/nokia900/defconfig b/recipes/linux/linux-2.6.28/nokia900/defconfig index e5c8451918..88d1e07c3e 100644 --- a/recipes/linux/linux-2.6.28/nokia900/defconfig +++ b/recipes/linux/linux-2.6.28/nokia900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-omap1 -# Tue Feb 2 10:26:01 2010 +# Thu Jul 9 09:32:52 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -90,7 +90,7 @@ CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_SLUB_DEBUG is not set +CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set @@ -104,6 +104,7 @@ CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_CLK=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -264,8 +265,8 @@ CONFIG_CPU_CP15_MMU=y # # Processor Features # -CONFIG_ARM_THUMB=y -CONFIG_ARM_THUMBEE=y +# CONFIG_ARM_THUMB is not set +# CONFIG_ARM_THUMBEE is not set # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -333,10 +334,10 @@ CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_STAT_DETAILS is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y @@ -667,7 +668,7 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y @@ -709,8 +710,7 @@ CONFIG_SCSI_PROC_FS=y CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set -CONFIG_BLK_DEV_SR=m -# CONFIG_BLK_DEV_SR_VENDOR is not set +# CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set @@ -731,7 +731,9 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_DH is not set # CONFIG_ATA is not set # CONFIG_MD is not set @@ -742,7 +744,22 @@ CONFIG_NETDEVICES=y # CONFIG_EQUALIZER is not set CONFIG_TUN=m # CONFIG_VETH is not set -# CONFIG_NET_ETHERNET is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +# CONFIG_AX88796 is not set +CONFIG_SMC91X=m +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_SMC911X is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set @@ -777,21 +794,8 @@ CONFIG_WL1251=m # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set # CONFIG_WAN is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -# CONFIG_PPP_SYNC_TTY is not set -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -# CONFIG_PPPOE is not set -# CONFIG_PPPOL2TP is not set -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -1112,15 +1116,23 @@ CONFIG_VIDEO_MEDIA=m # # CONFIG_MEDIA_ATTACH is not set CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_CUSTOMIZE=y +# CONFIG_MEDIA_TUNER_SIMPLE is not set +# CONFIG_MEDIA_TUNER_TDA8290 is not set +# CONFIG_MEDIA_TUNER_TDA827X is not set +# CONFIG_MEDIA_TUNER_TDA18271 is not set +# CONFIG_MEDIA_TUNER_TDA9887 is not set +# CONFIG_MEDIA_TUNER_TEA5761 is not set +# CONFIG_MEDIA_TUNER_TEA5767 is not set +# CONFIG_MEDIA_TUNER_MT20XX is not set +# CONFIG_MEDIA_TUNER_MT2060 is not set +# CONFIG_MEDIA_TUNER_MT2266 is not set +# CONFIG_MEDIA_TUNER_MT2131 is not set +# CONFIG_MEDIA_TUNER_QT1010 is not set +# CONFIG_MEDIA_TUNER_XC2028 is not set +# CONFIG_MEDIA_TUNER_XC5000 is not set +# CONFIG_MEDIA_TUNER_MXL5005S is not set +# CONFIG_MEDIA_TUNER_MXL5007T is not set CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -1238,10 +1250,9 @@ CONFIG_I2C_BCM2048=m # Graphics support # CONFIG_PVR=m -CONFIG_PVR_RELEASE=y -# CONFIG_PVR_DEBUG is not set -# CONFIG_PVR_TIMING is not set -# CONFIG_PVR_EXAMPLES is not set +# CONFIG_DRM_VER_ORIG is not set +# CONFIG_DRM_VER_TUNGSTEN is not set +# CONFIG_DRM_TUNGSTEN is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y @@ -1313,12 +1324,7 @@ CONFIG_DISPLAY_SUPPORT=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set # CONFIG_LOGO is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set @@ -1674,16 +1680,9 @@ CONFIG_EXT2_FS=m # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=m # CONFIG_EXT3_FS_XATTR is not set -CONFIG_EXT4_FS=m -# CONFIG_EXT4DEV_COMPAT is not set -CONFIG_EXT4_FS_XATTR=y -# CONFIG_EXT4_FS_POSIX_ACL is not set -# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1706,23 +1705,18 @@ CONFIG_FUSE_FS=m # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=m -# CONFIG_MSDOS_FS is not set +CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y +# CONFIG_NTFS_FS is not set # # Pseudo filesystems @@ -1746,21 +1740,7 @@ CONFIG_TMPFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -CONFIG_JFFS2_SUMMARY=y -# CONFIG_JFFS2_FS_XATTR is not set -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RTIME=y -CONFIG_JFFS2_RUBIN=y -# CONFIG_JFFS2_CMODE_NONE is not set -# CONFIG_JFFS2_CMODE_PRIORITY is not set -# CONFIG_JFFS2_CMODE_SIZE is not set -CONFIG_JFFS2_CMODE_FAVOURLZO=y +# CONFIG_JFFS2_FS is not set CONFIG_UBIFS_FS=y # CONFIG_UBIFS_FS_XATTR is not set # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set @@ -1791,13 +1771,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -CONFIG_CIFS_XATTR=y -# CONFIG_CIFS_POSIX is not set -# CONFIG_CIFS_DEBUG2 is not set -CONFIG_CIFS_EXPERIMENTAL=y +# CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -1824,12 +1798,12 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_EFI_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf-8" +CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set -CONFIG_NLS_CODEPAGE_852=m +# CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set @@ -1846,11 +1820,11 @@ CONFIG_NLS_CODEPAGE_852=m # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set -CONFIG_NLS_CODEPAGE_1250=m +# CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=m +# CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set @@ -1862,7 +1836,7 @@ CONFIG_NLS_ISO8859_2=m # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -CONFIG_NLS_UTF8=y +# CONFIG_NLS_UTF8 is not set # CONFIG_DLM is not set # @@ -1883,6 +1857,8 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_SCHEDSTATS is not set CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set @@ -1895,7 +1871,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_MEMORY_INIT is not set @@ -2001,7 +1977,7 @@ CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set -CONFIG_CRYPTO_SHA1=m +# CONFIG_CRYPTO_SHA1 is not set # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set @@ -2045,7 +2021,7 @@ CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y # CONFIG_CRC_T10DIF is not set -CONFIG_CRC_ITU_T=m +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y CONFIG_CRC7=m CONFIG_LIBCRC32C=y diff --git a/recipes/linux/linux-2.6.28/nokia900/gcc_4.4_endianess_macros.patch b/recipes/linux/linux-2.6.28/nokia900/gcc_4.4_endianess_macros.patch new file mode 100644 index 0000000000..46e60f74e6 --- /dev/null +++ b/recipes/linux/linux-2.6.28/nokia900/gcc_4.4_endianess_macros.patch @@ -0,0 +1,24 @@ +Index: linux-2.6.28/drivers/dsp/bridge/dynload/cload.c +=================================================================== +--- linux-2.6.28.orig/drivers/dsp/bridge/dynload/cload.c 2010-09-12 02:03:52.106475160 +0200 ++++ linux-2.6.28/drivers/dsp/bridge/dynload/cload.c 2010-09-12 02:05:30.722106026 +0200 +@@ -1475,10 +1475,6 @@ + #if TARGET_AU_BITS <= BITS_PER_AU + /* byte-swapping issues may exist for strings on target */ + *dst++ = *src++; +-#elif TARGET_ENDIANNESS_DIFFERS(TARGET_BIG_ENDIAN) +- register TgtAU_t tmp; +- tmp = *src++; +- *dst++ = SWAP16BY8(tmp); /* right for TARGET_AU_BITS == 16 */ + #else + *dst++ = *src++; + #endif +@@ -1486,8 +1482,6 @@ + /*apply force to make sure that the string table has null terminator */ + #if (BITS_PER_AU == BITS_PER_BYTE) && (TARGET_AU_BITS == BITS_PER_BYTE) + dst[-1] = 0; +-#elif TARGET_BIG_ENDIAN +- dst[-1] &= ~BYTE_MASK; /* big-endian */ + #else + dst[-1] &= (1 << (BITS_PER_AU - BITS_PER_BYTE)) - 1; /* little endian */ + #endif diff --git a/recipes/linux/linux_2.6.28.bb b/recipes/linux/linux_2.6.28.bb index 8f61268db0..84a87bad8b 100644 --- a/recipes/linux/linux_2.6.28.bb +++ b/recipes/linux/linux_2.6.28.bb @@ -86,7 +86,8 @@ SRC_URI_mini6410 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.28.tar.b file://defconfig" SRC_URI_nokia900 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2;name=kernel \ - http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20094803.3+0m5.diff.gz;name=nokiapatch \ + http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20101501+0m5.diff.gz;name=nokiapatch \ + file://gcc_4.4_endianess_macros.patch \ file://defconfig" SRC_URI_smartqv7 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2;name=kernel \ @@ -111,7 +112,7 @@ SRC_URI[stablepatch6.md5sum] = "f8aa9ca3eb395f0e781cd91de5d5d86b" SRC_URI[stablepatch6.sha256sum] = "0da592467b8a1d3f839c4d2b6d8495d5b32f5661e96f0782c063c22e4c6393e4" SRC_URI[ronetixpatch.md5sum] = "22af1c0a7bdc5d0f4e83f17f91b0c524" SRC_URI[ronetixpatch.sha256sum] = "da47c6e2ab51180be3b50d3cd219dbebe877121e4068aa5846fc1cd018082931" -SRC_URI[nokiapatch.md5sum] = "fdd13af46cbaf8594b9fc3d82070aecc" -SRC_URI[nokiapatch.sha256sum] = "78ab82b0d6647d196fe3f6185a743da4b1846730668b078beb814c717fdd0bb5" +SRC_URI[nokiapatch.md5sum] = "aa4b5227e54bcaf1488d83c0b6d19c92" +SRC_URI[nokiapatch.sha256sum] = "90a3f8b533fc91057dcdbd23b384d30fb6fc205e8d20406412cbbc1af1105150" SRC_URI[libtnftl.md5sum] = "a79bf0f977712a215f6710a713168684" SRC_URI[libtnftl.sha256sum] = "a9c09bb3bd0d5d988e23568f10364dbd8025a0c14b181db065630c9a98a05fe7" -- cgit 1.2.3-korg From 40d26d15ad151542759da38d1b03c25d1743e1ea Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 12 Sep 2010 16:12:36 +0200 Subject: nokia900: do not require omap3.inc as we would have to override nearly everything when we required omap3.inc we pulled that: EXTRA_IMAGEDEPENDS += "u-boot x-load" which we can't and won't use for the moment. We also had to override nearly all variables. --- conf/machine/nokia900.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf index b0abee2a46..942d650d0b 100644 --- a/conf/machine/nokia900.conf +++ b/conf/machine/nokia900.conf @@ -1,7 +1,11 @@ #@TYPE: Machine #@NAME: Nokia 900 internet tablet #@DESCRIPTION: Machine configuration for the Nokia 900 + TARGET_ARCH = "arm" +SOC_FAMILY = "omap3" +require conf/machine/include/tune-cortexa8.inc + PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ @@ -13,9 +17,6 @@ GUI_MACHINE_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "800" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" -require conf/machine/include/omap3.inc - -# omap3.inc redefine it to uImage KERNEL_IMAGETYPE = "zImage" ROOT_FLASH_SIZE = "100" -- cgit 1.2.3-korg From 9347b59eb3c2069f81e1de091d8ad362f9122b13 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Tue, 7 Sep 2010 17:23:03 +0000 Subject: nokia900: generate also tar.gz images for installation on SD card Signed-off-by: Klaus Kurzmann --- conf/machine/nokia900.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf index 942d650d0b..b1b8a870ad 100644 --- a/conf/machine/nokia900.conf +++ b/conf/machine/nokia900.conf @@ -22,7 +22,7 @@ KERNEL_IMAGETYPE = "zImage" ROOT_FLASH_SIZE = "100" EXTRA_IMAGECMD_jffs2_nokia900 = "--pad --little-endian --eraseblock=0x20000 -n" -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES ?= "jffs2 tar.gz" SERIAL_CONSOLE = "115200 ttyS0" -- cgit 1.2.3-korg From 9d7e58705342fe622a233c621609762ddddd3eca Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sun, 12 Sep 2010 22:17:10 +0200 Subject: efikamx: Fixed spelling error Genisi to Genesi. Signed-off-by: Leon Woestenberg --- conf/machine/efikamx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/efikamx.conf b/conf/machine/efikamx.conf index 935649b240..ffc0cc96f8 100644 --- a/conf/machine/efikamx.conf +++ b/conf/machine/efikamx.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@Name: Genisi EFIKA MX Development Platform -#@DESCRIPTION: Machine configuration for the EFIKA development platform (http://www.powerdeveloper.org/platforms/efikamx) +#@Name: Genesi EFIKA MX Development Platform +#@DESCRIPTION: Machine configuration for the EFIKA MX development platform (http://www.powerdeveloper.org/platforms/efikamx) TARGET_ARCH = "arm" -- cgit 1.2.3-korg From 0bc18282c39a1afcd8936ea966a105bb6a2cde20 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 13 Sep 2010 17:02:35 +0200 Subject: angstrom-next: switch to a newer busybox and cairo --- conf/distro/include/angstrom-2010-preferred-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc index 8212c2f45e..2c6c7ba27c 100644 --- a/conf/distro/include/angstrom-2010-preferred-versions.inc +++ b/conf/distro/include/angstrom-2010-preferred-versions.inc @@ -9,8 +9,8 @@ PREFERRED_VERSION_autoconf = "2.65" PREFERRED_VERSION_autoconf-native = "2.65" PREFERRED_VERSION_automake = "1.11.1" PREFERRED_VERSION_automake-native = "1.11.1" -PREFERRED_VERSION_busybox = "1.13.2" -PREFERRED_VERSION_cairo = "1.8.10" +PREFERRED_VERSION_busybox = "1.17.1" +PREFERRED_VERSION_cairo = "1.10.0" PREFERRED_VERSION_dbus = "1.2.24" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.8.0" -- cgit 1.2.3-korg