[3rdparty][PATCH 00/15] update the toradex bsp files to 2.7.3 release

[3rdparty][PATCH 00/15] update the toradex bsp files to 2.7.3 release

[Max Krummenacher]

Hi

This updates the machine, kernel and bootloader files for Toradex
machines to the versions used for the Toradex 2.7.3 relase.

The intention is to also backport them into pyro and morty once they
are in master.

Max

Max Krummenacher (15):
  linux-toradex: update kernel version 4.4 for colibri-vf
  linux-toradex: update kernel to 4.1 for apalis-/colibri-imx6,
    colibri-imx7
  u-boot-toradex: update to 2016.11
  apalis-imx6.conf: build a spl based u-boot
  apalis-imx6.conf: do not deploy the kernel in the rootfs
  apalis-imx6.conf: add device trees for ixora and use-mainline-bsp
  apalis-imx6.conf: add an include file hook
  colibri-imx6.conf: build a spl u-boot
  colibri-imx6.conf: do not deploy the kernel in the rootfs
  colibri-imx6.conf: add device trees for aster and use-mainline-bsp
  colibri-imx6.conf: add an include file hook
  colibri-imx7.conf: add device tree for the aster carrier board
  colibri-imx7.conf: add an include file hook
  colibri-vf.conf: add a device tree for the aster carrier board
  colibri-vf.conf: add an include file hook

 conf/machine/apalis-imx6.conf                      |  29 +-
 conf/machine/colibri-imx6.conf                     |  19 +-
 conf/machine/colibri-imx7.conf                     |   5 +-
 conf/machine/colibri-vf.conf                       |   5 +-
 recipes-bsp/u-boot/u-boot-toradex.inc              |  11 +-
 recipes-bsp/u-boot/u-boot-toradex_2015.04.bb       |   7 -
 recipes-bsp/u-boot/u-boot-toradex_2016.11.bb       |   9 +
 .../linux/linux-toradex-3.14.52/defconfig          | 374 ---------------------
 .../defconfig                                      | 129 +++++--
 recipes-kernel/linux/linux-toradex-4.4/defconfig   |   6 +
 recipes-kernel/linux/linux-toradex_3.14.52.bb      |  13 -
 ...oradex_4.1.15.bb => linux-toradex_4.1-2.0.x.bb} |  10 +-
 recipes-kernel/linux/linux-toradex_4.4.bb          |   5 +-
 13 files changed, 177 insertions(+), 445 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-toradex_2016.11.bb
 delete mode 100644 recipes-kernel/linux/linux-toradex-3.14.52/defconfig
 rename recipes-kernel/linux/{linux-toradex-4.1.15 => linux-toradex-4.1-2.0.x}/defconfig (77%)
 delete mode 100644 recipes-kernel/linux/linux-toradex_3.14.52.bb
 rename recipes-kernel/linux/{linux-toradex_4.1.15.bb => linux-toradex_4.1-2.0.x.bb} (75%)

-- 
2.9.4

[3rdparty][PATCH 01/15] linux-toradex: update kernel version 4.4 for colibri-vf

[Max Krummenacher]

- Merge to upstream patchlevel Linux 4.4.73
- Add Remote Processor Messaging (rpmsg) driver for Vybrid
- Various other additions and fixes
- Synchronize defconfig with kernel tree colibri_vf_defconfig

Apart from the upstream patches the following commits were added:

* c1d5fe2 Merge tag 'v4.4.73' into toradex_vf_4.4-next
* 0068a1b ARM: dts: vf-colibri-aster: Add support for Aster with Vybrid
* f37e832 ARM: vf610: PM: Use device tree property to register power_off function
* 3348e45 tty: serial: fsl_lpuart: fix del_timer_sync() vs timer routine deadlock
* f9fc0f2 ARM: dts: imx: fix M41T0 RTC compatible string
* 41e7fd5 rtc: ds1307: support m41t0 variant
* 7cfa321 tty: serial: fsl_lpuart: lock port on console write
* 00babbc ARM: dts: colibri-vf: use pull-down for USBC_DET pin
* 8b06b41 tty: serial: fsl_lpuart: resync with 4.9 kernel
* 837e5b8 Merge tag 'v4.4.59' into toradex_vf_4.4-next
* 418f717 net: fsl_l2_switch: cleanup in remove callback
* 86b0182 net: ethernet: freescale: allow vf610_l2_switch as module
* fa64e12 net: fsl_l2_switch: drop registering phy in switch mode
* cd2eb96 Merge tag 'v4.4.39' into toradex_vf_4.4-next
* 56ffbfa spi: spi-fsl-dspi: Purge switch between EOQ and DMA mode
* 90b6d21 ARM: dts: vfxxx: Enable DMA for DSPI2 and DSPI3
* e2d03ba spi: spi-fsl-dspi: Fix incorrect freeing of DMA allocated buffers
* 9b02266 spi: spi-fsl-dspi: Fix continuous selection format
* 529dcc0 spi: spi-fsl-dspi: Fix incorrect DMA setup
* de55e33 spi: spi-fsl-dspi: Fix SPI transfer issue when using multiple SPI_IOC_MESSAGE
* 3356fd1 spi: spi-fsl-dspi: Fix data corruption for 1K transfers or more
* e1ce49e drm/fsl-dcu: introduce kernel parameter to specify fbdev depth
* 93fb63a ARM: configs: colibri_vf: configure IPv6 SIT driver as module
* 4a8d085 sdhci-esdhc-imx: fix bus-width for 1-bit operation.
* 3816bd7 ARM: vf610: PM: register power_off function
* 7ccb5e5 usb: chipidea: implement platform shutdown callback
* 1cb2765 drm/fsl-dcu: disable CRTC gracefully
* 9e4d484 net: fec: align IP header in hardware
* 6a18208 Input: colibri-vf50-ts: disable IRQs on close
* a650cbf tty: serial: fsl_lpuart: Fix Tx DMA edge case
* 64086f8 drm/fsl-dcu: enable pixel clock when enabling CRTC
* 44108d4 drm/fb_cma_helper: Remove implicit call to disable_unused_functions
* 01a613e drm/fsl-dcu: do not transfer register in mode_set_nofb
* ab74a917 drm/fsl-dcu: do not explicitly transfer registers on plane init
* b385ffb drm/fsl-dcu: enable TCON bypass mode by default
* 7ecc29c ARM: dts: vfxxx: Include support for dspi[23] functionality.
* 95bb750 drm/fsl-dcu: implement lastclose callback
* 5f0a2c4 rpmsg: vf610_rpmsg: check for error pointer
* a47f6f42 char: vf610_sema4: use macro to register driver
* a5a7e6d char: vf610_sema4: improve error handling
* fa359d7 pinctrl: freescale: avoid overwriting pin config when freeing GPIO
* 624f65b i2c: imx: defer probe if bus recovery GPIOs are not ready
* 2e02dcb i2c: imx: make bus recovery through pinctrl optional
* 25ae853 ARM: vf610: PM: initialize suspend to memory seperately
* 80c40b6 ARM: dts: vfxxx: Reintroduce the OCRAM nodes
* cd89f00 Merge tag 'v4.4.21' into toradex_vf_4.4-next
* 45de59e spi: spi-fsl-dspi: Add DMA support for Vybrid
* a8f99a5 ARM: dts: vfxxx: Enable DMA for DSPI on Vybrid
* 51243ff tty: serial: fsl_lpuart: Fix parity control
*   8f2dbc3 Merge branch 'toradex_vf_4.4-rpmsg' into toradex_vf_4.4-next
|\
| * 8439c80 ARM: configs: colibri_vf: Enable remoteproc and rpmsg for Vybrid
| * 764bf1b ARM: dts: vf610: Enable rpmsg driver for Vybrid
| * 5feabad rpmsg: vf610_rpmsg: Add rpmsg driver for Vybrid
| * 7b3be87 rpmsg: imx_rpmsg: Add rpmsg examples
| * ce28cb8 ARM: dts: vf610: Add device tree node for semaphore module on Vybrid
| * a52aca8 char: vf610_sema4: Add support for semaphore module on Vybrid
| * 41d0195 ARM: dts: vfxxx: Allow CCM to be accessed using syscon
| * f5fcfa3 ARM: dts: vf610: Add device tree node for Vybrid remoteproc driver
| * 8b08f5f remoteproc: vf610_cm4_rproc: Add remoteproc support for Vybrid
| * 43c2041 remoteproc: Support ELF loading without resource table
| * fdbb13c ARM: dts: vfxxx: Add CPU2CPU interrupts for MSCM module
| * 91294be irqchip: vf610-mscm-ir: Extend MSCM with CPU2CPU interrupt support
|/
* e11f8ba ARM: dts: vf-colibri: use Toradex evalspi
* 503ad82 spi: spidev: invent a new hw device to work around spidev warning
* 65e1bdf Revert "spi core: Add new sysfs 'num_chipselect' file"
* db04bd4 Revert "spi: spidev: Use 'new_id' sysfs file for enabling spidev"

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-kernel/linux/linux-toradex-4.4/defconfig | 6 ++++++
 recipes-kernel/linux/linux-toradex_4.4.bb        | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-toradex-4.4/defconfig b/recipes-kernel/linux/linux-toradex-4.4/defconfig
