[meta-fsl-arm-extra][PATCH 1/2] imx7d-warp7: Rename to imx7s-warp

[meta-fsl-arm-extra][PATCH 1/2] imx7d-warp7: Rename to imx7s-warp

[Daiane Angolini]

Rename to imx7s-warp in order to align with the upstream kernel naming.

It also change the dts file used for the board, it's needed since:

https://github.com/Freescale/linux-fslc/commit/51bca3b53d536600334cb63a67da514e86068cd2

Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
---
 conf/machine/imx7d-warp7.conf | 19 -------------------
 conf/machine/imx7s-warp.conf  | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 conf/machine/imx7d-warp7.conf
 create mode 100644 conf/machine/imx7s-warp.conf

diff --git a/conf/machine/imx7d-warp7.conf b/conf/machine/imx7d-warp7.conf
deleted file mode 100644
index cd066ac..0000000
--- a/conf/machine/imx7d-warp7.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: WaRP7
-#@SOC: i.MX7S
-#@DESCRIPTION: Machine configuration for i.MX7S WaRP board.
-#@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com>
-
-require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa7.inc
-
-MACHINE_FEATURES += " wifi bluetooth"
-
-SOC_FAMILY = "mx7:mx7d"
-
-KERNEL_DEVICETREE = "imx7d-warp.dtb"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc-imx"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "warp7_config,sdcard"
diff --git a/conf/machine/imx7s-warp.conf b/conf/machine/imx7s-warp.conf
new file mode 100644
index 0000000..18a5954
--- /dev/null
+++ b/conf/machine/imx7s-warp.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@NAME: WaRP7
+#@SOC: i.MX7S
+#@DESCRIPTION: Machine configuration for i.MX7S WaRP board.
+#@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com>
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa7.inc
+
+MACHINE_FEATURES += " wifi bluetooth"
+
+SOC_FAMILY = "mx7:mx7d"
+
+KERNEL_DEVICETREE = "imx7s-warp.dtb"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc-imx"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "warp7_config,sdcard"
-- 
2.7.4

[meta-fsl-arm-extra][PATCH 2/2] imx7s-warp: Does not include u-boot on image

[Daiane Angolini]

It does not include u-boot binary on the image but builds it so user
can have the u-boot if an update is needed.

Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
---
 conf/machine/imx7s-warp.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/conf/machine/imx7s-warp.conf b/conf/machine/imx7s-warp.conf
index 18a5954..6b0b50e 100644
--- a/conf/machine/imx7s-warp.conf
+++ b/conf/machine/imx7s-warp.conf
@@ -7,6 +7,14 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa7.inc
 
+# WaRP uses eMMC boot partition by default and the u-boot inside .sdcard image
+# does not override it. However, build u-boot binary anyway in order to provide
+# a binary to be used if an update is needed.
+# See how-to override eMMC boot partition on the following link
+# http://git.denx.de/?p=u-boot.git;a=blob;f=board/warp7/README
+IMAGE_BOOTLOADER ?= ""
+EXTRA_IMAGEDEPENDS += "u-boot"
+
 MACHINE_FEATURES += " wifi bluetooth"
 
 SOC_FAMILY = "mx7:mx7d"
-- 
2.7.4

Re: [meta-fsl-arm-extra][PATCH 1/2] imx7d-warp7: Rename to imx7s-warp

[Fabio Estevam]

On Mon, Aug 8, 2016 at 2:30 PM, Daiane Angolini <daiane.angolini@nxp.com> wrote:
> Rename to imx7s-warp in order to align with the upstream kernel naming.
>
> It also change the dts file used for the board, it's needed since:
>
> https://github.com/Freescale/linux-fslc/commit/51bca3b53d536600334cb63a67da514e86068cd2
>
> Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
> ---
>  conf/machine/imx7d-warp7.conf | 19 -------------------
>  conf/machine/imx7s-warp.conf  | 19 +++++++++++++++++++
>  2 files changed, 19 insertions(+), 19 deletions(-)
>  delete mode 100644 conf/machine/imx7d-warp7.conf
>  create mode 100644 conf/machine/imx7s-warp.conf

For a rename patch like this it is better to use 'git mv' and git
format-patch -M.

Re: [meta-fsl-arm-extra][PATCH 1/2] imx7d-warp7: Rename to imx7s-warp

[Daiane Angolini]

On Mon, Aug 8, 2016 at 3:18 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Mon, Aug 8, 2016 at 2:30 PM, Daiane Angolini <daiane.angolini@nxp.com> wrote:
>> Rename to imx7s-warp in order to align with the upstream kernel naming.
>>
>> It also change the dts file used for the board, it's needed since:
>>
>> https://github.com/Freescale/linux-fslc/commit/51bca3b53d536600334cb63a67da514e86068cd2
>>
>> Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
>> ---
>>  conf/machine/imx7d-warp7.conf | 19 -------------------
>>  conf/machine/imx7s-warp.conf  | 19 +++++++++++++++++++
>>  2 files changed, 19 insertions(+), 19 deletions(-)
>>  delete mode 100644 conf/machine/imx7d-warp7.conf
>>  create mode 100644 conf/machine/imx7s-warp.conf
>
> For a rename patch like this it is better to use 'git mv' and git
> format-patch -M.

Thanks Fabio. I forgot the -M when I generated the patches, so I just sent v2

Daiane
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale