All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-fsl-arm][PATCH 1/2] wic: add kickstart files for i.mx
@ 2015-03-02 11:45 Alexandre Belloni
  2015-03-02 11:45 ` [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES Alexandre Belloni
  0 siblings, 1 reply; 7+ messages in thread
From: Alexandre Belloni @ 2015-03-02 11:45 UTC (permalink / raw)
  To: meta-freescale

Add kickstart files replacing the sdcard generation capabilities of
generate_imx_sdcard(). They keep the same partition layout.

For barebox: imx-barebox.wks
For u-boot only: imx-uboot.wks
For u-boot with SPL: imx-uboot-spl.wks

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 scripts/lib/image/canned-wks/imx-barebox.wks   | 18 ++++++++++++++++++
 scripts/lib/image/canned-wks/imx-uboot-spl.wks | 18 ++++++++++++++++++
 scripts/lib/image/canned-wks/imx-uboot.wks     | 17 +++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 scripts/lib/image/canned-wks/imx-barebox.wks
 create mode 100644 scripts/lib/image/canned-wks/imx-uboot-spl.wks
 create mode 100644 scripts/lib/image/canned-wks/imx-uboot.wks

diff --git a/scripts/lib/image/canned-wks/imx-barebox.wks b/scripts/lib/image/canned-wks/imx-barebox.wks
new file mode 100644
index 000000000000..77b5554806d8
--- /dev/null
+++ b/scripts/lib/image/canned-wks/imx-barebox.wks
@@ -0,0 +1,18 @@
+# short-description: Create SD card image with a boot partition
+# long-description:
+# Create an image that can be written onto a SD card using dd for use
+# with i.MX SoC family
+# It uses barebox
+#
+# The disk layout used is:
+#  - --------- ------------ --------- --------------
+# | | barebox | bareboxenv |  /boot  |    rootfs    |
+#  - --------- ------------ --------- --------------
+# ^ ^         ^            ^         ^              ^
+# | |         |            |         |              |
+# 0 512B      512kiB       4MiB   4MiB + 8MiB    4MiB + 8Mib + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#
+part barebox --source rawcopy --sourceparams="file=barebox.bin,skip=512" --ondisk mmcblk --no-table
+part bareboxenv --source rawcopy --sourceparams="file=bareboxenv.bin" --ondisk mmcblk --no-table --align 512
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
diff --git a/scripts/lib/image/canned-wks/imx-uboot-spl.wks b/scripts/lib/image/canned-wks/imx-uboot-spl.wks
new file mode 100644
index 000000000000..e2bdc1452c0a
--- /dev/null
+++ b/scripts/lib/image/canned-wks/imx-uboot-spl.wks
@@ -0,0 +1,18 @@
+# short-description: Create SD card image with a boot partition
+# long-description:
+# Create an image that can be written onto a SD card using dd for use
+# with i.MX SoC family.
+# It uses SPL and u-boot
+#
+# The disk layout used is:
+#  - ----- --------- --------- --------------
+# | | SPL | u-boot  |  /boot  |    rootfs    |
+#  - ----- --------- --------- --------------
+# ^ ^     ^         ^         ^              ^
+# | |     |         |         |              |
+# 0 1kiB  69kiB     4MiB   4MiB + 8MiB    4MiB + 8Mib + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#
+part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1
+part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 69
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
diff --git a/scripts/lib/image/canned-wks/imx-uboot.wks b/scripts/lib/image/canned-wks/imx-uboot.wks
new file mode 100644
index 000000000000..086521034edc
--- /dev/null
+++ b/scripts/lib/image/canned-wks/imx-uboot.wks
@@ -0,0 +1,17 @@
+# short-description: Create SD card image with a boot partition
+# long-description:
+# Create an image that can be written onto a SD card using dd for use
+# with i.MX SoC family
+# It uses u-boot
+#
+# The disk layout used is:
+#  - --------- --------- --------------
+# | | u-boot  |  /boot  |    rootfs    |
+#  - --------- --------- --------------
+# ^ ^         ^         ^              ^
+# | |         |         |              |
+# 0 1kiB    4MiB   4MiB + 8MiB    4MiB + 8Mib + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#
+part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 1
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
-- 
2.1.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES
  2015-03-02 11:45 [meta-fsl-arm][PATCH 1/2] wic: add kickstart files for i.mx Alexandre Belloni
@ 2015-03-02 11:45 ` Alexandre Belloni
  2015-03-02 12:35   ` Otavio Salvador
  0 siblings, 1 reply; 7+ messages in thread
From: Alexandre Belloni @ 2015-03-02 11:45 UTC (permalink / raw)
  To: meta-freescale

Define IMAGE_BOOT_FILES in the machine configuration to be able to
create sdcard images using wic.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 conf/machine/imx51evk.conf          |  1 +
 conf/machine/imx53ard.conf          |  1 +
 conf/machine/imx53qsb.conf          |  1 +
 conf/machine/imx6dlsabreauto.conf   |  6 ++++++
 conf/machine/imx6dlsabresd.conf     |  7 +++++++
 conf/machine/imx6qsabreauto.conf    |  6 ++++++
 conf/machine/imx6qsabresd.conf      |  5 +++++
 conf/machine/imx6slevk.conf         |  7 +++++++
 conf/machine/imx6solosabreauto.conf |  3 +++
 conf/machine/imx6solosabresd.conf   |  4 ++++
 conf/machine/imx6sxsabreauto.conf   |  4 ++++
 conf/machine/imx6sxsabresd.conf     | 10 ++++++++++
 conf/machine/twr-vf65gs10.conf      |  2 ++
 13 files changed, 57 insertions(+)

diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 9d7d06ca41fc..89bcacb932fb 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -13,5 +13,6 @@ SOC_FAMILY = "mx5:mx51"
 PERF_FEATURES_ENABLE = ""
 
 KERNEL_DEVICETREE = "imx51-babbage.dtb"
+IMAGE_BOOT_FILES = "zImage zImage-imx51-babbage.dtb;imx51-babbage.dtb"
 
 UBOOT_MACHINE = "mx51evk_config"
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index c338d6b5138b..db120a6b8e28 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -13,6 +13,7 @@ SOC_FAMILY = "mx5:mx53"
 PERF_FEATURES_ENABLE = ""
 
 KERNEL_DEVICETREE = "imx53-ard.dtb"
+IMAGE_BOOT_FILES = "uImage uImage-imx53-ard.dtb;imx53-ard.dtb"
 
 UBOOT_MACHINE = "mx53ard_config"
 KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 0e7349e82dfe..622f2ff910e4 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -13,6 +13,7 @@ SOC_FAMILY = "mx5:mx53"
 PERF_FEATURES_ENABLE = ""
 
 KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb"
+IMAGE_BOOT_FILES = "zImage zImage-imx53-qsb.dtb;imx53-qsb.dtb zImage-imx53-qsrb.dtb;imx53-qsrb.dtb"
 
 UBOOT_MACHINE = "mx53loco_config"
 
diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index 8c0fe8587d81..01a3942657dc 100644
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/conf/machine/imx6dlsabreauto.conf
@@ -11,6 +11,12 @@ SOC_FAMILY = "mx6:mx6dl"
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb "
 KERNEL_DEVICETREE += "imx6dl-sabreauto-flexcan1.dtb "
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto.dtb;imx6dl-sabreauto.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto-gpmi-weim.dtb;imx6dl-sabreauto-gpmi-weim.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto-ecspi.dtb;imx6dl-sabreauto-ecspi.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto-flexcan1.dtb;imx6dl-sabreauto-flexcan1.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard"
 UBOOT_CONFIG[eimnor] = "mx6dlsabreauto_eimnor_config"
diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index da3ee54b7a0d..be4488f90068 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -11,6 +11,13 @@ SOC_FAMILY = "mx6:mx6dl"
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
                      imx6dl-sabresd-pf200.dtb imx6dl-sabresd-enetirq.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd.dtb;imx6dl-sabresd.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-ldo.dtb;imx6dl-sabresd-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-hdcp.dtb;imx6dl-sabresd-hdcp.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-pf200.dtb;imx6dl-sabresd-pf200.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-enetirq.dtb;imx6dl-sabresd-enetirq.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"
 UBOOT_CONFIG[mfgtool] = "mx6dlsabresd_config"
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index b8fdce4b712f..fdce2f718d20 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/conf/machine/imx6qsabreauto.conf
@@ -11,6 +11,12 @@ SOC_FAMILY = "mx6:mx6q"
 KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb "
 KERNEL_DEVICETREE += "imx6q-sabreauto-flexcan1.dtb "
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabreauto.dtb;imx6q-sabreauto.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabreauto-gpmi-weim.dtb;imx6q-sabreauto-gpmi-weim.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabreauto-ecspi.dtb;imx6q-sabreauto-ecspi.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabreauto-flexcan1.dtb;imx6q-sabreauto-flexcan1.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"
 UBOOT_CONFIG[eimnor] = "mx6qsabreauto_eimnor_config"
diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index 72d1da5d7003..368962c7d80a 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/conf/machine/imx6qsabresd.conf
@@ -11,6 +11,11 @@ SOC_FAMILY = "mx6:mx6q"
 KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
                      imx6q-sabresd-enetirq.dtb imx6q-sabresd-uart.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabresd.dtb;imx6q-sabresd.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabresd-ldo.dtb;imx6q-sabresd-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabresd-hdcp.dtb;imx6q-sabresd-hdcp.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"
 UBOOT_CONFIG[sata] = "mx6qsabresd_sata_config"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 9ca57353c821..a085e0d121ab 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -12,6 +12,13 @@ SOC_FAMILY = "mx6:mx6sl"
 KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
                      imx6sl-evk-pf200.dtb imx6sl-evk-uart.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk.dtb;imx6sl-evk.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk-csi.dtb;imx6sl-evk-csi.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk-ldo.dtb;imx6sl-evk-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk-pf200.dtb;imx6sl-evk-pf200.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk-uart.dtb;imx6sl-evk-uart.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard"
 UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config"
diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
index ead787d00e51..80a7f9555453 100644
--- a/conf/machine/imx6solosabreauto.conf
+++ b/conf/machine/imx6solosabreauto.conf
@@ -9,6 +9,9 @@ SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto.dtb;imx6dl-sabreauto.dtb"
+
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
 KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
index b123d8ce4a7f..090464df94d7 100644
--- a/conf/machine/imx6solosabresd.conf
+++ b/conf/machine/imx6solosabresd.conf
@@ -10,6 +10,10 @@ SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd.dtb;imx6dl-sabresd.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-ldo.dtb;imx6dl-sabresd-ldo.dtb"
+
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
 KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index ec880dd0a619..3bca7dbd9430 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -10,6 +10,10 @@ SOC_FAMILY = "mx6:mx6sx"
 
 KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sabreauto.dtb;imx6sx-sabreauto.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sabreauto-m4.dtb;imx6sx-sabreauto-m4.dtb"
+
 UBOOT_ENTRYPOINT = "0x80008000"
 
 UBOOT_CONFIG ??= "sd"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 7c90de92e270..8584cf58199f 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -12,6 +12,16 @@ KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
                      imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \
                      imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb.dtb;imx6sx-sdb.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-emmc.dtb;imx6sx-sdb-emmc.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-m4.dtb;imx6sx-sdb-m4.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-sai.dtb;imx6sx-sdb-sai.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-lcdif1.dtb;imx6sx-sdb-lcdif1.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-ldo.dtb;imx6sx-sdb-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-reva-ldo.dtb;imx6sx-sdb-reva-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-reva.dtb;imx6sx-sdb-reva.dtb"
+
 UBOOT_ENTRYPOINT = "0x80008000"
 
 UBOOT_CONFIG ??= "sd"
diff --git a/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
index 1f19dcbd79d0..a1bb26102a28 100644
--- a/conf/machine/twr-vf65gs10.conf
+++ b/conf/machine/twr-vf65gs10.conf
@@ -11,6 +11,8 @@ SOC_FAMILY = "vf60"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-timesys"
 
+IMAGE_BOOT_FILES = "zImage"
+
 UBOOT_MACHINE = "vf610twr_config"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-- 
2.1.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES
  2015-03-02 11:45 ` [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES Alexandre Belloni
@ 2015-03-02 12:35   ` Otavio Salvador
  2015-03-02 13:04     ` Alexandre Belloni
  0 siblings, 1 reply; 7+ messages in thread
From: Otavio Salvador @ 2015-03-02 12:35 UTC (permalink / raw)
  To: Alexandre Belloni; +Cc: meta-freescale

On Mon, Mar 2, 2015 at 8:45 AM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> Define IMAGE_BOOT_FILES in the machine configuration to be able to
> create sdcard images using wic.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Thanks for looking at this; wic is indeed a very handy addition :-)

> diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
> index 9d7d06ca41fc..89bcacb932fb 100644
> --- a/conf/machine/imx51evk.conf
> +++ b/conf/machine/imx51evk.conf
> @@ -13,5 +13,6 @@ SOC_FAMILY = "mx5:mx51"
>  PERF_FEATURES_ENABLE = ""
>
>  KERNEL_DEVICETREE = "imx51-babbage.dtb"
> +IMAGE_BOOT_FILES = "zImage zImage-imx51-babbage.dtb;imx51-babbage.dtb"
>
>  UBOOT_MACHINE = "mx51evk_config"

To be honest, I don't like the idea of maintaining the list of
duplicated device tree files.

I am wondering if we can cook a generic solution whick uses
KERNEL_DEVICETREE as input and generates the list of artifacts it
needs to install. Leaving them disconnected is very error prone.

-- 
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


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES
  2015-03-02 12:35   ` Otavio Salvador
@ 2015-03-02 13:04     ` Alexandre Belloni
  2015-03-02 14:54       ` Otavio Salvador
  0 siblings, 1 reply; 7+ messages in thread
From: Alexandre Belloni @ 2015-03-02 13:04 UTC (permalink / raw)
  To: Otavio Salvador; +Cc: meta-freescale

On 02/03/2015 at 09:35:36 -0300, Otavio Salvador wrote :
> On Mon, Mar 2, 2015 at 8:45 AM, Alexandre Belloni
> <alexandre.belloni@free-electrons.com> wrote:
> > Define IMAGE_BOOT_FILES in the machine configuration to be able to
> > create sdcard images using wic.
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> 
> Thanks for looking at this; wic is indeed a very handy addition :-)
> 
> > diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
> > index 9d7d06ca41fc..89bcacb932fb 100644
> > --- a/conf/machine/imx51evk.conf
> > +++ b/conf/machine/imx51evk.conf
> > @@ -13,5 +13,6 @@ SOC_FAMILY = "mx5:mx51"
> >  PERF_FEATURES_ENABLE = ""
> >
> >  KERNEL_DEVICETREE = "imx51-babbage.dtb"
> > +IMAGE_BOOT_FILES = "zImage zImage-imx51-babbage.dtb;imx51-babbage.dtb"
> >
> >  UBOOT_MACHINE = "mx51evk_config"
> 
> To be honest, I don't like the idea of maintaining the list of
> duplicated device tree files.
> 
> I am wondering if we can cook a generic solution whick uses
> KERNEL_DEVICETREE as input and generates the list of artifacts it
> needs to install. Leaving them disconnected is very error prone.
> 

I agree but that is the current mechanism. Actually, I think we should
even have a better mechanism were it would be possible to select which
files are going to which partition. I didn't implement it yet.

There is one issue with generating the IMAGE_BOOT_FILES from
KERNEL_DEVICETREE. You can put non existing dtb filenames in
KERNEL_DEVICETREE and they will be ignored but not in IMAGE_BOOT_FILES.
That is the case for imx6qsabresd.conf.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES
  2015-03-02 13:04     ` Alexandre Belloni