index f23d1c5..90d315b 100644
--- a/recipes-kernel/linux/linux-toradex-4.4/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.4/defconfig
@@ -57,6 +57,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
+CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=y
 CONFIG_NF_CONNTRACK=y
@@ -162,6 +163,7 @@ CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
 # CONFIG_SERIO is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
+CONFIG_VF610_SEMA4=y
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_HW_RANDOM=y
@@ -270,6 +272,10 @@ CONFIG_FSL_EDMA=y
 # CONFIG_MX3_IPU is not set
 CONFIG_ARM_TIMER_SP804=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_VF610_CM4_RPROC=m
+CONFIG_IMX_RPMSG_PINGPONG=m
+CONFIG_IMX_RPMSG_TTY=m
+CONFIG_VF610_RPMSG=m
 CONFIG_SOC_BUS_VF610=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
diff --git a/recipes-kernel/linux/linux-toradex_4.4.bb b/recipes-kernel/linux/linux-toradex_4.4.bb
index 9b29aa2..323acae 100644
--- a/recipes-kernel/linux/linux-toradex_4.4.bb
+++ b/recipes-kernel/linux/linux-toradex_4.4.bb
@@ -8,8 +8,9 @@ SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRAN
 
 KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
 
-LOCALVERSION = "-v2.6b2"
+PR = "2.7.3"
+LOCALVERSION = "-${PR}"
 SRCBRANCH = "toradex_vf_4.4"
-SRCREV = "efe965a5dad66bd14219cdc9474ea75eda783456"
+SRCREV = "c1d5fe2d54551b95b812143d94d8168da2220dd8"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(vf)"
-- 
2.9.4

[3rdparty][PATCH 02/15] linux-toradex: update kernel to 4.1 for apalis-/colibri-imx6, colibri-imx7

[Max Krummenacher]

Update the kernel for a fslc-imx 4.1-2.0.x based kernel for Apalis/Colibri iMX6
and Colibri iMX7.
This replaces the linux-toradex_3.14.52 and linux-toradex_4.1.15 kernels, thus
remove the recipes and their related files.

Add a superset of the machine specific defconfigs in the kernel tree as the
defconfig.

The following commits on top of fslc "Merge tag 'v4.1.39' into 4.1-2.0.x-imx"
without the machine specific device-trees or defconfigs commits.:

