diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf deleted file mode 100644 index 0a111e0f0..000000000 --- a/meta-digi-arm/conf/machine/ccardimx28js.conf +++ /dev/null @@ -1,28 +0,0 @@ -#@TYPE: Machine -#@NAME: ConnectCore for MX28 JumpStart Kit. -#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX28 JSK. - -include conf/machine/include/ccardimx28.inc - -# U-Boot configurations -UBOOT_CONFIG ??= "ccardimx28js" -UBOOT_CONFIG[ccardimx28js] = "ccardimx28js_config" - -KERNEL_DEVICETREE = "imx28-${MACHINE}.dtb" - -# Serial console -SERIAL_CONSOLES ?= "115200;ttyAMA0" - -# Bluetooth tty -BT_TTY ?= "ttyAPP0" - -# U-Boot script to be copied to the SD image -BOOT_SCRIPTS = "boot.scr:boot.scr" - -# Flash image types -IMAGE_FSTYPES ?= "jffs2.sum sdcard tar.bz2 ubifs" - -# FLASH parameters -MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 2047" -EXTRA_IMAGECMD_jffs2 ?= "-l -e 128 -n" -JFFS2_SUM_EXTRA_ARGS ?= "${EXTRA_IMAGECMD_jffs2}" diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc deleted file mode 100644 index ab0ce8835..000000000 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ /dev/null @@ -1,47 +0,0 @@ -#@TYPE: Machine -#@NAME: ConnectCore for MX28 module. -#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX28 module. - -DIGI_FAMILY = "ccardimx28" -MACHINEOVERRIDES =. "mxs:mx28:${DIGI_FAMILY}:" - -include conf/machine/include/imx-digi-base.inc -include conf/machine/include/tune-arm926ejs.inc - -# Platform u-boot settings -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_SUFFIX = "sb" -UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" - -# Wireless external module -WIRELESS_MODULE ?= "" -WIRELESS_MODULE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}" - -# Firmware -MACHINE_FIRMWARE ?= "" -MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}" -MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}" - -MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash" -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" - -# -# Supported variants -# -# Maintain in sync with the same table in platform local.conf template. -# -# Name WiFi Eth2 BT 1wire -# ------------------------------------------- -# - N N N N (empty MACHINE_VARIANT="") -# e N Y N N -# w Y N N N -# wb Y N Y N -# web Y Y Y N -# web1 Y Y Y Y - -# Per-variant machine features -MACHINE_FEATURES_append_e = " second-eth" -MACHINE_FEATURES_append_w = " wifi" -MACHINE_FEATURES_append_wb = " wifi bluetooth" -MACHINE_FEATURES_append_web = " wifi second-eth bluetooth" -MACHINE_FEATURES_append_web1 = " wifi second-eth bluetooth 1-wire" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 1780c8ec7..fe6f69e66 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -10,7 +10,6 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # # Platform Linux U-Boot # ------------------------------------------------- -# ccardimx28 3.10 2013.01 # ccimx6 4.1, 3.14 2015.04 # ccimx6ul 4.1 2015.04 # diff --git a/sdk/build-github.sh b/sdk/build-github.sh index f84156d02..ec71e09a3 100755 --- a/sdk/build-github.sh +++ b/sdk/build-github.sh @@ -3,7 +3,7 @@ # # build-github.sh # -# Copyright (C) 2015 by Digi International Inc. +# Copyright (C) 2015-2017 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -22,7 +22,7 @@ set -e -AVAILABLE_PLATFORMS="ccardimx28js ccimx6sbc ccimx6ulsbc ccimx6ulstarter" +AVAILABLE_PLATFORMS="ccimx6sbc ccimx6ulsbc ccimx6ulstarter" MANIFEST_URL="https://github.com/digi-embedded/dey-manifest.git" @@ -119,7 +119,6 @@ while read _pl _tgt; do [ -n "${DY_TARGET}" ] && _tgt="${DY_TARGET}" || true eval "${_pl}_tgt=\"${_tgt}\"" done<<-_EOF_ - ccardimx28js dey-image-qt ccimx6sbc dey-image-qt ccimx6ulsbc dey-image-qt ccimx6ulstarter core-image-base diff --git a/sdk/build.sh b/sdk/build.sh index a26f5c656..82d45c1c3 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -3,7 +3,7 @@ # # build.sh # -# Copyright (C) 2013 by Digi International Inc. +# Copyright (C) 2013-2017 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -169,7 +169,6 @@ while read _pl _var _tgt; do eval "${_pl}_var=\"${_var//,/ }\"" eval "${_pl}_tgt=\"${_tgt//,/ }\"" done<<-_EOF_ - ccardimx28js -,e,w,wb,web,web1 dey-image-qt ccimx6sbc DONTBUILDVARIANTS dey-image-qt,dey-image-aws ccimx6ulsbc DONTBUILDVARIANTS dey-image-qt,dey-image-aws ccimx6ulstarter DONTBUILDVARIANTS core-image-base,dey-image-aws diff --git a/sdk/config/ccardimx28js/bblayers.conf.sample b/sdk/config/ccardimx28js/bblayers.conf.sample deleted file mode 100644 index bc2ef9645..000000000 --- a/sdk/config/ccardimx28js/bblayers.conf.sample +++ /dev/null @@ -1,22 +0,0 @@ -# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -POKY_BBLAYERS_CONF_VERSION = "2" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-yocto-bsp \ - ##DIGIBASE##/meta-openembedded/meta-oe \ - ##DIGIBASE##/meta-openembedded/meta-python \ - ##DIGIBASE##/meta-openembedded/meta-networking \ - ##DIGIBASE##/meta-openembedded/meta-webserver \ - ##DIGIBASE##/meta-qt5 \ - ##DIGIBASE##/meta-swupdate \ - ##DIGIBASE##/meta-freescale \ - ##DIGIBASE##/meta-fsl-demos \ - ##DIGIBASE##/meta-digi/meta-digi-arm \ - ##DIGIBASE##/meta-digi/meta-digi-dey \ - " diff --git a/sdk/config/ccardimx28js/conf-notes.txt b/sdk/config/ccardimx28js/conf-notes.txt deleted file mode 100644 index d8fa34f70..000000000 --- a/sdk/config/ccardimx28js/conf-notes.txt +++ /dev/null @@ -1,12 +0,0 @@ -Digi Embedded Yocto provides the following image recipes: - - * dey-image-qt: graphical QT image - - By default the image is X11-based so it provides a full SATO theme - desktop environment. - - To compile the image for the framebuffer (instead of X11) add the - following line to the project's conf/local.conf: - - DISTRO_FEATURES_remove = "x11" - diff --git a/sdk/config/ccardimx28js/local.conf.sample b/sdk/config/ccardimx28js/local.conf.sample deleted file mode 100644 index a77a66ace..000000000 --- a/sdk/config/ccardimx28js/local.conf.sample +++ /dev/null @@ -1,270 +0,0 @@ -# -# This file is your local configuration file and is where all local user settings -# are placed. The comments in this file give some guide to the options a new user -# to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. -# -# Lines starting with the '#' character are commented out and in some cases the -# default values are provided as comments to show people example syntax. Enabling -# the option is a question of removing the # character and making any change to the -# variable as required. - -# -# Machine Selection -# -# You need to select a specific machine to target the build with. There are a selection -# of emulated machines available which can boot and run in the QEMU emulator: -# -#MACHINE ?= "qemuarm" -#MACHINE ?= "qemuarm64" -#MACHINE ?= "qemumips" -#MACHINE ?= "qemumips64" -#MACHINE ?= "qemuppc" -#MACHINE ?= "qemux86" -#MACHINE ?= "qemux86-64" -# -# There are also the following hardware board target machines included for -# demonstration purposes: -# -#MACHINE ?= "beaglebone" -#MACHINE ?= "genericx86" -#MACHINE ?= "genericx86-64" -#MACHINE ?= "mpc8315e-rdb" -#MACHINE ?= "edgerouter" -# -# This sets the default machine to be qemux86 if no other machine is selected: -#MACHINE ??= "qemux86" - -MACHINE = "ccardimx28js" - -# -# Supported variants -# -# Maintain in sync with the same table in platform machine config file. -# -# Name WiFi Eth2 BT 1wire -# ------------------------------------------- -# - N N N N (empty MACHINE_VARIANT="") -# e N Y N N -# w Y N N N -# wb Y N Y N -# web Y Y Y N -# web1 Y Y Y Y -MACHINE_VARIANT = "web1" - -# -# Use Digi's internal git repositories -# -#DIGI_INTERNAL_GIT ?= "1" - -# -# Where to place downloads -# -# During a first build the system will download many different source code tarballs -# from various upstream projects. This can take a while, particularly if your network -# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you -# can preserve this directory to speed up this part of subsequent builds. This directory -# is safe to share between multiple builds on the same machine too. -# -# The default is a downloads directory under TOPDIR which is the build directory. -# -#DL_DIR ?= "${TOPDIR}/downloads" - -# -# Where to place shared-state files -# -# BitBake has the capability to accelerate builds based on previously built output. -# This is done using "shared state" files which can be thought of as cache objects -# and this option determines where those files are placed. -# -# You can wipe out TMPDIR leaving this directory intact and the build would regenerate -# from these files if no changes were made to the configuration. If changes were made -# to the configuration, only shared state files where the state was still valid would -# be used (done using checksums). -# -# The default is a sstate-cache directory under TOPDIR. -# -#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" - -# -# Where to place the build output -# -# This option specifies where the bulk of the building work should be done and -# where BitBake should place its temporary files and output. Keep in mind that -# this includes the extraction and compilation of many applications and the toolchain -# which can use Gigabytes of hard disk space. -# -# The default is a tmp directory under TOPDIR. -# -#TMPDIR = "${TOPDIR}/tmp" - -# -# Default policy config -# -# The distribution setting controls which policy settings are used as defaults. -# The default value is fine for general Yocto project use, at least initially. -# Ultimately when creating custom policy, people will likely end up subclassing -# these defaults. -# -DISTRO ?= "dey" -# As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream -# source control systems. This is just mentioned here as an example, its not -# useful to most new users. -# DISTRO ?= "poky-bleeding" - -# -# Package Management configuration -# -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used -# to generate the root filesystems. -# Options are: -# - 'package_deb' for debian style deb files -# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) -# - 'package_rpm' for rpm style packages -# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" - -# -# SDK target architecture -# -# This variable specifies the architecture to build SDK items for and means -# you can build the SDK packages for architectures other than the machine you are -# running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 -#SDKMACHINE ?= "i686" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages -# (useful if you want to run the package test suites) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image suitable for development -# e.g. ssh root access has a blank password -# There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. -# We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES ?= "debug-tweaks" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable -# are: -# - 'buildstats' collect build statistics -# - 'image-mklibs' to reduce shared library files size for an image -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-mklibs image-prelink" - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -# It's necesary to monitor /tmp, if there is no space left the build will fail -# with very exotic errors. -BB_DISKMON_DIRS = "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ -#file://.* file:///some/local/dir/sstate/PATH" - - -# -# Qemu configuration -# -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl-native will -# be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl-native then uncomment the ASSUME_PROVIDED line below. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" - - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "1" - -# -# Enable local PR server -# -PRSERV_HOST = "localhost:0" - -# -# Some libraries and packages are covered by NXP EULA -# -#ACCEPT_FSL_EULA = "1" diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh index 576e7cc7d..7ea2bd9bb 100755 --- a/sdk/mkproject.sh +++ b/sdk/mkproject.sh @@ -3,7 +3,7 @@ # # mkproject.sh # -# Copyright (C) 2013 by Digi International Inc. +# Copyright (C) 2013-2017 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ MKP_NONE="\033[0m" MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/meta-digi/sdk/config" # Blacklist platforms (not officially supported in a DEY release) -MKP_BLACKLIST_PLATFORMS="ccardimx28js" +MKP_BLACKLIST_PLATFORMS="" MKP_SETUP_ENVIRONMENT='#!/bin/bash