diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-20 17:15:01 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-20 17:15:40 +0200 |
| commit | b48e89730cec43df7f88077f85a7725a3ebbbdb5 (patch) | |
| tree | 46ae948dc7bed7d6f43911be4df0dc00dd7988e9 /meta-fsl-extras | |
| parent | 7b7b3408fe648cd084aed83aca247bb127b744af (diff) | |
| parent | 06511b44d0204bee0d68b0208ca893260cd2a7c7 (diff) | |
Merge remote-tracking branch 'origin/sumo' into thud
colibri-imx7-emmc related files moved to correct place
as done in preceding commit (7b7b3408fe648cd084aed83aca247bb127b744af)
* origin/sumo:
06511b4 meta-freescale, -3rdparty: update layers
13a835c meta-qt5: update layer
2c8fcd0 toradex: add support for colibri-imx7-emmc
364b118 location: remove obsolete patch
f133443 meta-tegra: update to latest revision in sumo branch
Conflicts:
scripts/manifest.xml
Change-Id: Ic2b7e5b114d7346f969ab1b0f8f7df5a06645015
Diffstat (limited to 'meta-fsl-extras')
3 files changed, 4 insertions, 0 deletions
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr new file mode 100644 index 00000000..8524cef8 --- /dev/null +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr @@ -0,0 +1,2 @@ +echo 'Legacy update is not supported for this module type' + diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr new file mode 100644 index 00000000..8524cef8 --- /dev/null +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr @@ -0,0 +1,2 @@ +echo 'Legacy update is not supported for this module type' + |