* 3f68dc7 busfreq-imx: only use existing global variables
* 22eb8a9 Revert "cpufreq: imx7: fix undefined reference to arm_reg and soc_reg"
* 38524d7 Documentation: fix imx7d pinctrl dse config bits
* 71d7b33 imx7d-colibri: limit to 800 mhz and 1 ghz operating points
* b339205 imx7s: add mandatory 800 mhz operating point
* 22db6be video: fbdev: mxsfb: allow setting display timings via kernel command line
* a6563bd cpufreq: imx7: fix undefined reference to arm_reg and soc_reg
* 9262956 dts: imx7d: move operating points to i.MX 7Dual device tree
* 50e26af mxc_ipuv3_fb: Use the mode_string from command line as is
* d826eb4 ov5640_mipi: Revert the hack
* a5c56b9 ARM: dts: imx6qdl-apalis-ixora: Enable ADV7280 decoder on Ixora
* b8e5d21a tty: serial: imx: Add support for enabling RS485 via device tree
* a8e0d43 ARM: imx: spare the first 16KiB of OCRAM_S for Cortex-M4
* a2130af sgtl5000: improve switch on vag power for line_in -> output
* b48a96a ARM: dts: colibri imx6: configure an external sgtl5000 vddd source
* d21fcda ARM: dts: apalis imx6: configure an external sgtl5000 vddd source
* 40fbb01 ARM: dts: colibri imx6: increase sgtl5000 lrclk drive strenght
* 87f6630 ASoC: sgtl5000: Allow LRCLK pad drive strength to be changed
* 1a3c9b3 ASoC: sgtl5000: add headphone and LINEOUT mute controls
* 8929d0a sgtl5000: add Lineout volume control
* 81fba3f ASoC: sgtl5000: Do not disable regulators in SND_SOC_BIAS_OFF
* 66a04e9 ASoC: sgtl5000: Disable internal PLL early
* 85436af ASoC: sgtl5000: Initialize CHIP_ANA_POWER to power-on defaults
* 51bc42e ASoC: sgtl5000: Write all default registers
* 4523526 ASoC: sgtl5000: Fix regulator support
* 4859c2e90 ASoC: sgtl5000: Remove misleading comment
* abbdc0a ASoC: sgtl5000: fix VAG power up timing
* 198628d ASoC: sgtl5000: fix error message output for MicBias voltage
* 912e038 ASoC: sgtl5000: Replace direct snd_soc_codec dapm field access
* ae56e9d ASoC: sgtl5000: Calculate Lineout Channel Output Level
* 3db63e2 ASoC: sgtl5000: Use specific variable for lo_vag
* f972815 net: can: flexcan: Fix wakeup on CAN from suspend issue
* b6798bb iio: adc: remove event advertisment
* 7a751b2 iio: adc: support IIO_CHAN_INFO_SCALE
* 051ee1a1 apalis-imx6: use stopmode for poweroff
* 8949147 pm-imx6.c: fix power off by stop mode
* 29ff238 colibri-imx6: use stopmode for poweroff
* 94a53ed net: fec: don't transfer ownership until descriptor write is complete
* c15a4c3 rtc: ds1307: support m41t0 variant
* 3e3ea9b sgtl5000: switch on vag power for line_in -> output
* 091594e iio: adc: fix remove
* 4bac3c9 mmc: sdio: add forward declaration for struct mmc_host
* a86db1f ARM: imx: mu: let Cortex-M4 know about A7 state
* 98adbba ARM: imx: clk: do not force clock frequency of M4
* 9e05354 ARM: imx: busfreq: do not force high frequency during suspend
* 70f901b ARM: imx: busfreq: initialize M4 frequency depending boot state
* 3e92301 ARM: imx: busfreq: request bus frequency depending on M4 clock
* 0666dae arm: dts: imx7: specify Cortex-M4 clock
* c663470 mmc: sdhci-esdhc-imx: make sure runtime PM is suspended in system suspend
* 2df675a mtd: gpmi: make sure runtime PM is suspended in system suspend
* ebf4565 video: fbdev: mxsfb: make sure runtime PM is suspended in system suspend
* a2ccbd2 net: fec: make sure runtime PM is suspended in system suspend
* 5ced941 imx_thermal.c: set trip point depending on temp grade
* 9090b5b imx: Expose SoC unique ID
* 8a098f2 drivers: soc: Add new sysfs attribute to expose SoC unique ID
* 36df4e2 arm: dts: imx7: specify keypad port clock
* 7b51b63 ARM: imx7d: clk: add root clock for keypad port
* 506993e rpmsg: use _debug variants for print_hex_dump
* 5aba75e rpmsg: imx: do not push data when no reader is available
* cade8f64 hexdump: do not print debug dumps for !CONFIG_DEBUG
* 1db9a16 ARM: imx: define buffer count per VirtIO queue
* 4cfa939 gpio: mxc: clear interrupt mask/status optionally
* 25b9f89 ARM: imx: remove 'unused' warning
* 257fabb tty: serial: imx: disable DCD and RI interrupts
* c784a4d imx6qdl.dtsi: include bindings gpio.h
* 735d4f8 video: mxc: ldb: Add support for LVDS configuration via kernel boot arguments
* 558d378 colibri_imx6:Add MCP2515 SPI CAN controller to DT
* 7df8a0f media: Add support for ADV7280 decoder driver
* 358a46a mxc_v4l2_capture: Change error message to print on debug
* 80aae0b mxc_v4l2_capture: Allow clock setting for de-interlaced video input
* 0d85191 tty: serial: imx: disable DCD and RI interrupts
* 8ddc702 PCI: Apalis GEN1 forcing quirk
* 826486c PCI: imx6: fix PCIe EP device self-initialisation
* e00c546 process.c: if power off fails, do at least a halt
* be63e27 Input: sentelic - use "static inline" instead of "inline"
* b28f212 mxc_v4l2_capture.c: make error messages unique
* d7357aa ipu_csi_enc.c: fix debug print
* 4e1e8d2 max9526.c: move pinctrl after i2c detect
* 638f43c adv7180.c: convert debug output to dev_dbg
* 67c0d5a2 dtb, i2c-imx.txt: fix typos
* 1ce23b6 mxc_v4l2_capture: match ipu/csi/mipi instead of only ipu/csi
* c5954c2 max9526: add initial MXC camera sensor code
* df76b16 adv7180.c: initial working adv7180 settings
* 518d4ee mxc_v4l2_capture: let the camera driver set mipi/parallel
* 62785df pci-imx6: fix reboot bug
* d2e0de0 mxc_hdmi.c: fix boot hang
* cec9878 extcon: usb-gpio: increase debounce time
* 1fe0cf4 mxc_lcdif.c: fix comment
* 912f823 mxc_v4l2_capture: add mxc_camera_common_lock/unlock, fix device name
* 502376a MXC_CSI_CAMERA: select VIDEOBUF2_DMA_CONTIG
* 691204a clk-imx6q.c: set eth phy clock dependent on RMII/RGMII
* bea0575 mach-imx6q.c: handle RESET_MOCI when PCIe is disabled
* 78d5ad8 mxc_hdmi.c: remove compiler warning
* 2d67c55 mxc_hdmi: fix detect disconnect case
* b34325c OmniVision ov5640 MIPI-CSI2 camera support
* b548028 i2c-imx: add gpio recovery functionality
* fc0d0a2 pcie-imx6: improve reset function for reseting EP
* 557f0276 pcie-imx6: add reset function for reseting downstream EP
* b0e8865 mach-imx6q.c: fix typo in error msg
* 0bcaad8 mxc_vdacif.c: add second parallel output used for VDAC
* f069491 pci-imx6.c: add config option to force GEN1 speed
* e4d913a iio:stmpe-adc.c: Switch to new event config interface
* af6cf45 vgaarb.c: demote pr_err about vga device to pr_debug
* 4e6509c mxc_lcdif.c: add additonal LCD timings
* 849f2e7 pci-imx6.c: remove compiler warning
* 85aff64 mxc_lcdif.c: EDT-WVGA: fix pixelclk polarity
* f6620779 mxc_hdmi: skip unnecessary mxc_hdmi_setup calls
* c73cb81 sync.h: synchronization framework needs this header
* d39b4cf arm: imx6: fix pcie by disabling rc/ep test mode
* 7435612 stmpe-adc: add temperature channel
* 6f88e1d stmpe-adc: add device tree bindings
* 6b542ac iio: adc: add STMPE ADC driver using IIO framework
* d5c4b1b mfd: stmpe: add ADC block resources
* 3b99e8c mach-types: add the apalis-imx6 machine
* 6a315fa lcd: Add WVGA timings for the EDT 7.0" panel
* 6ff9133 mxc_spdif.c: set the validity bit to 'valid'
* 25c2bbc eMMC: Don't initialize partitions on RPMB flagged areas.
* d2aa5b3 tc358743_h2c: add devicetree support
* 97662d8 TC358743 Kconfig dependency update
* e966a0b tc358743_h2c: fill in sample edid data from Asus monitor
* fa98ab8 tc358743_h2c: fix compiler warnings
* 1ae41be tc358743_h2c: cleanup spacing
* cb8232e add tc358743_h2c driver
* 3bb87f2 sdhci: print opcode/retries on timeout error
* a26957b ov5640_mipi: software reset does not affect i2c address
* f157011 ipu_common: ipu_free_irq, do nothing if not owner
* 916ed1f ipu_csi_enc: improve error message
* 439ea46 ipu_prp_enc: improve error message
* cd35b25 ov5642: fix csi/ipu check for imx6dl
* 388605f ov5640_mipi: fix csi/ipu check for imx6dl
* 07bd62d ov5642: add i2c address change feature
* 73924ed0 ov5640_mipi: add i2c address change feature
* 12749a2 mxc_mipi_csi2: add ipu/csi info to probed output
* 9ffb829 ov5640_mipi: change registered name from ov5640 to ov5640_mipi to reduce confusion
* 98963d0 i.MX6: v4lout: none of our displays support color-space conversion
* f657dc3 dma-mapping: increase DEFAULT_DMA_COHERENT_POOL_SIZE ifdef CONFIG_VIDEO_TW68
* 41feae5 PCI: Add quirk for setting valid class for TW6869 frame grabber
* d69533a mxc_hdmi: Add only_cea parameter to mxc_hdmi module
* 5969e2c rfkill-regulator: add dt support
* 66d9883 ov5640_mipi: simplify mipi clock wait loop
* 04abce7 mxc_hdmi: enable overflow interrupt after initialization complete
* de5231f mxc_hdmi: default to keep-alive (don't detect disconnect)
* 51394b5 Add support for DVI monitors
* 4898869 ov5640_mipi: print message on gpio request failure
* e2954c5 mxc_v4l2_capture: add ipu_id to sensor_data
* af79b8b ov5640_mipi: add remove *2 and add error checking to OV5640_get_sysclk
* a03ab41 ov5640_mipi: add imx6 mipi/parallel selection
* 4f704da ov5640: add pwm option for mclk
* 81cf941 ov5642: add imx6 mipi/parallel selection
* ede1722 fix camera power down
* 6c4f140 add ar1021 touchscreen
* bc387b6 mxc_v4l2_capture: fix VIDIOC_ENUMSTD, return -EINVAL if index > 0
* 89a914b mxc_ipuv3_fb: unblank displays at init
* a1b1b16 ARM: imx: adjust vring location to be at 256MB boundary
* 8227a8a arm: dts: imx7: decrease DMA CMA to 128MB
* 4af562c ARM: imx7d: clk: add 240MHz sys main clock to init_on
* 1f43d37 usb: chipidea: Use extcon framework for ID and VBUS detection
* 24bd9a5 arm: dts: imx7: Add support for PWM polarity control
* e32dd66 pwm: imx: Add support for polarity control
* 10a6f7d cpufreq: imx7: don't support OPP table from platform data
* 46c52bd video: fbdev: mxsfb: honor native-mode
* b03cdd9 video: mxsfb: simplify parsing
* f3d8abf Revert "sgtl5000.c: HACK, defer probe when I2C not yet running"
* 967986f touchscreen: fusion_F0710A: Reset controller if clear interrupt operation fails
* d4afe65 input: touchscreen: fusion: implement multitouch with slot handling
* 5be4f48 input: touchscreen: fusion: use level triggered interrupt
* fbfa23b input: touchscreen: fusion: add device tree integration
* 02411ee input: touchscreen: fusion: platform independent GPIO description
* fd92393 input: touchscreen: fusion: fix error handling
* 808f8b9 input: touchscreen: fusion: use new I2C PM functions
* ef32550 input: touchscreen: added platform data for Fusion touchscreen
* 3e2c068 input: touchscreen: fix race condition in Fusion driver
* ac9343d input: touchscreen: add ABS_X/ABS_Y axis for Fusion touchscreen
* a9fc7d5 input: touchscreen: add Fusion 7 and 10 multi-touch driver
* e2d1fdb fbcon: logo: allow easy integration of a custom Linux boot logo
* 49f0b58 spi: spidev: invent a new hw device to work around spidev warning
* bcdfec9 ARM: imx: fix clock for i.MX 7 when Cortex-M4 is running
* 8693a14 pinctrl: pinctrl-imx: add support for LPSR GPR padctrl
* ea2ea01 mfd: rn5t618: register restart handler
* a7b0e5f mfd: add Ricoh RN5T567 PMIC suppport
* 675e67c drivers/dma/Kconfig: allow MXS_DMA for i.MX 7
* d68621a regulator: rn5t618: allow GPIO 0 to be used for an enable signal
* f0e41d7 ENGR00305648-1 ASoC: imx-sgtl5000: Support non-ssi cpu-dai
* f992a95 video: fbdev: mxsfb: fix pixelclock polarity
* d46df08 mach-imx7d.c: use enet_out clk to decide on PHY clock
* 68bf174 Input: ad7879 - add device tree support
* 63339e0 Input: ad7879 - fix default x/y axis assignment
* d1a439e Input: ad7879 - move header to platform_data directory
* 0adde3f ARM: imx: enet1: output reference clock
* 633a4e1 video: mxsfb: add compile dependencies
* f4c63ec chipidea: make usb charger optional
* c8b53a4 regulator: rn5t618: Add RN5T567 PMIC support

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 .../linux/linux-toradex-3.14.52/defconfig          | 374 ---------------------
 .../defconfig                                      | 129 +++++--
 recipes-kernel/linux/linux-toradex_3.14.52.bb      |  13 -
 ...oradex_4.1.15.bb => linux-toradex_4.1-2.0.x.bb} |  10 +-
 4 files changed, 115 insertions(+), 411 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-toradex-3.14.52/defconfig
 rename recipes-kernel/linux/{linux-toradex-4.1.15 => linux-toradex-4.1-2.0.x}/defconfig (77%)
 delete mode 100644 recipes-kernel/linux/linux-toradex_3.14.52.bb
 rename recipes-kernel/linux/{linux-toradex_4.1.15.bb => linux-toradex_4.1-2.0.x.bb} (75%)

