diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index 5e3aeefdf..4f907adea 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -7,7 +7,7 @@ include conf/machine/include/mxs-digi-base.inc DIGI_FAMILY = "ccardimx28" SOC_FAMILY = "mxs:mx28:${DIGI_FAMILY}" -# Platform u-boot settings (IS_KERNEL_2X implies also u-boot v2009.08) +# Platform u-boot settings UBOOT_ENTRYPOINT = "0x40008000" UBOOT_SUFFIX = "sb" UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 3127c97a9..be1cc2a44 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -15,9 +15,6 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # ccimx6 3.14 2015.04 # # Digi BSP default versions -PREFERRED_VERSION_linux-dey ?= "3.10" -PREFERRED_VERSION_linux-dey_ccimx5 ?= "2.6.35.14" -PREFERRED_VERSION_linux-dey_ccimx6 ?= "3.14" PREFERRED_VERSION_u-boot-dey ?= "2013.01" PREFERRED_VERSION_u-boot-dey_ccimx5 ?= "2009.08" @@ -28,7 +25,6 @@ HAVE_BT = "${@base_contains('MACHINE_FEATURES', 'bluetooth', '1', '', d)}" HAVE_1WIRE = "${@base_contains('MACHINE_FEATURES', '1-wire', '1', '', d)}" HAVE_GUI = "${@base_contains('DISTRO_FEATURES', 'x11', '1', '', d)}" HAVE_EXAMPLE = "${@base_contains('IMAGE_FEATURES', 'dey-examples', '1', '', d)}" -IS_KERNEL_2X = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-dey', '2.6.35.14', '1', '', d)}" # # Ethernet configuration used in recipes diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc.bb index 198a953ac..2788229c5 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc.bb @@ -24,4 +24,4 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(${@base_conditional("IS_KERNEL_2X", "1", "(ccardimx28|ccimx5)", "(^$)", d)})" +COMPATIBLE_MACHINE = "(ccimx5)" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-gpio.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-gpio.bb index ce3a11fd3..003923ad5 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-gpio.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-gpio.bb @@ -22,4 +22,4 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(${@base_conditional("IS_KERNEL_2X", "1", "(ccardimx28|ccimx5)", "(^$)", d)})" +COMPATIBLE_MACHINE = "(ccimx5)" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-spidev.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-spidev.bb index 9272cf8df..91fb30abf 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-spidev.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-spidev.bb @@ -15,7 +15,7 @@ python do_warning_spidev() { # Warn the user in case we cannot enable spidev in the device tree python do_warning_spidev_ccardimx28() { - if d.getVar('HAVE_GUI', True) and not d.getVar('IS_KERNEL_2X', True): + if d.getVar('HAVE_GUI', True): bb.warn("SPIDEV conflicts with touchscreen so it was not enabled in the device tree") } addtask warning_spidev before do_compile diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb index 90f091f28..1621b47f0 100644 --- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb +++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb @@ -20,8 +20,6 @@ RDEPENDS_${PN} = "\ " RDEPENDS_${PN}_append_ccardimx28 = "\ - ${@base_conditional('IS_KERNEL_2X', '1' , 'dey-examples-adc', '', d)} \ - ${@base_conditional('IS_KERNEL_2X', '1' , 'dey-examples-gpio', '', d)} \ ${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \ ${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \ dey-examples-can \ @@ -29,8 +27,8 @@ RDEPENDS_${PN}_append_ccardimx28 = "\ " RDEPENDS_${PN}_append_ccimx5 = "\ - ${@base_conditional('IS_KERNEL_2X', '1' , 'dey-examples-adc', '', d)} \ - ${@base_conditional('IS_KERNEL_2X', '1' , 'dey-examples-gpio', '', d)} \ + dey-examples-adc \ + dey-examples-gpio \ ${@base_contains("MACHINE_FEATURES", "accelerometer", "dey-examples-accelerometer", "", d)} \ ${@base_contains("MACHINE_FEATURES", "accel-graphics", "dey-examples-opengles", "", d)} \ dey-examples-sahara \ diff --git a/sdk/build.sh b/sdk/build.sh index a5aead568..b2886011f 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -38,13 +38,6 @@ SOURCE_MIRROR_URL ?= \"http://build-linux.digi.com/yocto/downloads/\" INHERIT += \"own-mirrors\" " -# Alternative config for ccardimx28js -KERNEL_2X_CFG=" -# Build Linux 2.6.35.14 and U-Boot 2009.08 -PREFERRED_VERSION_linux-dey = \"2.6.35.14\" -PREFERRED_VERSION_u-boot-dey = \"2009.08\" -" - RM_WORK_CFG=" INHERIT += \"rm_work\" # Exclude rm_work for some key packages (for debugging purposes) @@ -149,16 +142,6 @@ done<<-_EOF_ ccimx6sbc DONTBUILDVARIANTS _EOF_ -# Build alternative linux and u-boot -while read _pl _ker; do - eval "${_pl}_ker=\"${_ker}\"" -done<<-_EOF_ - ccardimx28js n - ccimx51js n - ccimx53js n - ccimx6sbc n -_EOF_ - YOCTO_IMGS_DIR="${WORKSPACE}/images" YOCTO_INST_DIR="${WORKSPACE}/digi-yocto-sdk.$(echo ${DY_REVISION} | tr '/' '_')" YOCTO_PROJ_DIR="${WORKSPACE}/projects" @@ -192,61 +175,55 @@ fi rm -rf ${YOCTO_IMGS_DIR} ${YOCTO_PROJ_DIR} for platform in ${DY_PLATFORMS}; do eval platform_variants="\${${platform}_var}" - eval platform_kernel2x="\${${platform}_ker%n}" - for kernel_ver in "" ${platform_kernel2x:+-2x}; do - for variant in ${platform_variants}; do - _this_prj_dir="${YOCTO_PROJ_DIR}/${platform}${kernel_ver}" - _this_img_dir="${YOCTO_IMGS_DIR}/${platform}${kernel_ver}" - if [ "${variant}" != "DONTBUILDVARIANTS" ]; then - _this_prj_dir="${YOCTO_PROJ_DIR}/${platform}${kernel_ver}_${variant}" - _this_img_dir="${YOCTO_IMGS_DIR}/${platform}${kernel_ver}_${variant}" - _this_var_arg="-v ${variant}" - [ "${variant}" = "-" ] && _this_var_arg="-v \\" - fi - mkdir -p ${_this_img_dir} ${_this_prj_dir} - if pushd ${_this_prj_dir}; then - # Configure and build the project in a sub-shell to avoid - # mixing environments between different platform's projects - ( - export TEMPLATECONF="${TEMPLATECONF:+${TEMPLATECONF}/${platform}}" - MKP_PAGER="" . ${YOCTO_INST_DIR}/mkproject.sh -p ${platform} ${_this_var_arg} <<< "y" - # Set a common DL_DIR and SSTATE_DIR for all platforms - sed -i -e "/^#DL_DIR ?=/cDL_DIR ?= \"${YOCTO_PROJ_DIR}/downloads\"" \ - -e "/^#SSTATE_DIR ?=/cSSTATE_DIR ?= \"${YOCTO_PROJ_DIR}/sstate-cache\"" \ - conf/local.conf - # Set the DISTRO and remove 'meta-digi-dey' layer if distro is not DEY based - sed -i -e "/^DISTRO ?=/cDISTRO ?= \"${DY_DISTRO}\"" conf/local.conf - if ! echo "${DY_DISTRO}" | grep -qs "dey"; then - sed -i -e '/meta-digi-dey/d' conf/bblayers.conf + for variant in ${platform_variants}; do + _this_prj_dir="${YOCTO_PROJ_DIR}/${platform}" + _this_img_dir="${YOCTO_IMGS_DIR}/${platform}" + if [ "${variant}" != "DONTBUILDVARIANTS" ]; then + _this_prj_dir="${YOCTO_PROJ_DIR}/${platform}_${variant}" + _this_img_dir="${YOCTO_IMGS_DIR}/${platform}_${variant}" + _this_var_arg="-v ${variant}" + [ "${variant}" = "-" ] && _this_var_arg="-v \\" + fi + mkdir -p ${_this_img_dir} ${_this_prj_dir} + if pushd ${_this_prj_dir}; then + # Configure and build the project in a sub-shell to avoid + # mixing environments between different platform's projects + ( + export TEMPLATECONF="${TEMPLATECONF:+${TEMPLATECONF}/${platform}}" + MKP_PAGER="" . ${YOCTO_INST_DIR}/mkproject.sh -p ${platform} ${_this_var_arg} <<< "y" + # Set a common DL_DIR and SSTATE_DIR for all platforms + sed -i -e "/^#DL_DIR ?=/cDL_DIR ?= \"${YOCTO_PROJ_DIR}/downloads\"" \ + -e "/^#SSTATE_DIR ?=/cSSTATE_DIR ?= \"${YOCTO_PROJ_DIR}/sstate-cache\"" \ + conf/local.conf + # Set the DISTRO and remove 'meta-digi-dey' layer if distro is not DEY based + sed -i -e "/^DISTRO ?=/cDISTRO ?= \"${DY_DISTRO}\"" conf/local.conf + if ! echo "${DY_DISTRO}" | grep -qs "dey"; then + sed -i -e '/meta-digi-dey/d' conf/bblayers.conf + fi + if [ "${DY_USE_MIRROR}" = "true" ]; then + sed -i -e "s,^#DIGI_INTERNAL_GIT,DIGI_INTERNAL_GIT,g" conf/local.conf + printf "${DIGI_PREMIRROR_CFG}" >> conf/local.conf + fi + if [ "${DY_RM_WORK}" = "true" ]; then + printf "${RM_WORK_CFG}" >> conf/local.conf + fi + # Remove 'x11' distro feature if building minimal images + if echo "${DY_TARGET}" | grep -qs "dey-image-minimal"; then + printf "${X11_REMOVAL_CFG}" >> conf/local.conf + fi + for target in ${DY_TARGET}; do + printf "\n[INFO] Building the ${target} target.\n" + time bitbake ${target} + # Build the toolchain for DEY images + if [ "${DY_BUILD_TCHAIN}" = "true" ] && echo "${target}" | grep -qs '^dey-image-[^-]\+$'; then + printf "\n[INFO] Building the toolchain for ${target}.\n" + time bitbake -c populate_sdk ${target} fi - if [ "${DY_USE_MIRROR}" = "true" ]; then - sed -i -e "s,^#DIGI_INTERNAL_GIT,DIGI_INTERNAL_GIT,g" conf/local.conf - printf "${DIGI_PREMIRROR_CFG}" >> conf/local.conf - fi - if [ -n "${kernel_ver}" ]; then - printf "${KERNEL_2X_CFG}" >> conf/local.conf - fi - if [ "${DY_RM_WORK}" = "true" ]; then - printf "${RM_WORK_CFG}" >> conf/local.conf - fi - # Remove 'x11' distro feature if building minimal images - if echo "${DY_TARGET}" | grep -qs "dey-image-minimal"; then - printf "${X11_REMOVAL_CFG}" >> conf/local.conf - fi - for target in ${DY_TARGET}; do - printf "\n[INFO] Building the ${target} target.\n" - time bitbake ${target} - # Build the toolchain for DEY images - if [ "${DY_BUILD_TCHAIN}" = "true" ] && echo "${target}" | grep -qs '^dey-image-[^-]\+$'; then - printf "\n[INFO] Building the toolchain for ${target}.\n" - time bitbake -c populate_sdk ${target} - fi - done - purge_sstate - ) - copy_images ${_this_img_dir} - popd - fi - done + done + purge_sstate + ) + copy_images ${_this_img_dir} + popd + fi done done