@ 2015-03-02 14:54       ` Otavio Salvador
  2015-03-02 15:05         ` Alexandre Belloni
  0 siblings, 1 reply; 7+ messages in thread
From: Otavio Salvador @ 2015-03-02 14:54 UTC (permalink / raw)
  To: Alexandre Belloni; +Cc: meta-freescale

On Mon, Mar 2, 2015 at 10:04 AM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> On 02/03/2015 at 09:35:36 -0300, Otavio Salvador wrote :
>> On Mon, Mar 2, 2015 at 8:45 AM, Alexandre Belloni
>> <alexandre.belloni@free-electrons.com> wrote:
>> > Define IMAGE_BOOT_FILES in the machine configuration to be able to
>> > create sdcard images using wic.
>> >
>> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>>
>> Thanks for looking at this; wic is indeed a very handy addition :-)
>>
>> > diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
>> > index 9d7d06ca41fc..89bcacb932fb 100644
>> > --- a/conf/machine/imx51evk.conf
>> > +++ b/conf/machine/imx51evk.conf
>> > @@ -13,5 +13,6 @@ SOC_FAMILY = "mx5:mx51"
>> >  PERF_FEATURES_ENABLE = ""
>> >
>> >  KERNEL_DEVICETREE = "imx51-babbage.dtb"
>> > +IMAGE_BOOT_FILES = "zImage zImage-imx51-babbage.dtb;imx51-babbage.dtb"
>> >
>> >  UBOOT_MACHINE = "mx51evk_config"
>>
>> To be honest, I don't like the idea of maintaining the list of
>> duplicated device tree files.
>>
>> I am wondering if we can cook a generic solution whick uses
>> KERNEL_DEVICETREE as input and generates the list of artifacts it
>> needs to install. Leaving them disconnected is very error prone.
>>
>
> I agree but that is the current mechanism. Actually, I think we should
> even have a better mechanism were it would be possible to select which
> files are going to which partition. I didn't implement it yet.
>
> There is one issue with generating the IMAGE_BOOT_FILES from
> KERNEL_DEVICETREE. You can put non existing dtb filenames in
> KERNEL_DEVICETREE and they will be ignored but not in IMAGE_BOOT_FILES.
> That is the case for imx6qsabresd.conf.