diff --git a/recipes-kernel/linux/linux-toradex-3.14.52/defconfig b/recipes-kernel/linux/linux-toradex-3.14.52/defconfig
deleted file mode 100644
index 2a90013..0000000
--- a/recipes-kernel/linux/linux-toradex-3.14.52/defconfig
+++ /dev/null
@@ -1,374 +0,0 @@
-CONFIG_KERNEL_LZO=y
-CONFIG_SYSVIPC=y
-CONFIG_FHANDLE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_NAMESPACES=y
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EMBEDDED=y
-CONFIG_PERF_EVENTS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_MXC=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_SOC_IMX6SX=y
-CONFIG_PCI=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_IMX6=y
-CONFIG_PCI_FORCE_GEN1=y
-CONFIG_SMP=y
-CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
-CONFIG_CMA=y
-CONFIG_UACCESS_WITH_MEMCPY=y
-CONFIG_SECCOMP=y
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_ARM_IMX6Q_CPUFREQ=y
-CONFIG_CPU_IDLE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_TEST_SUSPEND=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_NETFILTER=y
-CONFIG_CAN=y
-CONFIG_CAN_VCAN=y
-CONFIG_CAN_MCP251X=y
-CONFIG_CAN_FLEXCAN=y
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_LL=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_RFKILL=y
-CONFIG_RFKILL_GPIO=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=320
-CONFIG_CMA_SIZE_PERCENTAGE=50
-CONFIG_CMA_SIZE_SEL_MIN=y
-CONFIG_IMX_WEIM=y
-CONFIG_CONNECTOR=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_UBI=y
-CONFIG_PROC_DEVICETREE=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=y
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_AHCI_IMX=y
-CONFIG_PATA_IMX=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_MICREL_PHY=y
-CONFIG_PPP=m
-CONFIG_USB_USBNET=y
-CONFIG_RT2X00=m
-CONFIG_RT2800USB=m
-CONFIG_RTL8192CU=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_INPUT_POLLDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_IMX=y
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_FUSION_F0710A=m
-CONFIG_TOUCHSCREEN_STMPE=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_FSL_LPUART=y
-CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_MUX_GPIO=y
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_GPIO=y
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_SPI_SPIDEV=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_SENSORS_MAG3110=y
-CONFIG_THERMAL=y
-CONFIG_CPU_THERMAL=y
-CONFIG_IMX_THERMAL=y
-CONFIG_DEVICE_THERMAL=y
-CONFIG_WATCHDOG=y
-CONFIG_IMX2_WDT=y
-CONFIG_MFD_STMPE=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_ANATOP=y
-CONFIG_REGULATOR_PFUZE100=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_MXC_OUTPUT=y
-CONFIG_VIDEO_MXC_CAPTURE=m
-CONFIG_MXC_CAMERA_OV5640=m
-CONFIG_MXC_CAMERA_OV5642=m
-CONFIG_MXC_CAMERA_OV5640_MIPI=m
-CONFIG_MXC_TVIN_ADV7280=m
-CONFIG_MXC_TVIN_ADV7180=m
-CONFIG_MXC_TVIN_MAX9526=m
-CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
-CONFIG_VIDEO_MXC_IPU_OUTPUT=y
-CONFIG_VIDEO_MXC_PXP_V4L2=y
-CONFIG_VIDEO_MXC_CSI_CAMERA=m
-CONFIG_MXC_VADC=m
-CONFIG_SOC_CAMERA=y
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-# CONFIG_DVB_AU8522_V4L is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
-CONFIG_DRM=y
-CONFIG_DRM_VIVANTE=y
-CONFIG_FB=y
-CONFIG_FB_MXS=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_L4F00242T03=y
-CONFIG_LCD_PLATFORM=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_FB_MXC_SYNC_PANEL=y
-CONFIG_FB_MXC_LDB=y
-CONFIG_FB_MXC_MIPI_DSI=y
-CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
-CONFIG_FB_MXC_HDMI=y
-CONFIG_FB_MXC_EINK_PANEL=y
-CONFIG_FB_MXS_SII902X=y
-CONFIG_HANNSTAR_CABC=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_LOGO=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_SOC=y
-CONFIG_SND_IMX_SOC=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
-CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_SND_SOC_IMX_HDMI=y
-CONFIG_HIDRAW=y
-CONFIG_HID_MULTITOUCH=m
-CONFIG_USB_HIDDEV=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_ACM=m
-CONFIG_USB_WDM=m
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_CONSOLE=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_FTDI_SIO=y
-CONFIG_USB_SERIAL_PL2303=y
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_MXS_PHY=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_MMC=y
-CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_MXC_IPU=y
-CONFIG_MXC_GPU_VIV=y
-CONFIG_MXC_MIPI_CSI2=y
-CONFIG_MXC_MLB150=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_DS1307=y
-CONFIG_RTC_DRV_SNVS=y
-CONFIG_DMADEVICES=y
-# CONFIG_MX3_IPU is not set
-CONFIG_MXC_PXP_V2=y
-CONFIG_IMX_SDMA=y
-CONFIG_STAGING=y
-CONFIG_STMPE_ADC=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_EXTCON=y
-CONFIG_EXTCON_USB_GPIO=y
-CONFIG_IIO=y
-CONFIG_PWM=y
-CONFIG_PWM_IMX=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=y
-CONFIG_CUSE=y
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_CIFS=y
-CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_UTF8=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_FS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_SECURITYFS=y
-CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=y
-CONFIG_CRYPTO_RMD160=y
-CONFIG_CRYPTO_RMD256=y
-CONFIG_CRYPTO_RMD320=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
diff --git a/recipes-kernel/linux/linux-toradex-4.1.15/defconfig b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/defconfig
similarity index 77%
rename from recipes-kernel/linux/linux-toradex-4.1.15/defconfig
rename to recipes-kernel/linux/linux-toradex-4.1-2.0.x/defconfig
index bf30dc4..4afdbfa 100644
--- a/recipes-kernel/linux/linux-toradex-4.1.15/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/defconfig
@@ -18,9 +18,6 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_NAMESPACES=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
@@ -32,15 +29,21 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_MXC=y
+CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX7D=y
-# CONFIG_ARM_ERRATA_643719 is not set
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_IMX6=y
+CONFIG_PCI_FORCE_GEN1=y
 CONFIG_SMP=y
-# CONFIG_ARM_CPU_TOPOLOGY is not set
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
+CONFIG_HIGHMEM=y
 CONFIG_CMA=y
+CONFIG_UACCESS_WITH_MEMCPY=y
+CONFIG_SECCOMP=y
 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
@@ -49,16 +52,20 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_ARM_IMX6Q_CPUFREQ=y
 CONFIG_ARM_IMX7D_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_KERNEL_MODE_NEON=y
-CONFIG_BINFMT_MISC=y
+CONFIG_BINFMT_MISC=m
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TEST_SUSPEND=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_PNP=y
@@ -69,6 +76,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
+CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=y
 CONFIG_NF_CONNTRACK=y
@@ -94,24 +102,40 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_VLAN_8021Q=y
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_CAN=m
+CONFIG_CAN_VCAN=m
 CONFIG_CAN_FLEXCAN=m
 CONFIG_CAN_MCP251X=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_LL=y
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=256
+CONFIG_CMA_SIZE_MBYTES=320
 CONFIG_CMA_SIZE_PERCENTAGE=50
 CONFIG_CMA_SIZE_SEL_MIN=y
 CONFIG_IMX_WEIM=y
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
 CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
 CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
@@ -119,15 +143,24 @@ CONFIG_MTD_NAND_MXC=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=y
-CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 # CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_IMX=y
+CONFIG_PATA_IMX=y
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_CIRRUS is not set
@@ -136,6 +169,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_INTEL is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
@@ -166,14 +200,18 @@ CONFIG_RTL8192CU=m
 CONFIG_INPUT_POLLDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_IMX=y
 # CONFIG_MOUSE_PS2 is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_AD7879=y
 CONFIG_TOUCHSCREEN_AD7879_I2C=y
-# CONFIG_SERIO is not set
+CONFIG_TOUCHSCREEN_FUSION_F0710A=m
+CONFIG_TOUCHSCREEN_STMPE=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_IMX=y
@@ -181,7 +219,12 @@ CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_FSL_OTP=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_GPIO=y
 # CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+CONFIG_I2C_GPIO=y
 CONFIG_I2C_IMX=y
 CONFIG_SPI=y
 CONFIG_SPI_GPIO=y
