diff options
30 files changed, 375 insertions, 446 deletions
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 7035a05b23..da6dafd6bc 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -1,3 +1,4 @@ +SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-gsm0710muxd = "${AUTOREV}" SRCREV_pn-gsmd2 = "${AUTOREV}" SRCREV_pn-pygsm = "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index db49e3848e..6fb0b5cd97 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -142,7 +142,7 @@ SRCREV_pn-openmoko-stylus-demo ?= "2324" SRCREV_pn-openmoko-stylus-demo-simple ?= "1818" SRCREV_pn-openmoko-taskmanager ?= "1663" SRCREV_pn-openmoko-tasks ?= "320" -SRCREV_pn-openmoko-tasks2 ?= "398" +SRCREV_pn-openmoko-tasks2 ?= "399" SRCREV_pn-openmoko-terminal2 ?= "4039" SRCREV_pn-openmoko-theme-standard ?= "4167" SRCREV_pn-openmoko-theme-standard-qvga ?= "4167" diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf index e2ed11f79c..ba7a099825 100644 --- a/conf/machine/davinci-dvevm.conf +++ b/conf/machine/davinci-dvevm.conf @@ -22,5 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" +MACHINE_EXTRA_RRECOMMENDS = "dsplink-module" + require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf index e732957d5d..1977da8104 100644 --- a/conf/machine/davinci-sffsdr.conf +++ b/conf/machine/davinci-sffsdr.conf @@ -25,5 +25,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" MACHINE_FEATURES = "kernel26 serial" +MACHINE_EXTRA_RRECOMMENDS = "dsplink-module" + require conf/machine/include/tune-arm926ejs.inc diff --git a/packages/apex/apex-env_1.5.13.bb b/packages/apex/apex-env_1.5.14.bb index aad0b12af9..e97522e5e9 100644 --- a/packages/apex/apex-env_1.5.13.bb +++ b/packages/apex/apex-env_1.5.14.bb @@ -1,5 +1,5 @@ DESCRIPTION = "APEX Boot Loader Environment User Modification Tool" -SECTION = "util" +SECTION = "misc" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" diff --git a/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty b/packages/apex/apex-nslu2-1.5.14/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty +++ b/packages/apex/apex-nslu2-1.5.14/.mtn2git_empty diff --git a/packages/apex/apex-nslu2-1.5.13/defconfig b/packages/apex/apex-nslu2-1.5.14/defconfig index 264f8539fc..264f8539fc 100644 --- a/packages/apex/apex-nslu2-1.5.13/defconfig +++ b/packages/apex/apex-nslu2-1.5.14/defconfig diff --git a/packages/apex/apex-nslu2-1.5.8/defconfig b/packages/apex/apex-nslu2-1.5.8/defconfig deleted file mode 100644 index 3c8522e2e8..0000000000 --- a/packages/apex/apex-nslu2-1.5.8/defconfig +++ /dev/null @@ -1,156 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: -# Fri Jun 1 17:35:34 2007 -# -CONFIG_ARM=y -CONFIG_CPU_ARMV5=y -CONFIG_CPU_XSCALE=y -# CONFIG_ARCH_LH7952X is not set -# CONFIG_ARCH_LH7A40X is not set -CONFIG_ARCH_IXP42X=y -# CONFIG_ARCH_S3C2410 is not set -# CONFIG_ARCH_MX3 is not set -CONFIG_EXPERIMENTAL=y -# CONFIG_SMALL is not set - -# -# General Setup -# -CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (8MiB Flash)" -CONFIG_CROSS_COMPILE="" -CONFIG_AEABI=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set -# CONFIG_CC_NO_OPTIMIZATION is not set -CONFIG_STARTUP_UART=y -# CONFIG_DEBUG_LL is not set -CONFIG_SPINNER=y -CONFIG_ATAG=y -CONFIG_MMU=y -# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set -CONFIG_DISABLE_MMU_AT_BOOT=y -# CONFIG_INTERRUPTS is not set -CONFIG_SDRAMBOOT_REPORT=y -CONFIG_STACK_SIZE=0x1000 -CONFIG_STACKLIMIT=y -# CONFIG_BOOTSTRAP_MEMTEST is not set -CONFIG_ATAG_PHYS=0x00000100 -CONFIG_ARCH_NUMBER=597 -CONFIG_APEX_VMA=0x00200000 -CONFIG_KERNEL_LMA=0x00008000 -# CONFIG_USE_RAMDISK is not set -CONFIG_SDRAM_BANK0=y -# CONFIG_SDRAM_BANK1 is not set -CONFIG_NOR_BUSWIDTH=16 -CONFIG_NOR_BANK0=y -CONFIG_NOR_BANK0_START=0x50000000 -CONFIG_NOR_BANK0_LENGTH=0x00800000 -CONFIG_MACH="ixp42x" -CONFIG_MACH_NSLU2=y -# CONFIG_MACH_NAS100D is not set -# CONFIG_MACH_DSMG600 is not set -# CONFIG_MACH_AVILA2347 is not set -# CONFIG_USER_DEFAULTENDIAN is not set -# CONFIG_USER_BIGENDIAN is not set -# CONFIG_USER_LITTLEENDIAN is not set - -# -# Platform Setup -# -CONFIG_SDRAM_BANK_LENGTH=0x02000000 -# CONFIG_DISABLE_SECOND_UART_INIT is not set -CONFIG_ARCH_IXP420=y - -# -# Commands -# -CONFIG_ALLHELP=y -CONFIG_ALPHABETIZE_COMMANDS=y -CONFIG_DEL_IS_BS=y -CONFIG_ANSI_KEYS=y -CONFIG_COMMAND_HISTORY=y -CONFIG_COMMAND_EDITING=y -# CONFIG_TIME_COMMANDS is not set -CONFIG_CMD_ALIAS=y -CONFIG_CMD_CHECKSUM=y -CONFIG_CMD_COPY=y -CONFIG_CMD_COMPARE=y -CONFIG_CMD_DRVINFO=y -CONFIG_CMD_DUMP=y -CONFIG_CMD_ENV=y -CONFIG_CMD_SETENV=y -CONFIG_CMD_ERASE=y -CONFIG_CMD_FILL=y -CONFIG_CMD_GO=y -CONFIG_CMD_INFO=y -# CONFIG_CMD_PAUSE is not set -CONFIG_CMD_WAIT=y -CONFIG_CMD_XRECEIVE=y -CONFIG_CMD_MEMLIMIT=y -CONFIG_CMD_MEMSCAN=y - -# -# Generic Drivers -# -# CONFIG_DRIVER_FAT is not set -# CONFIG_DRIVER_EXT2 is not set -# CONFIG_DRIVER_JFFS2 is not set -CONFIG_DRIVER_FIS=y -CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k" -CONFIG_DRIVER_NOR_CFI=y -# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set -# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set -CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y -# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set -# CONFIG_DRIVER_ONENAND is not set -# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set -CONFIG_USES_NOR_CFI=y -CONFIG_USES_PATHNAME_PARSER=y -CONFIG_USES_IXP4XX_NPE_ETH=y - -# -# Environment -# -CONFIG_ENV=y -CONFIG_ENV_LINK=y -CONFIG_ENV_MUTABLE=y -CONFIG_ENV_REGION="nor:0x7c000+16k" -# CONFIG_ENV_SAVEATONCE is not set -CONFIG_ENV_CHECK_LEN=1024 -# CONFIG_VARIATIONS is not set -# CONFIG_NO_BOOTSTRAP is not set -CONFIG_NOR_BOOT=y -# CONFIG_NAND_BOOT is not set -# CONFIG_ONENAND_BOOT is not set -# CONFIG_COMPANION_EVT1_BOOT is not set -# CONFIG_COMPANION_EVT2_BOOT is not set - -# -# Default Startup -# -CONFIG_AUTOBOOT=y -CONFIG_AUTOBOOT_DELAY=10 -CONFIG_ENV_STARTUP_KERNEL_COPY=y -# CONFIG_ENV_REGION_KERNEL_SWAP is not set -# CONFIG_ENV_STARTUP_PREFIX_P is not set - -# -# Regions -# -CONFIG_ENV_REGION_KERNEL="fis://kernel" - -# -# Overrides -# -CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y -CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200" -# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set -CONFIG_USES_NOR_BOOTFLASH=y -CONFIG_RELOCATE_SIMPLE=y -CONFIG_INLINE_PLATFORM_INITIALIZATION=y -CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y -# CONFIG_BIGENDIAN is not set -# CONFIG_LITTLEENDIAN is not set -CONFIG_CLEAR_STACKS=y -CONFIG_ALIASES=y diff --git a/packages/apex/apex-nslu2-1.5.8/.mtn2git_empty b/packages/apex/apex-nslu2-16mb-1.5.14/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/apex/apex-nslu2-1.5.8/.mtn2git_empty +++ b/packages/apex/apex-nslu2-16mb-1.5.14/.mtn2git_empty diff --git a/packages/apex/apex-nslu2-16mb-1.5.13/defconfig b/packages/apex/apex-nslu2-16mb-1.5.14/defconfig index 11658813d5..11658813d5 100644 --- a/packages/apex/apex-nslu2-16mb-1.5.13/defconfig +++ b/packages/apex/apex-nslu2-16mb-1.5.14/defconfig diff --git a/packages/apex/apex-nslu2-16mb-1.5.8/defconfig b/packages/apex/apex-nslu2-16mb-1.5.8/defconfig deleted file mode 100644 index c9688e3d75..0000000000 --- a/packages/apex/apex-nslu2-16mb-1.5.8/defconfig +++ /dev/null @@ -1,156 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: -# Fri Jun 1 17:35:34 2007 -# -CONFIG_ARM=y -CONFIG_CPU_ARMV5=y -CONFIG_CPU_XSCALE=y -# CONFIG_ARCH_LH7952X is not set -# CONFIG_ARCH_LH7A40X is not set -CONFIG_ARCH_IXP42X=y -# CONFIG_ARCH_S3C2410 is not set -# CONFIG_ARCH_MX3 is not set -CONFIG_EXPERIMENTAL=y -# CONFIG_SMALL is not set - -# -# General Setup -# -CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (16MiB Flash)" -CONFIG_CROSS_COMPILE="" -CONFIG_AEABI=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set -# CONFIG_CC_NO_OPTIMIZATION is not set -CONFIG_STARTUP_UART=y -# CONFIG_DEBUG_LL is not set -CONFIG_SPINNER=y -CONFIG_ATAG=y -CONFIG_MMU=y -# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set -CONFIG_DISABLE_MMU_AT_BOOT=y -# CONFIG_INTERRUPTS is not set -CONFIG_SDRAMBOOT_REPORT=y -CONFIG_STACK_SIZE=0x1000 -CONFIG_STACKLIMIT=y -# CONFIG_BOOTSTRAP_MEMTEST is not set -CONFIG_ATAG_PHYS=0x00000100 -CONFIG_ARCH_NUMBER=597 -CONFIG_APEX_VMA=0x00200000 -CONFIG_KERNEL_LMA=0x00008000 -# CONFIG_USE_RAMDISK is not set -CONFIG_SDRAM_BANK0=y -# CONFIG_SDRAM_BANK1 is not set -CONFIG_NOR_BUSWIDTH=16 -CONFIG_NOR_BANK0=y -CONFIG_NOR_BANK0_START=0x50000000 -CONFIG_NOR_BANK0_LENGTH=0x01000000 -CONFIG_MACH="ixp42x" -CONFIG_MACH_NSLU2=y -# CONFIG_MACH_NAS100D is not set -# CONFIG_MACH_DSMG600 is not set -# CONFIG_MACH_AVILA2347 is not set -# CONFIG_USER_DEFAULTENDIAN is not set -# CONFIG_USER_BIGENDIAN is not set -# CONFIG_USER_LITTLEENDIAN is not set - -# -# Platform Setup -# -CONFIG_SDRAM_BANK_LENGTH=0x02000000 -# CONFIG_DISABLE_SECOND_UART_INIT is not set -CONFIG_ARCH_IXP420=y - -# -# Commands -# -CONFIG_ALLHELP=y -CONFIG_ALPHABETIZE_COMMANDS=y -CONFIG_DEL_IS_BS=y -CONFIG_ANSI_KEYS=y -CONFIG_COMMAND_HISTORY=y -CONFIG_COMMAND_EDITING=y -# CONFIG_TIME_COMMANDS is not set -CONFIG_CMD_ALIAS=y -CONFIG_CMD_CHECKSUM=y -CONFIG_CMD_COPY=y -CONFIG_CMD_COMPARE=y -CONFIG_CMD_DRVINFO=y -CONFIG_CMD_DUMP=y -CONFIG_CMD_ENV=y -CONFIG_CMD_SETENV=y -CONFIG_CMD_ERASE=y -CONFIG_CMD_FILL=y -CONFIG_CMD_GO=y -CONFIG_CMD_INFO=y -# CONFIG_CMD_PAUSE is not set -CONFIG_CMD_WAIT=y -CONFIG_CMD_XRECEIVE=y -CONFIG_CMD_MEMLIMIT=y -CONFIG_CMD_MEMSCAN=y - -# -# Generic Drivers -# -# CONFIG_DRIVER_FAT is not set -# CONFIG_DRIVER_EXT2 is not set -# CONFIG_DRIVER_JFFS2 is not set -CONFIG_DRIVER_FIS=y -CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0xfe0000+4k" -CONFIG_DRIVER_NOR_CFI=y -# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set -# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set -CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y -# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set -# CONFIG_DRIVER_ONENAND is not set -# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set -CONFIG_USES_NOR_CFI=y -CONFIG_USES_PATHNAME_PARSER=y -CONFIG_USES_IXP4XX_NPE_ETH=y - -# -# Environment -# -CONFIG_ENV=y -CONFIG_ENV_LINK=y -CONFIG_ENV_MUTABLE=y -CONFIG_ENV_REGION="nor:0x7c000+16k" -# CONFIG_ENV_SAVEATONCE is not set -CONFIG_ENV_CHECK_LEN=1024 -# CONFIG_VARIATIONS is not set -# CONFIG_NO_BOOTSTRAP is not set -CONFIG_NOR_BOOT=y -# CONFIG_NAND_BOOT is not set -# CONFIG_ONENAND_BOOT is not set -# CONFIG_COMPANION_EVT1_BOOT is not set -# CONFIG_COMPANION_EVT2_BOOT is not set - -# -# Default Startup -# -CONFIG_AUTOBOOT=y -CONFIG_AUTOBOOT_DELAY=10 -CONFIG_ENV_STARTUP_KERNEL_COPY=y -# CONFIG_ENV_REGION_KERNEL_SWAP is not set -# CONFIG_ENV_STARTUP_PREFIX_P is not set - -# -# Regions -# -CONFIG_ENV_REGION_KERNEL="fis://kernel" - -# -# Overrides -# -CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y -CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200" -# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set -CONFIG_USES_NOR_BOOTFLASH=y -CONFIG_RELOCATE_SIMPLE=y -CONFIG_INLINE_PLATFORM_INITIALIZATION=y -CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y -# CONFIG_BIGENDIAN is not set -# CONFIG_LITTLEENDIAN is not set -CONFIG_CLEAR_STACKS=y -CONFIG_ALIASES=y diff --git a/packages/apex/apex-nslu2-16mb_1.5.13.bb b/packages/apex/apex-nslu2-16mb_1.5.14.bb index 84199ed053..0ccf2eb5da 100644 --- a/packages/apex/apex-nslu2-16mb_1.5.13.bb +++ b/packages/apex/apex-nslu2-16mb_1.5.14.bb @@ -1,5 +1,5 @@ DESCRIPTION = "APEX Boot Loader" -SECTION = "" +SECTION = "misc" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" diff --git a/packages/apex/apex-nslu2-16mb_1.5.8.bb b/packages/apex/apex-nslu2-16mb_1.5.8.bb deleted file mode 100644 index 52e13d2073..0000000000 --- a/packages/apex/apex-nslu2-16mb_1.5.8.bb +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION = "APEX Boot Loader" -SECTION = "" -PRIORITY = "optional" -HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ - file://defconfig" -S = ${WORKDIR}/apex-${PV} - -CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" - -CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw" - -CMDLINE_DEBUG ?= "" - -EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" - -oe_runmake() { - oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" - make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" -} - -# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head -# of the .config file and remove any settings in defconfig then append -# defconfig to .config -do_configure() { - rm -f ${S}/.config - . ${CONFIG_SITE} - if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then - sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ - -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ - -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (16MiB Flash)\"/' \ - -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ - ${WORKDIR}/defconfig > ${S}/.config - elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then - sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ - -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ - -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \ - -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ - ${WORKDIR}/defconfig > ${S}/.config - else - oefatal do_configure cannot determine endianess - fi - oe_runmake oldconfig -} - -DEPENDS += "devio-native" - -do_stage() { - install -d ${STAGING_LOADER_DIR} - . ${CONFIG_SITE} - if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then - cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin - elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then - devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin 'xp $,4' - else - oefatal do_populate_staging cannot determine endianess - fi -} diff --git a/packages/apex/apex-nslu2_1.5.13.bb b/packages/apex/apex-nslu2_1.5.14.bb index a3ce223e92..5fae4553a0 100644 --- a/packages/apex/apex-nslu2_1.5.13.bb +++ b/packages/apex/apex-nslu2_1.5.14.bb @@ -1,5 +1,5 @@ DESCRIPTION = "APEX Boot Loader" -SECTION = "" +SECTION = "misc" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" diff --git a/packages/apex/apex-nslu2_1.5.8.bb b/packages/apex/apex-nslu2_1.5.8.bb deleted file mode 100644 index ada148e2b4..0000000000 --- a/packages/apex/apex-nslu2_1.5.8.bb +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION = "APEX Boot Loader" -SECTION = "" -PRIORITY = "optional" -HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" -LICENSE = "GPL" -PR = "r2" - -SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ - file://defconfig" -S = ${WORKDIR}/apex-${PV} - -CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" - -CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw" - -CMDLINE_DEBUG ?= "" - -EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" - -oe_runmake() { - oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" - make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" -} - -# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head -# of the .config file and remove any settings in defconfig then append -# defconfig to .config -do_configure() { - rm -f ${S}/.config - . ${CONFIG_SITE} - if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then - sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ - -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ - -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (8MiB Flash)\"/' \ - -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ - ${WORKDIR}/defconfig > ${S}/.config - elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then - sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ - -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ - -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (8MiB Flash)\"/' \ - -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ - ${WORKDIR}/defconfig > ${S}/.config - else - oefatal do_configure cannot determine endianess - fi - oe_runmake oldconfig -} - -DEPENDS += "devio-native" - -do_stage() { - install -d ${STAGING_LOADER_DIR} - . ${CONFIG_SITE} - if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then - cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2.bin - elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then - devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2.bin 'xp $,4' - else - oefatal do_populate_staging cannot determine endianess - fi -} diff --git a/packages/dropbear/dropbear-0.51/no-host-lookup.patch b/packages/dropbear/dropbear-0.51/no-host-lookup.patch new file mode 100644 index 0000000000..d7c2ccdc62 --- /dev/null +++ b/packages/dropbear/dropbear-0.51/no-host-lookup.patch @@ -0,0 +1,12 @@ +diff -urN dropbear-0.51/options.h dropbear-0.51.new/options.h +--- dropbear-0.51/options.h 2008-03-27 14:34:39.000000000 +0100 ++++ dropbear-0.51.new/options.h 2008-06-22 00:22:09.000000000 +0200 +@@ -112,7 +112,7 @@ + /* #define DSS_PROTOK */ + + /* Whether to do reverse DNS lookups. */ +-#define DO_HOST_LOOKUP ++/* #define DO_HOST_LOOKUP */ + + /* Whether to print the message of the day (MOTD). This doesn't add much code + * size */ diff --git a/packages/dropbear/dropbear_0.51.bb b/packages/dropbear/dropbear_0.51.bb index ead3eca7db..888819c0e5 100644 --- a/packages/dropbear/dropbear_0.51.bb +++ b/packages/dropbear/dropbear_0.51.bb @@ -1,2 +1,4 @@ require dropbear.inc -PR = "r0" +PR = "r1" + +SRC_URI += "file://no-host-lookup.patch;patch=1"
\ No newline at end of file diff --git a/packages/apex/apex-nslu2-16mb-1.5.13/.mtn2git_empty b/packages/freesmartphone/frameworkd/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/apex/apex-nslu2-16mb-1.5.13/.mtn2git_empty +++ b/packages/freesmartphone/frameworkd/.mtn2git_empty diff --git a/packages/freesmartphone/frameworkd/frameworkd b/packages/freesmartphone/frameworkd/frameworkd new file mode 100644 index 0000000000..08b782e402 --- /dev/null +++ b/packages/freesmartphone/frameworkd/frameworkd @@ -0,0 +1,40 @@ +#! /bin/sh +# +# frameworkd -- This shell script starts and stops the freemsmartphone.org framework daemon. +# +# chkconfig: 345 90 20 +# description: frameworkd is the freesmartphone.org framework daemon +# processname: python + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +NAME=frameworkd + +[ -f /etc/default/rcS ] && . /etc/default/rcS + +case "$1" in + start) + echo -n "Starting freesmartphone.org framework daemon: " + start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/frameworkd + if [ $? = 0 ]; then + echo "(ok)" + else + echo "(failed)" + fi + ;; + stop) + echo -n "Stopping freesmartphone.org framework daemon: " + start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo + rm -f /var/run/${NAME}.pid + echo "(done)" + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/odeviced {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/packages/apex/apex-nslu2-16mb-1.5.8/.mtn2git_empty b/packages/freesmartphone/frameworkd/frameworkd.conf index e69de29bb2..e69de29bb2 100644 --- a/packages/apex/apex-nslu2-16mb-1.5.8/.mtn2git_empty +++ b/packages/freesmartphone/frameworkd/frameworkd.conf diff --git a/packages/freesmartphone/frameworkd/om-gta02/.mtn2git_empty b/packages/freesmartphone/frameworkd/om-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/freesmartphone/frameworkd/om-gta02/.mtn2git_empty diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf new file mode 100644 index 0000000000..0076639f98 --- /dev/null +++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf @@ -0,0 +1,8 @@ +[idlenotifier] +# don't read from accellerometers for now +ignoreinput=2,3 + +[input] +# don't read from accellerometers for now +ignoreinput=2,3 + diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb new file mode 100644 index 0000000000..53ea10f0fb --- /dev/null +++ b/packages/freesmartphone/frameworkd_git.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "The freesmartphon.org Framework Daemon" +HOMEPAGE = "http://www.freesmartphone.org" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +SECTION = "console/network" +DEPENDS = "python-cython-native python-pyrex-native" +LICENSE = "GPL" +PV = "0.8.0+gitr${SRCREV}" +PR = "r0" + +inherit distutils update-rc.d + +INITSCRIPT_NAME = "frameworkd" +INITSCRIPT_PARAMS = "defaults 29" + +SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ + file://frameworkd \ + file://frameworkd.conf" +S = "${WORKDIR}/git" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/frameworkd ${D}${sysconfdir}/init.d/ + install -m 0644 ${WORKDIR}/frameworkd.conf ${D}${sysconfdir} + install -d ${D}${sysconfdir}/dbus-1/system.d/ + mv -f ${D}${datadir}/etc/dbus-1/system.d/frameworkd.conf ${D}${sysconfdir}/dbus-1/system.d/ +} + +RDEPENDS_${PN} += "\ + python-dbus \ + python-pygobject \ + python-pyrtc \ + python-pyserial \ + python-syslog \ +" + +FILES_${PN} += "${sysconfdir}" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug" diff --git a/packages/gdb/gdb-cross-sdk_6.8.bb b/packages/gdb/gdb-cross-sdk_6.8.bb index 6bb9616ae4..be5c4807d8 100644 --- a/packages/gdb/gdb-cross-sdk_6.8.bb +++ b/packages/gdb/gdb-cross-sdk_6.8.bb @@ -6,6 +6,18 @@ inherit sdk PR = "r1" +do_configure_prepend() { + for i in $(find ${S} -name "warning*m4") ; do + sed -i -e s:-Werror::g $i + done + for i in $(find ${S} -name "configure.ac") ; do + sed -i -e s:-Werror::g $i + done + for i in $(find ${S} -name "configure") ; do + sed -i -e s:-Werror::g $i + done +} + do_stage() { : } diff --git a/packages/lcd4linux/files/libusb-compat.diff b/packages/lcd4linux/files/libusb-compat.diff new file mode 100644 index 0000000000..43d7cb9f63 --- /dev/null +++ b/packages/lcd4linux/files/libusb-compat.diff @@ -0,0 +1,95 @@ +diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_BWCT.c lcd4linux-0.10.1-RC2/drv_BWCT.c +--- lcd4linux-0.10.1-RC2.orig/drv_BWCT.c 2007-02-25 13:39:09.000000000 +0100 ++++ lcd4linux-0.10.1-RC2/drv_BWCT.c 2008-06-22 11:57:01.000000000 +0200 +@@ -72,7 +72,6 @@ + static usb_dev_handle *lcd; + static int interface; + +-extern int usb_debug; + extern int got_signal; + + +@@ -89,7 +88,6 @@ + + info("%s: scanning USB for BWCT LCD...", Name); + +- usb_debug = 0; + + usb_init(); + usb_find_busses(); +diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_LCD2USB.c lcd4linux-0.10.1-RC2/drv_LCD2USB.c +--- lcd4linux-0.10.1-RC2.orig/drv_LCD2USB.c 2007-02-25 13:39:10.000000000 +0100 ++++ lcd4linux-0.10.1-RC2/drv_LCD2USB.c 2008-06-22 11:57:47.000000000 +0200 +@@ -98,7 +98,6 @@ + static usb_dev_handle *lcd; + static int controllers = 0; + +-extern int usb_debug; + extern int got_signal; + + /****************************************/ +@@ -120,7 +119,6 @@ + if (device_id != NULL) + info("%s: scanning for device id: %s", Name, device_id); + +- usb_debug = 0; + + usb_init(); + usb_find_busses(); +diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_picoLCD.c lcd4linux-0.10.1-RC2/drv_picoLCD.c +--- lcd4linux-0.10.1-RC2.orig/drv_picoLCD.c 2007-02-25 13:39:10.000000000 +0100 ++++ lcd4linux-0.10.1-RC2/drv_picoLCD.c 2008-06-22 11:58:10.000000000 +0200 +@@ -75,7 +75,6 @@ + static char *BufPtr; + + static usb_dev_handle *lcd; +-extern int usb_debug; + + + +@@ -97,7 +96,6 @@ + + info("%s: scanning for picoLCD...", Name); + +- usb_debug = 0; + + usb_init(); + usb_find_busses(); +diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_Trefon.c lcd4linux-0.10.1-RC2/drv_Trefon.c +--- lcd4linux-0.10.1-RC2.orig/drv_Trefon.c 2007-02-25 13:39:10.000000000 +0100 ++++ lcd4linux-0.10.1-RC2/drv_Trefon.c 2008-06-22 11:58:50.000000000 +0200 +@@ -72,7 +72,6 @@ + static usb_dev_handle *lcd; + static int interface; + +-extern int usb_debug; + + + /****************************************/ +@@ -88,7 +87,6 @@ + + info("%s: scanning USB for TREFON LCD...", Name); + +- usb_debug = 0; + + usb_init(); + usb_find_busses(); +diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_USBLCD.c lcd4linux-0.10.1-RC2/drv_USBLCD.c +--- lcd4linux-0.10.1-RC2.orig/drv_USBLCD.c 2007-02-25 13:39:10.000000000 +0100 ++++ lcd4linux-0.10.1-RC2/drv_USBLCD.c 2008-06-22 11:58:57.000000000 +0200 +@@ -86,7 +86,6 @@ + static usb_dev_handle *lcd; + static int interface; + +-extern int usb_debug; + + #endif + +@@ -107,7 +106,6 @@ + + info("%s: scanning for USBLCD...", Name); + +- usb_debug = 0; + + usb_init(); + usb_find_busses(); diff --git a/packages/lcd4linux/lcd4linux_0.10.0.bb b/packages/lcd4linux/lcd4linux_0.10.0.bb index 673d538ba0..4c164de709 100644 --- a/packages/lcd4linux/lcd4linux_0.10.0.bb +++ b/packages/lcd4linux/lcd4linux_0.10.0.bb @@ -4,9 +4,10 @@ LICENSE = "GPLv2" DEPENDS = "libusb-compat ncurses readline virtual/libx11" PV = "0.10.0+0.10.1-RC2" -PR = "r1" +PR = "r3" SRC_URI = "http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz \ + file://libusb-compat.diff;patch=1 \ file://lcd4linux.init" S = "${WORKDIR}/lcd4linux-0.10.1-RC2" diff --git a/packages/libusb/libusb1_0.9.0.bb b/packages/libusb/libusb1_0.9.0.bb index d509919ad4..784d9b523b 100644 --- a/packages/libusb/libusb1_0.9.0.bb +++ b/packages/libusb/libusb1_0.9.0.bb @@ -4,9 +4,9 @@ HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" LICENSE = "LGPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ - " - +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ +" S = "${WORKDIR}/libusb-${PV}" inherit autotools pkgconfig binconfig lib_package @@ -16,11 +16,12 @@ EXTRA_OECONF = "--disable-build-docs" export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}" -do_stage() { +LIBTOOL = "${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +do_stage() { autotools_stage_all } PACKAGES =+ "libusbpp" - FILES_libusbpp = "${libdir}/libusbpp*.so.*" diff --git a/packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch b/packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch new file mode 100644 index 0000000000..aade27fd8a --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch @@ -0,0 +1,147 @@ +From linux-omap-owner@vger.kernel.org Sun Jun 22 10:11:39 2008
+Received: from localhost
+ ([127.0.0.1] helo=dominion ident=koen)
+ by dominion.dominion.void with esmtp (Exim 4.63)
+ (envelope-from <linux-omap-owner@vger.kernel.org>)
+ id 1KAKfj-0008Qc-FC
+ for koen@localhost; Sun, 22 Jun 2008 10:11:39 +0200
+Received: from xs.service.utwente.nl [130.89.5.250]
+ by dominion with POP3 (fetchmail-6.3.6)
+ for <koen@localhost> (single-drop); Sun, 22 Jun 2008 10:11:39 +0200 (CEST)
+Received: from mail.service.utwente.nl ([130.89.5.253]) by exchange.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+ Sat, 21 Jun 2008 19:06:02 +0200
+Received: from smtp.utwente.nl ([130.89.2.9]) by mail.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+ Sat, 21 Jun 2008 19:06:01 +0200
+Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
+ by smtp.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id m5LH5TSm026212
+ for <k.kooi@student.utwente.nl>; Sat, 21 Jun 2008 19:05:30 +0200
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+ id S1753396AbYFURFN (ORCPT <rfc822;k.kooi@student.utwente.nl>);
+ Sat, 21 Jun 2008 13:05:13 -0400
+Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753305AbYFURFN
+ (ORCPT <rfc822;linux-omap-outgoing>);
+ Sat, 21 Jun 2008 13:05:13 -0400
+Received: from utopia.booyaka.com ([72.9.107.138]:41675 "EHLO
+ utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+ with ESMTP id S1753145AbYFURFL (ORCPT
+ <rfc822;linux-omap@vger.kernel.org>); Sat, 21 Jun 2008 13:05:11 -0400
+Received: (qmail 20532 invoked by uid 526); 21 Jun 2008 17:05:10 -0000
+Date: Sat, 21 Jun 2008 11:05:10 -0600 (MDT)
+From: Paul Walmsley <paul@pwsan.com>
+To: "Gadiyar, Anand" <gadiyar@ti.com>,
+ "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
+cc: Dirk Behme <dirk.behme@googlemail.com>,
+ "jouni.hogander@nokia.com" <jouni.hogander@nokia.com>
+Subject: [PATCH] OMAP3 clock: fix omap2_clk_wait_ready for OMAP3430ES2 DSS
+In-Reply-To: <5A47E75E594F054BAF48C5E4FC4B92AB022BB66209@dbde02.ent.ti.com>
+Message-ID: <alpine.DEB.1.00.0806211054100.19765@utopia.booyaka.com>
+References: <5A47E75E594F054BAF48C5E4FC4B92AB022BE46296@dbde02.ent.ti.com>,<485CA347.909@googlemail.com> <5A47E75E594F054BAF48C5E4FC4B92AB022BB66209@dbde02.ent.ti.com>
+User-Agent: Alpine 1.00 (DEB 882 2007-12-20)
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Sender: linux-omap-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-omap.vger.kernel.org>
+X-Mailing-List: linux-omap@vger.kernel.org
+X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact servicedesk@icts.utwente.nl for more information.
+X-UTwente-MailScanner: Found to be clean
+X-UTwente-MailScanner-From: linux-omap-owner@vger.kernel.org
+X-Spam-Status: No
+X-OriginalArrivalTime: 21 Jun 2008 17:06:02.0187 (UTC) FILETIME=[157001B0:01C8D3C1]
+
+
+On OMAP3430ES2, DSS has both an initiator standby CM_IDLEST bit, and a
+target idle CM_IDLEST bit. This is a departure from previous silicon,
+which only had an initiator standby bit.
+
+This means we need to test the target idle bit after enabling
+dss1_alwon_fclk. Previous clock code has done the wrong thing since ES2
+came out: it's either tested the wrong bit, causing intermittent
+
+ Clock dss1_alwon_fck didn't enable in 100000 tries
+
+messages; or not tested anything at all, causing intermittent crashes
+during DISPC initialization with:
+
+ Unhandled fault: external abort on non-linefetch (0x1028)
+
+This patch modifies omap2_clk_wait_ready() to wait for the DSS to become
+accessible after dss1_alwon_fclk is enabled.
+
+Thanks to Anand Gadiyar <gadiyar@ti.com> for identifying one of the
+problem patches.
+
+Signed-off-by: Paul Walmsley <paul@pwsan.com>
+---
+
+ arch/arm/mach-omap2/clock.c | 30 ++++++++++++++++++++++++------
+ arch/arm/mach-omap2/cm-regbits-34xx.h | 4 +++-
+ 2 files changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
+index ed15868..1820f75 100644
+--- a/arch/arm/mach-omap2/clock.c
++++ b/arch/arm/mach-omap2/clock.c
+@@ -244,18 +244,36 @@ static void omap2_clk_wait_ready(struct clk *clk)
+ }
+
+ /* REVISIT: What are the appropriate exclusions for 34XX? */
+- /* OMAP3: ignore DSS-mod clocks */
+- if (cpu_is_omap34xx() &&
+- ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||
+- (((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(CORE_MOD, 0)) &&
+- clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))
+- return;
++ if (cpu_is_omap34xx()) {
++
++ /* 3430ES1 DSS and SSI have no target idlest bits */
++ if (is_sil_rev_equal_to(OMAP3430_REV_ES1_0) &&
++ ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||
++ ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(CORE_MOD, 0) &&
++ clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))
++ return;
++
++ /* Even for 3430ES2 DSS, only wait for dss1_alwon_fclk */
++ if (is_sil_rev_greater_than(OMAP3430_REV_ES1_0) &&
++ (reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) &&
++ clk->enable_bit != OMAP3430_EN_DSS1_SHIFT)
++ return;
++
++ }
+
+ /* Check if both functional and interface clocks
+ * are running. */
+ bit = 1 << clk->enable_bit;
+ if (!(__raw_readl((__force void __iomem *)other_reg) & bit))
+ return;
++
++ /* OMAP3430ES2 DSS is an unusual case */
++ if (cpu_is_omap34xx() &&
++ (reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) &&
++ clk->enable_bit == OMAP3430_EN_DSS1_SHIFT) {
++ bit = OMAP3430ES2_ST_DSS_IDLE;
++ }
++
+ st_reg = ((other_reg & ~0xf0) | 0x20); /* CM_IDLEST* */
+
+ omap2_wait_clock_ready((__force void __iomem *)st_reg, bit, clk->name);
+diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h
+index 6ec66f4..946c552 100644
+--- a/arch/arm/mach-omap2/cm-regbits-34xx.h
++++ b/arch/arm/mach-omap2/cm-regbits-34xx.h
+@@ -500,7 +500,9 @@
+ #define OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT 0
+
+ /* CM_IDLEST_DSS */
+-#define OMAP3430_ST_DSS (1 << 0)
++#define OMAP3430ES2_ST_DSS_IDLE (1 << 1)
++#define OMAP3430ES2_ST_DSS_STDBY (1 << 0)
++#define OMAP3430ES1_ST_DSS (1 << 0)
+
+ /* CM_AUTOIDLE_DSS */
+ #define OMAP3430_AUTO_DSS (1 << 0)
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 90ccda57f4..252e3da37c 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA SRCREV = "5b97d3ec6732c87741b2fc04f2956f097a458818" PV = "2.6.25+2.6.26-rc6+${PR}+git${SRCREV}" -PR = "r26" +PR = "r27" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ @@ -20,6 +20,7 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://0001-omap3-cpuidle.patch;patch=1 \ file://0002-omap3-cpuidle.patch;patch=1 \ file://timer-suppression.patch;patch=1 \ + file://fix-dispc-clocks.patch;patch=1 \ " SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \ diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 6e6ebca51b..1fa4cdb63e 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -31,9 +31,11 @@ do_populate_sdk() { revipkgarchs="$arch $revipkgarchs" done + mkdir -p ${SDK_OUTPUT}/usr/lib/opkg ${IPKG_HOST} update ${IPKG_HOST} -force-depends install ${TOOLCHAIN_HOST_TASK} + mkdir -p ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS}/usr/lib/opkg ${IPKG_TARGET} update ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} |