No; they will fail to build in the kernel as this is passed on kernel
make command.

-- 
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


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES
  2015-03-02 14:54       ` Otavio Salvador
@ 2015-03-02 15:05         ` Alexandre Belloni
  2015-03-02 15:06           ` Otavio Salvador
  0 siblings, 1 reply; 7+ messages in thread
From: Alexandre Belloni @ 2015-03-02 15:05 UTC (permalink / raw)
  To: Otavio Salvador; +Cc: meta-freescale

On 02/03/2015 at 11:54:22 -0300, Otavio Salvador wrote :
> > I agree but that is the current mechanism. Actually, I think we should
> > even have a better mechanism were it would be possible to select which
> > files are going to which partition. I didn't implement it yet.
> >
> > There is one issue with generating the IMAGE_BOOT_FILES from
> > KERNEL_DEVICETREE. You can put non existing dtb filenames in
> > KERNEL_DEVICETREE and they will be ignored but not in IMAGE_BOOT_FILES.
> > That is the case for imx6qsabresd.conf.
> 
> No; they will fail to build in the kernel as this is passed on kernel
> make command.
> 

That's what I would have expected but not what I experienced. The kernel
built fine but I couldn't find the dtbs.


-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES
  2015-03-02 15:05         ` Alexandre Belloni