@@ -189,9 +232,7 @@ CONFIG_SPI_IMX=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-# CONFIG_MXC_MMA8451 is not set
+CONFIG_SENSORS_MAG3110=y
 CONFIG_THERMAL=y
 CONFIG_CPU_THERMAL=y
 CONFIG_IMX_THERMAL=y
@@ -200,45 +241,76 @@ CONFIG_WATCHDOG=y
 CONFIG_RN5T618_WATCHDOG=y
 CONFIG_IMX2_WDT=y
 CONFIG_MFD_RN5T618=y
+CONFIG_MFD_STMPE=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_PFUZE100=y
 CONFIG_REGULATOR_RN5T618=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
-# CONFIG_USB_GSPCA is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_MXC_OUTPUT=y
+CONFIG_VIDEO_MXC_CAPTURE=m
+CONFIG_MXC_CAMERA_OV5640=m
+CONFIG_MXC_CAMERA_OV5642=m
+CONFIG_MXC_CAMERA_OV5640_MIPI=m
+CONFIG_MXC_TVIN_ADV7180=m
+CONFIG_MXC_TVIN_ADV7280=m
+CONFIG_MXC_TVIN_MAX9526=m
+CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
+CONFIG_VIDEO_MXC_IPU_OUTPUT=y
 CONFIG_VIDEO_MXC_PXP_V4L2=y
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_VADC=m
 CONFIG_SOC_CAMERA=y
 CONFIG_VIDEO_MX3=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CODA=y
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_SOC_CAMERA_OV2640=y
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+CONFIG_DRM=y
+CONFIG_DRM_VIVANTE=y
 CONFIG_FB=y
 # CONFIG_FB_MX3 is not set
 CONFIG_FB_MXS=y
-# CONFIG_FB_MXC_EDID is not set
+CONFIG_FB_MXC_SYNC_PANEL=y
+CONFIG_FB_MXC_MIPI_DSI=y
+CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
+CONFIG_FB_MXC_LDB=y
+CONFIG_FB_MXC_HDMI=y
+CONFIG_FB_MXS_SII902X=y
+CONFIG_HANNSTAR_CABC=y
+CONFIG_FB_MXC_EINK_PANEL=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_L4F00242T03=y
+CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_FSL_ASRC=y
 CONFIG_SND_SOC_FSL_SAI=y
-CONFIG_SND_SOC_FSL_SPDIF=y
 CONFIG_SND_SOC_FSL_ESAI=y
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_SPDIF=y
+CONFIG_SND_SOC_IMX_HDMI=y
 CONFIG_SND_SOC_CS42XX8_I2C=y
 CONFIG_HIDRAW=y
 CONFIG_HID_MULTITOUCH=m
@@ -284,7 +356,10 @@ CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_MXC_IPU=y
+CONFIG_MXC_GPU_VIV=y
 CONFIG_MXC_SIM=y
+CONFIG_MXC_MIPI_CSI2=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
@@ -296,6 +371,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_SNVS=y
 CONFIG_DMADEVICES=y
@@ -303,7 +379,11 @@ CONFIG_MXC_PXP_V2=y
 CONFIG_MXC_PXP_V3=y
 CONFIG_IMX_SDMA=y
 CONFIG_MXS_DMA=y
+CONFIG_STAGING=y
+CONFIG_STMPE_ADC=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXTCON=y
+CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
 CONFIG_IMX7D_ADC=y
 CONFIG_VF610_ADC=y
@@ -319,12 +399,18 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=y
 CONFIG_OVERLAY_FS=y
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=y
 CONFIG_NTFS_FS=y
 CONFIG_NTFS_RW=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_UBIFS_FS=y
+CONFIG_SQUASHFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
@@ -336,6 +422,7 @@ CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_UTF8=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_FS=y
@@ -344,7 +431,6 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_FTRACE is not set
 CONFIG_CORESIGHT=y
 CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
@@ -359,6 +445,7 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
 CONFIG_CRYPTO_RMD128=y
@@ -376,9 +463,11 @@ CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_DEV_FSL_CAAM=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
diff --git a/recipes-kernel/linux/linux-toradex_3.14.52.bb b/recipes-kernel/linux/linux-toradex_3.14.52.bb
deleted file mode 100644
index b43ace6..0000000
--- a/recipes-kernel/linux/linux-toradex_3.14.52.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require recipes-kernel/linux/linux-imx.inc
-require recipes-kernel/linux/linux-dtb.inc
-
-SUMMARY = "Linux kernel for Toradex Freescale i.MX based modules"
-
-SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH} \
-           file://defconfig"
-
-LOCALVERSION = "-v2.6b2.1"
-SRCBRANCH = "toradex_imx_3.14.52_1.1.0_ga"
-SRCREV = "9f2723e14bab4fb558b4a4eb3e941876e2c55e2a"
-DEPENDS += "lzop-native bc-native"
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-kernel/linux/linux-toradex_4.1.15.bb b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb
similarity index 75%
rename from recipes-kernel/linux/linux-toradex_4.1.15.bb
rename to recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb
index 83b7456..42934e1 100644
--- a/recipes-kernel/linux/linux-toradex_4.1.15.bb
+++ b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb
@@ -9,9 +9,11 @@ SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRAN
 # Load USB functions configurable through configfs (CONFIG_USB_CONFIGFS)
 KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
 
-LOCALVERSION = "-v2.6b2.1"
-SRCBRANCH = "toradex_imx_4.1.15_1.0.0_ga"
-SRCREV = "eb479e52f9c6d32164ae76606fd7ce372f2aa153"
+LOCALVERSION = "-${PR}"
+PR = "2.7.3"
+
+SRCBRANCH = "toradex_4.1-2.0.x-imx"
+SRCREV = "3f68dc7c600c0354f5df7f06b931661319addafb"
 
 DEPENDS += "lzop-native bc-native"
-COMPATIBLE_MACHINE = "(mx7)"
+COMPATIBLE_MACHINE = "(mx6|mx7)"
-- 
2.9.4

[3rdparty][PATCH 03/15] u-boot-toradex: update to 2016.11

[Max Krummenacher]

For the i.MX6 based modules move to boot with SPL to setup the DDR RAM.

Add specific Toradex machine names to allow for 'use-mainline-bsp'
builds. (In which case the e.g. mx6 override is dropped)

License: changed by the following upstream commits, all of which do not
affect our configurations.
  0f4d2f8e79 License: Add the Open Font License
    (ttf fonts)
  40a39e875c SPDX: add X11 SPDX-License-Identifier
    (preparation for dual licensed device trees)
  4dcd9a65d4 Licenses: fix a typo in README

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-bsp/u-boot/u-boot-toradex.inc        | 11 +++--------
 recipes-bsp/u-boot/u-boot-toradex_2015.04.bb |  7 -------
 recipes-bsp/u-boot/u-boot-toradex_2016.11.bb |  9 +++++++++
 3 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-toradex_2016.11.bb

diff --git a/recipes-bsp/u-boot/u-boot-toradex.inc b/recipes-bsp/u-boot/u-boot-toradex.inc
index 57ae547..9d3261f 100644
--- a/recipes-bsp/u-boot/u-boot-toradex.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex.inc
@@ -8,7 +8,9 @@ inherit fsl-u-boot-localversion
 
 SUMMARY = "U-Boot bootloader with support for Toradex Computer on Modules"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+
+DEPENDS += "dtc-native"
 
 PROVIDES += "u-boot"
 
@@ -16,11 +18,4 @@ SRC_URI = "git://git.toradex.com/u-boot-toradex.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
-# FIXME: Allow linking of 'tools' binaries with native libraries
-#        used for generating the boot logo and other tools used
-#        during the build process.
-EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
-                 HOSTLDFLAGS="${BUILD_LDFLAGS}" \
-                 HOSTSTRIP=true'
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
deleted file mode 100644
index a70173a..0000000
--- a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include u-boot-toradex.inc
-
-PV = "v2015.04-v2.6b2.1+git${SRCPV}"
-
-SRCREV = "90a974d34aaa85d5ce69f83067928592c5389990"
-SRCBRANCH = "2015.04-toradex"
-COMPATIBLE_MACHINE = "(mx6|mx7|vf)"
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb
new file mode 100644
index 0000000..5f65c3c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb
@@ -0,0 +1,9 @@
+require recipes-bsp/u-boot/u-boot-toradex.inc
+
+PV = "2016.11"
+PR = "2.7.3_gitr${@d.getVar("SRCREV", False)[0:7]}"
+LOCALVERSION = "-2.7.3"
+
+SRCREV = "f0e414972b5b225e33ebe75574562266116746f9"
+SRCBRANCH = "2016.11-toradex"
+COMPATIBLE_MACHINE = "(mx6|mx7|vf|apalis-imx*|colibri-imx*|colibri-vf*)"
-- 
2.9.4

[3rdparty][PATCH 04/15] apalis-imx6.conf: build a spl based u-boot

[Max Krummenacher]

U-Boot is now used with SPL, set the machine conf file accordingly.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/apalis-imx6.conf | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 8992047..f5bcf38 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -16,14 +16,13 @@ KERNEL_IMAGETYPE = "uImage"
 
 PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
-# Modules in commercial and industrial temperature range have different RAM.
-# Using apalis_imx6_it_defconfig builds an U-Boot working for both temperature
-# ranges, however, on commercially rated modules the RAM bandwidth is 5-10%
-# higher when using the optimized settings from apalis_imx6_defconfig.
-# The following builds both binaries, but uses the IT one in an SD image.
-UBOOT_CONFIG ??= "it"
-UBOOT_CONFIG[com] = "apalis_imx6_defconfig"
-UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig"
+SPL_BINARY = "SPL"
+# The SPL configures the DDR RAM depending on the module it runs on. Thus there
+# is no need to distingush between the different module types.
+UBOOT_CONFIG ??= "spl"
+UBOOT_CONFIG[spl] = "apalis_imx6_defconfig,,u-boot.img"
+UBOOT_MAKE_TARGET = ""
+UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
 
 IMAGE_FSTYPES = "sdcard.gz tar.xz"
 
-- 
2.9.4

[3rdparty][PATCH 05/15] apalis-imx6.conf: do not deploy the kernel in the rootfs

[Max Krummenacher]

The kernel is taken from a separate fat partition in the regular
boot process, so there is no need to deploy it in the rootfs.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/apalis-imx6.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index f5bcf38..3e960d9 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -13,6 +13,8 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
 KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis_v1_0-eval.dtb \
                      imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb"
 KERNEL_IMAGETYPE = "uImage"
+# The kernel lives in a seperate FAT partition, don't deploy it in /boot/
+RDEPENDS_kernel-base = ""
 
 PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
-- 
2.9.4

[3rdparty][PATCH 06/15] apalis-imx6.conf: add device trees for ixora and use-mainline-bsp

[Max Krummenacher]

Add a device tree for the Ixora carrier board.

Add the device tree available in mainline for use with the
use-mainline-bsp override.

While at it unify the @SOC description variable with other boards.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/apalis-imx6.conf | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 3e960d9..58ee86b 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: Toradex Apalis iMX6Q/D
-#@SOC: i.MX6
+#@SOC: i.MX6Q
 #@DESCRIPTION: Machine configuration for Toradex Apalis iMX6 SOM
 #@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com>
 
@@ -9,9 +9,12 @@ MACHINEOVERRIDES =. "mx6:mx6q:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis_v1_0-eval.dtb \
-                     imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb"
+                     imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb \
+                     imx6q-apalis-ixora-v1.1.dtb"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6q-apalis-ixora.dtb"
 KERNEL_IMAGETYPE = "uImage"
 # The kernel lives in a seperate FAT partition, don't deploy it in /boot/
 RDEPENDS_kernel-base = ""
-- 
2.9.4

[3rdparty][PATCH 07/15] apalis-imx6.conf: add an include file hook

[Max Krummenacher]

Add a hook to allow to append to the machine configuration from an optional
include file.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/apalis-imx6.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 58ee86b..7dde6e1 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -34,3 +34,6 @@ IMAGE_FSTYPES = "sdcard.gz tar.xz"
 SERIAL_CONSOLE ?= "115200 ttymxc0"
 
 MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci"
+
+# This file need not exist, it can be used in another layer to e.g. add to IMAGE_CLASSES or KERNEL_DEVICETREE
+include conf/machine/include/apalis-imx6.inc
-- 
2.9.4

[3rdparty][PATCH 08/15] colibri-imx6.conf: build a spl u-boot

[Max Krummenacher]

U-Boot is now used with SPL, set the machine conf file accordingly.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/colibri-imx6.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 4b02ff1..d7a7bea 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -15,7 +15,11 @@ KERNEL_IMAGETYPE = "uImage"
 
 PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
-UBOOT_MACHINE ?= "colibri_imx6_defconfig"
+SPL_BINARY = "SPL"
+UBOOT_CONFIG ??= "spl"
+UBOOT_CONFIG[spl] = "colibri_imx6_defconfig,,u-boot.img"
+UBOOT_MAKE_TARGET = ""
+UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
 
 IMAGE_FSTYPES = "sdcard.gz tar.xz"
 
-- 
2.9.4

[3rdparty][PATCH 09/15] colibri-imx6.conf: do not deploy the kernel in the rootfs

[Max Krummenacher]

The kernel is taken from a separate fat partition in the regular
boot process, so there is no need to deploy it in the rootfs.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/colibri-imx6.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index d7a7bea..940f4ff 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -12,6 +12,8 @@ include conf/machine/include/tune-cortexa9.inc
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
 KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb"
 KERNEL_IMAGETYPE = "uImage"
+# The kernel lives in a seperate FAT partition, don't deploy it in /boot/
+RDEPENDS_kernel-base = ""
 
 PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
-- 
2.9.4

[3rdparty][PATCH 10/15] colibri-imx6.conf: add device trees for aster and use-mainline-bsp

[Max Krummenacher]

Add a device tree for the Aster carrier board.

Add the device tree available in mainline for use with the
use-mainline-bsp override.

While at it unify the @SOC description variable with other boards.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/colibri-imx6.conf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 940f4ff..05ccfb1 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: Toradex Colibri iMX6DL/S
-#@SOC: i.MX6 DL/S
+#@SOC: i.MX6DL
 #@DESCRIPTION: Machine configuration for Toradex Colibri iMX6 SOM
 #@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com>
 
@@ -9,8 +9,10 @@ MACHINEOVERRIDES =. "mx6:mx6dl:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
-KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
+KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb imx6dl-colibri-aster.dtb"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6dl-colibri-eval-v3.dtb"
 KERNEL_IMAGETYPE = "uImage"
 # The kernel lives in a seperate FAT partition, don't deploy it in /boot/
 RDEPENDS_kernel-base = ""
-- 
2.9.4

[3rdparty][PATCH 11/15] colibri-imx6.conf: add an include file hook

[Max Krummenacher]

Add a hook to allow to append to the machine configuration from an optional
include file.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/colibri-imx6.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 05ccfb1..0d41fe0 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -30,3 +30,6 @@ IMAGE_FSTYPES = "sdcard.gz tar.xz"
 SERIAL_CONSOLE ?= "115200 ttymxc0"
 
 MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
+
+# This file need not exist, it can be used in another layer to e.g. add to IMAGE_CLASSES or KERNEL_DEVICETREE
+include conf/machine/include/colibri-imx6.inc
-- 
2.9.4

[3rdparty][PATCH 12/15] colibri-imx7.conf: add device tree for the aster carrier board

[Max Krummenacher]

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/colibri-imx7.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/colibri-imx7.conf b/conf/machine/colibri-imx7.conf
index 87812a2..ae0ae34 100644
--- a/conf/machine/colibri-imx7.conf
+++ b/conf/machine/colibri-imx7.conf
@@ -11,7 +11,7 @@ include conf/machine/include/tune-cortexa7.inc
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
 KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE += "imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb"
+KERNEL_DEVICETREE += "imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb imx7d-colibri-aster.dtb imx7s-colibri-aster.dtb"
 
 # U-Boot of our newer release read the Kernel and device tree from static UBI
 # volumes, hence no need to deploy the kernel binary in the image itself
-- 
2.9.4

[3rdparty][PATCH 13/15] colibri-imx7.conf: add an include file hook

[Max Krummenacher]

Add a hook to allow to append to the machine configuration from an
optional include file.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/colibri-imx7.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/machine/colibri-imx7.conf b/conf/machine/colibri-imx7.conf
index ae0ae34..eccac03 100644
--- a/conf/machine/colibri-imx7.conf
+++ b/conf/machine/colibri-imx7.conf
@@ -35,3 +35,6 @@ UBI_VOLNAME = "rootfs"
 SERIAL_CONSOLE = "115200 ttymxc0"
 
 MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
+
+# This file need not exist, it can be used in another layer to e.g. add to IMAGE_CLASSES or KERNEL_DEVICETREE
+include conf/machine/include/colibri-imx7.inc
-- 
2.9.4

[3rdparty][PATCH 14/15] colibri-vf.conf: add a device tree for the aster carrier board

[Max Krummenacher]

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/colibri-vf.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 3ddef79..f6b29b6 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -11,7 +11,7 @@ include conf/machine/include/tune-cortexa5.inc
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
 KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE += "vf500-colibri-eval-v3.dtb vf610-colibri-eval-v3.dtb"