@ 2015-03-02 15:06           ` Otavio Salvador
  0 siblings, 0 replies; 7+ messages in thread
From: Otavio Salvador @ 2015-03-02 15:06 UTC (permalink / raw)
  To: Alexandre Belloni; +Cc: meta-freescale

On Mon, Mar 2, 2015 at 12:05 PM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> On 02/03/2015 at 11:54:22 -0300, Otavio Salvador wrote :
>> > I agree but that is the current mechanism. Actually, I think we should
>> > even have a better mechanism were it would be possible to select which
>> > files are going to which partition. I didn't implement it yet.
>> >
>> > There is one issue with generating the IMAGE_BOOT_FILES from
>> > KERNEL_DEVICETREE. You can put non existing dtb filenames in
>> > KERNEL_DEVICETREE and they will be ignored but not in IMAGE_BOOT_FILES.
>> > That is the case for imx6qsabresd.conf.
>>
>> No; they will fail to build in the kernel as this is passed on kernel
>> make command.
>>
>
> That's what I would have expected but not what I experienced. The kernel
> built fine but I couldn't find the dtbs.

This must have changed recently than.

-- 
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


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-03-02 15:06 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-02 11:45 [meta-fsl-arm][PATCH 1/2] wic: add kickstart files for i.mx Alexandre Belloni
2015-03-02 11:45 ` [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES Alexandre Belloni
2015-03-02 12:35   ` Otavio Salvador
2015-03-02 13:04     ` Alexandre Belloni
2015-03-02 14:54       ` Otavio Salvador
2015-03-02 15:05         ` Alexandre Belloni
2015-03-02 15:06           ` Otavio Salvador

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.