+KERNEL_DEVICETREE += "vf500-colibri-eval-v3.dtb vf610-colibri-eval-v3.dtb vf500-colibri-aster.dtb vf610-colibri-aster.dtb"
 
 # U-Boot of our newer release read the Kernel and device tree from static UBI volumes,
 # hence no need to deploy the kernel binary in the image itself
-- 
2.9.4

[3rdparty][PATCH 15/15] colibri-vf.conf: add an include file hook

[Max Krummenacher]

Add a hook to allow to append to the machine configuration from an
optional include file.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/colibri-vf.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index f6b29b6..b7b220c 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -38,3 +38,6 @@ UBI_VOLNAME = "rootfs"
 SERIAL_CONSOLE ?= "115200 ttyLP0"
 
 MACHINE_FEATURES += "usbgadget usbhost vfat alsa touchscreen"
+
+# This file need not exist, it can be used in another layer to e.g. add to IMAGE_CLASSES or KERNEL_DEVICETREE
+include conf/machine/include/colibri-vf.inc
-- 
2.9.4

Re: [3rdparty][PATCH 03/15] u-boot-toradex: update to 2016.11

[Otavio Salvador]

On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
> For the i.MX6 based modules move to boot with SPL to setup the DDR RAM.
>
> Add specific Toradex machine names to allow for 'use-mainline-bsp'
> builds. (In which case the e.g. mx6 override is dropped)
>
> License: changed by the following upstream commits, all of which do not
> affect our configurations.
>   0f4d2f8e79 License: Add the Open Font License
>     (ttf fonts)
>   40a39e875c SPDX: add X11 SPDX-License-Identifier
>     (preparation for dual licensed device trees)
>   4dcd9a65d4 Licenses: fix a typo in README
>
> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> ---
>  recipes-bsp/u-boot/u-boot-toradex.inc        | 11 +++--------
>  recipes-bsp/u-boot/u-boot-toradex_2015.04.bb |  7 -------
>  recipes-bsp/u-boot/u-boot-toradex_2016.11.bb |  9 +++++++++
>  3 files changed, 12 insertions(+), 15 deletions(-)
>  delete mode 100644 recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
>  create mode 100644 recipes-bsp/u-boot/u-boot-toradex_2016.11.bb
>
> diff --git a/recipes-bsp/u-boot/u-boot-toradex.inc b/recipes-bsp/u-boot/u-boot-toradex.inc
> index 57ae547..9d3261f 100644
> --- a/recipes-bsp/u-boot/u-boot-toradex.inc
> +++ b/recipes-bsp/u-boot/u-boot-toradex.inc
> @@ -8,7 +8,9 @@ inherit fsl-u-boot-localversion
>
>  SUMMARY = "U-Boot bootloader with support for Toradex Computer on Modules"
>  LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
> +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
> +
> +DEPENDS += "dtc-native"
>
>  PROVIDES += "u-boot"
>
> @@ -16,11 +18,4 @@ SRC_URI = "git://git.toradex.com/u-boot-toradex.git;branch=${SRCBRANCH}"
>
>  S = "${WORKDIR}/git"
>
> -# FIXME: Allow linking of 'tools' binaries with native libraries
> -#        used for generating the boot logo and other tools used
> -#        during the build process.
> -EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
> -                 HOSTLDFLAGS="${BUILD_LDFLAGS}" \
> -                 HOSTSTRIP=true'
> -
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
> diff --git a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
> deleted file mode 100644
> index a70173a..0000000
> --- a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -include u-boot-toradex.inc
> -
> -PV = "v2015.04-v2.6b2.1+git${SRCPV}"
> -
> -SRCREV = "90a974d34aaa85d5ce69f83067928592c5389990"
> -SRCBRANCH = "2015.04-toradex"
> -COMPATIBLE_MACHINE = "(mx6|mx7|vf)"
> diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb
> new file mode 100644
> index 0000000..5f65c3c
> --- /dev/null
> +++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb
> @@ -0,0 +1,9 @@
> +require recipes-bsp/u-boot/u-boot-toradex.inc
> +
> +PV = "2016.11"
> +PR = "2.7.3_gitr${@d.getVar("SRCREV", False)[0:7]}"

Use ...git${SRCPV}; SRCREV alone is not sortable.

> +LOCALVERSION = "-2.7.3"
> +
> +SRCREV = "f0e414972b5b225e33ebe75574562266116746f9"
> +SRCBRANCH = "2016.11-toradex"
> +COMPATIBLE_MACHINE = "(mx6|mx7|vf|apalis-imx*|colibri-imx*|colibri-vf*)"
> --
> 2.9.4
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [3rdparty][PATCH 07/15] apalis-imx6.conf: add an include file hook

[Otavio Salvador]

On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
> Add a hook to allow to append to the machine configuration from an optional
> include file.
>
> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

This is not a good practice. All those can be set on the DISTRO our
customer layer so please drop this patch for v2.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [3rdparty][PATCH 05/15] apalis-imx6.conf: do not deploy the kernel in the rootfs

[Otavio Salvador]

On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
> The kernel is taken from a separate fat partition in the regular
> boot process, so there is no need to deploy it in the rootfs.
>
> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

This is up to you but please consider the possibility of using the
kernel inside /boot and a single partition. This makes much easier to
use wic for disk images as you don't need to set IMAGE_BOOT_FILES for
the all device tree files and kernel.

I intend to retire the current sdcard generation class so wic should
be used from now on.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [3rdparty][PATCH 07/15] apalis-imx6.conf: add an include file hook

[Stefan Agner]

On 06.09.2017 12:26, Otavio Salvador wrote:
> On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
>> Add a hook to allow to append to the machine configuration from an optional
>> include file.
>>
>> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> This is not a good practice. All those can be set on the DISTRO our
> customer layer so please drop this patch for v2.
>

One reason we wanted to add this is because we have some Toradex specific variables which helps our Toradex Easy Installer (tezi) image format (we have a image_type_tezi.bbclass):
TORADEX_PRODUCT_IDS = "0032 0033"
TORADEX_PRODUCT_IDS[0032] = "imx7s-colibri-eval-v3.dtb"
TORADEX_PRODUCT_IDS[0033] = "imx7d-colibri-eval-v3.dtb"
TORADEX_FLASH_TYPE = "rawnand"

We could probably work around it by adding TORADEX_PRODUCT_IDS_$MACHINE variables in local.conf or distro.conf, but this seems the wrong place...

So if it is ok to add those variables upstream, we do not need that customization of machine config.

Another question is whether we should upstream that image_type_tezi.bbclass.. Although, I feel meta-freescale-3rdparty is the wrong place since we need it also for modules with non NXP SoCs.. I'd rather prefer to keep it in our meta-toradex-bsp-common layer.



On another page we also have customer which want to customize machine to some degree. And when you think about it, since it is a module, customers also physically alter machine capabilities...

Some customer end up just copy our machine (and maybe rename) it. But that leads to duplication, and when we alter things which are module specific, he has to merge...

There is SoC and machine abstraction, but module is somehow missing... Not sure how that would have to look if we would want to push it all the way to the end, maybe there should be only a apalis-imx6.inc, with a bunch of MODULE_FEATURES, and the customer has apalis-imx6-my-board.conf, which includes that module.


--
Stefan

Re: [3rdparty][PATCH 07/15] apalis-imx6.conf: add an include file hook

[Max Krummenacher]

Hi Otavio

Thanks for reviewing the patchset.

On Wed, 2017-09-06 at 16:26 -0300, Otavio Salvador wrote:
> On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
> > 
> > Add a hook to allow to append to the machine configuration from an optional
> > include file.
> > 
> > Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> 
> This is not a good practice. All those can be set on the DISTRO our
> customer layer so please drop this patch for v2.
> 

I really like this hook present. It helps a lot in our downstream BSP where
we combine the common features used for Nvidia Tegra and NXP based computer
modules.

We for instance build a non SPL U-Boot in addition usable for recovery mode.

Also as Stefan mentions combining a module with a different carrier board
often only requires a new device-tree file.

Both are really machine and not distro related, so they logically belong to
the machine configuration.

Max

Re: [3rdparty][PATCH 03/15] u-boot-toradex: update to 2016.11

[Max Krummenacher]

Hi Otavio

On Wed, 2017-09-06 at 16:23 -0300, Otavio Salvador wrote:
> On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
> > 
> > ...

> > +
> > +PV = "2016.11"
> > +PR = "2.7.3_gitr${@d.getVar("SRCREV", False)[0:7]}"
> 
> Use ...git${SRCPV}; SRCREV alone is not sortable.

Ok. I will rework that in v2.
This probably requires me to move the SRCPV to be part of PV. Otherwise
AUTOINC will not get replaced by a number in the buildprocess.

Max

Re: [3rdparty][PATCH 05/15] apalis-imx6.conf: do not deploy the kernel in the rootfs

[Max Krummenacher]

Hi Otavio

On Wed, 2017-09-06 at 16:30 -0300, Otavio Salvador wrote:
> On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
> > 
> > The kernel is taken from a separate fat partition in the regular
> > boot process, so there is no need to deploy it in the rootfs.
> > 
> > Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> 
> This is up to you but please consider the possibility of using the
> kernel inside /boot and a single partition. This makes much easier to
> use wic for disk images as you don't need to set IMAGE_BOOT_FILES for
> the all device tree files and kernel.
> 
> I intend to retire the current sdcard generation class so wic should
> be used from now on.
> 

We currently rarely use the sdcard image as we have to flash an on module
eMMC were we also currently use a separate FAT partition for kernel/dtb
and an ext4 partition for the rootfs.

Going away from that will take some decisions and then work to make all
the boot scripts for all module types again align. Maybe something for
the move to Rocko.

I have a look if I can move to wic with a two partition approach for v2,
probably I can again profit by the work done from Boundary Devices.

Max

Re: [3rdparty][PATCH 07/15] apalis-imx6.conf: add an include file hook

[Max Krummenacher]

[-- Attachment #1: Type: text/plain, Size: 1454 bytes --]

Hi Otavio


I found a way by which I can do what I need without having that include file.


Will drop the patch as proposed in v2.


Thanks

Max

________________________________
Von: Max Krummenacher
Gesendet: Donnerstag, 7. September 2017 19:50:37
An: otavio.salvador@ossystems.com.br
Cc: meta-freescale@yoctoproject.org; Marcel Ziswiler; Stefan Agner
Betreff: Re: [meta-freescale] [3rdparty][PATCH 07/15] apalis-imx6.conf: add an include file hook

Hi Otavio

Thanks for reviewing the patchset.

On Wed, 2017-09-06 at 16:26 -0300, Otavio Salvador wrote:
> On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
> >
> > Add a hook to allow to append to the machine configuration from an optional
> > include file.
> >
> > Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
>
> This is not a good practice. All those can be set on the DISTRO our
> customer layer so please drop this patch for v2.
>

I really like this hook present. It helps a lot in our downstream BSP where
we combine the common features used for Nvidia Tegra and NXP based computer
modules.

We for instance build a non SPL U-Boot in addition usable for recovery mode.

Also as Stefan mentions combining a module with a different carrier board
often only requires a new device-tree file.

Both are really machine and not distro related, so they logically belong to
the machine configuration.

Max

[-- Attachment #2: Type: text/html, Size: 2623 bytes --]

Re: [3rdparty][PATCH 03/15] u-boot-toradex: update to 2016.11

[Otavio Salvador]

On Thu, Sep 7, 2017 at 2:50 PM, Max Krummenacher
<max.krummenacher@toradex.com> wrote:
> Hi Otavio
>
> On Wed, 2017-09-06 at 16:23 -0300, Otavio Salvador wrote:
>> On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
>> >
>> > ...
>
>> > +
>> > +PV = "2016.11"
>> > +PR = "2.7.3_gitr${@d.getVar("SRCREV", False)[0:7]}"
>>
>> Use ...git${SRCPV}; SRCREV alone is not sortable.
>
> Ok. I will rework that in v2.
> This probably requires me to move the SRCPV to be part of PV. Otherwise
> AUTOINC will not get replaced by a number in the buildprocess.

I'd put Toradex's version on the LOCALVERSION variable and would not  touch PR.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [3rdparty][PATCH 05/15] apalis-imx6.conf: do not deploy the kernel in the rootfs

[Otavio Salvador]

On Thu, Sep 7, 2017 at 2:50 PM, Max Krummenacher
<max.krummenacher@toradex.com> wrote:
...
> I have a look if I can move to wic with a two partition approach for v2,
> probably I can again profit by the work done from Boundary Devices.

Yes you can. Easily.

Use IMAGE_BOOT_FILES to define what belongs to the boot partition.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [3rdparty][PATCH 03/15] u-boot-toradex: update to 2016.11

[Stefan Agner]

On 08.09.2017 05:15, Otavio Salvador wrote:
> On Thu, Sep 7, 2017 at 2:50 PM, Max Krummenacher
> <max.krummenacher@toradex.com> wrote:
>> Hi Otavio
>>
>> On Wed, 2017-09-06 at 16:23 -0300, Otavio Salvador wrote:
>>> On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
>>>> ...
>>>> +
>>>> +PV = "2016.11"
>>>> +PR = "2.7.3_gitr${@d.getVar("SRCREV", False)[0:7]}"
>>> Use ...git${SRCPV}; SRCREV alone is not sortable.
>> Ok. I will rework that in v2.
>> This probably requires me to move the SRCPV to be part of PV. Otherwise
>> AUTOINC will not get replaced by a number in the buildprocess.
> I'd put Toradex's version on the LOCALVERSION variable and would not  touch PR.
>
I also would prefer ~ or + to separate the git hash, this is more common in the distro world:
https://lists.debian.org/debian-mentors/2011/03/msg00326.html

--
Stefan

Re: [3rdparty][PATCH 03/15] u-boot-toradex: update to 2016.11

[Otavio Salvador]

On Mon, Sep 11, 2017 at 2:09 PM, Stefan Agner <stefan.agner@toradex.com> wrote:
>
> On 08.09.2017 05:15, Otavio Salvador wrote:
>> On Thu, Sep 7, 2017 at 2:50 PM, Max Krummenacher
>> <max.krummenacher@toradex.com> wrote:
>>> Hi Otavio
>>>
>>> On Wed, 2017-09-06 at 16:23 -0300, Otavio Salvador wrote:
>>>> On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
>>>>> ...
>>>>> +
>>>>> +PV = "2016.11"
>>>>> +PR = "2.7.3_gitr${@d.getVar("SRCREV", False)[0:7]}"
>>>> Use ...git${SRCPV}; SRCREV alone is not sortable.
>>> Ok. I will rework that in v2.
>>> This probably requires me to move the SRCPV to be part of PV. Otherwise
>>> AUTOINC will not get replaced by a number in the buildprocess.
>> I'd put Toradex's version on the LOCALVERSION variable and would not  touch PR.
>>
> I also would prefer ~ or + to separate the git hash, this is more common in the distro world:
> https://lists.debian.org/debian-mentors/2011/03/msg00326.html

Please use + so it does imply it adds on top of this version.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [3rdparty][PATCH 03/15] u-boot-toradex: update to 2016.11

[Max Krummenacher]

[-- Attachment #1: Type: text/plain, Size: 1840 bytes --]

Hi Otavio, Stefan

That is what I changed it to on Friday.

+LOCALVERSION = "-${PR}"
+PR = "2.7.3"
+PV_append = "+git${SRCPV}"

I still have to test the resulting images which incorporates the changes and have to check the LOCALVERSION proposal from Otavio.

Max


________________________________
Von: Otavio Salvador <otavio.salvador@ossystems.com.br>
Gesendet: Montag, 11. September 2017 19:12:06
An: Stefan Agner
Cc: Max Krummenacher; meta-freescale@yoctoproject.org; Marcel Ziswiler
Betreff: Re: [meta-freescale] [3rdparty][PATCH 03/15] u-boot-toradex: update to 2016.11

On Mon, Sep 11, 2017 at 2:09 PM, Stefan Agner <stefan.agner@toradex.com> wrote:
>
> On 08.09.2017 05:15, Otavio Salvador wrote:
>> On Thu, Sep 7, 2017 at 2:50 PM, Max Krummenacher
>> <max.krummenacher@toradex.com> wrote:
>>> Hi Otavio
>>>
>>> On Wed, 2017-09-06 at 16:23 -0300, Otavio Salvador wrote:
>>>> On Wed, Sep 6, 2017 at 11:12 AM, Max Krummenacher <max.oss.09@gmail.com> wrote:
>>>>> ...
>>>>> +
>>>>> +PV = "2016.11"
>>>>> +PR = "2.7.3_gitr${@d.getVar("SRCREV", False)[0:7]}"
>>>> Use ...git${SRCPV}; SRCREV alone is not sortable.
>>> Ok. I will rework that in v2.
>>> This probably requires me to move the SRCPV to be part of PV. Otherwise
>>> AUTOINC will not get replaced by a number in the buildprocess.
>> I'd put Toradex's version on the LOCALVERSION variable and would not  touch PR.
>>
> I also would prefer ~ or + to separate the git hash, this is more common in the distro world:
> https://lists.debian.org/debian-mentors/2011/03/msg00326.html

Please use + so it does imply it adds on top of this version.

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[-- Attachment #2: Type: text/html, Size: 3689 bytes --]