Skip to contentSkip to conversation

configs/imx7dpico: Bump Linux and U-Boot

PATCH New Joris Offouga 3 participants 11 messages Jun 9, 2019 – Jun 10, 2019 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 configs/imx7dpico: Bump Linux and U-Boot

This commit bumps Linux & Linux-headers to 5.1 and U-Boot to version 2019.01. With U-Boot version 2019.01, imx7dpico boot with distrobootcmd also introduce extlinux file also remove patch and change TARGET_UBOOT_BOARNAME for select correct defconfig in U-Boot.

---
 .../patches/uboot/0001-picomx7dname.patch     | 31 -------------------
 board/technexion/imx7dpico/readme.txt         |  3 +-
 .../boot/extlinux/extlinux.conf               |  4 +++
 configs/imx7dpico_defconfig                   | 19 ++++++------
 4 files changed, 16 insertions(+), 41 deletions(-)
 delete mode 100644 board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch
 create mode 100644 board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf
board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch deleted +0 -31
deleted file mode 100644
index 59408bcd7a..0000000000
@@ -1,31 +0,0 @@
-From 6d298b0fcacfc555f93864fa45fb612140902388 Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <[email protected]>
-Date: Tue, 5 Jun 2018 22:12:48 -0300
-Subject: [PATCH] pico-imx7d: Adjust the dtb name
-
-Since kernel commit 41bbeadceb03 ("ARM: dts: imx7d-pico-pi: Separate
-into cpu and baseboard dts") the dtb name has changed.
-
-Fix it accordingly.
-
-Signed-off-by: Fabio Estevam <[email protected]>
----
- include/configs/pico-imx7d.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
-index b208d7f..d2ffa70 100644
---- a/include/configs/pico-imx7d.h
-+++ b/include/configs/pico-imx7d.h
-@@ -41,7 +41,7 @@
- 	"console=ttymxc4\0" \
- 	"fdt_high=0xffffffff\0" \
- 	"initrd_high=0xffffffff\0" \
--	"fdt_file=imx7d-pico.dtb\0" \
-+	"fdt_file=imx7d-pico-pi.dtb\0" \
- 	"fdt_addr=0x83000000\0" \
- 	"ip_dyn=yes\0" \
- 	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
--- 
-2.7.4
-
board/technexion/imx7dpico/readme.txt +2 -1
index cda3f285eb..07e089c38e 100644
@@ -20,7 +20,8 @@ You will find in output/images/ the following files:
   - rootfs.ext4
   - rootfs.tar
   - sdcard.img
-  - u-boot.imx
+  - u-boot.img
+  - SPL
   - zImage
 
 Flash the eMMC
board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf new file +4 -0
new file mode 100644
index 0000000000..4824aff079
@@ -0,0 +1,4 @@
+Label imx7d-pico-buildroot
+  kernel /boot/zImage
+  devicetree /boot/imx7d-pico-pi.dtb
+  append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate}
\ No newline at end of file
configs/imx7dpico_defconfig +10 -9
index 93e3fd7414..cd12e282ef 100644
@@ -3,11 +3,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
-# patches
-BR2_GLOBAL_PATCH_DIR="board/technexion/imx7dpico/patches"
-
-# Linux headers same as kernel, a 4.17 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
+# Linux headers same as kernel, a 5.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
@@ -15,18 +12,21 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.6"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
 # bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="pico-imx7d"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
 
 # required tools to create the eMMC image
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
@@ -34,6 +34,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 
 # filesystem / image
+BR2_ROOTFS_OVERLAY="board/technexion/imx7dpico/rootfs_overlay"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/3 boards/freescale/common: Introduce template_no_boot_part

This includes the no_boot_part templates which use a /boot included in rootfs.

---
 .../imx/genimage.cfg.template_no_boot_part    | 23 +++++++++++++++
 .../genimage.cfg.template_no_boot_part_spl    | 29 +++++++++++++++++++
 board/freescale/common/imx/post-image.sh      |  6 ++++
 3 files changed, 58 insertions(+)
 create mode 100644 board/freescale/common/imx/genimage.cfg.template_no_boot_part
 create mode 100644 board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +23 -0
new file mode 100644
index 0000000000..9e19b4ee3e
@@ -0,0 +1,23 @@
+# Minimal SD card image for the Freescale boards Template
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,
+# * U-Boot is dumped as is,
+# * a single root filesystem partition is required (ext2, ext3 or ext4)
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition u-boot {
+    in-partition-table = "no"
+    image = "%UBOOTBIN%"
+    offset = 1024
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
+}
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +29 -0
new file mode 100644
index 0000000000..6d3ae183e3
@@ -0,0 +1,29 @@
+# Minimal SD card image for the Freescale boards Template for SPL Boot
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,
+# * U-Boot is dumped as is,
+# * a single root filesystem partition is required (ext2, ext3 or ext4)
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition spl {
+    in-partition-table = "no"
+    image = "SPL"
+    offset = 1024
+  }
+
+  partition u-boot-img {
+    in-partition-table = "no"
+    image = "u-boot.img"
+    offset = 69K
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
+}
board/freescale/common/imx/post-image.sh +6 -0
index 12a5bea73b..851ce97c57 100755
@@ -36,6 +36,12 @@ genimage_type()
 		echo "genimage.cfg.template_imx8"
 	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
+	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then
+		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
+		    echo "genimage.cfg.template_no_boot_part_spl"
+		else
+		    echo "genimage.cfg.template_no_boot_part"
+		fi
 	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_spl"
 	else
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/3 boards/freescale/common: Introduce template_no_boot_part

Okay, this explains a lot... I should have read this patch before looking at
the previous one.

So basically, patch 1 and 2 should be swapped.

Note that I like this very much, I think it's silly that most of our defconfigs
still use a FAT partition.

Quoted 19 lines · Joris Offouga

This includes the no_boot_part templates which use a /boot included in rootfs.

---
 .../imx/genimage.cfg.template_no_boot_part    | 23 +++++++++++++++
 .../genimage.cfg.template_no_boot_part_spl    | 29 +++++++++++++++++++
 board/freescale/common/imx/post-image.sh      |  6 ++++
 3 files changed, 58 insertions(+)
 create mode 100644 board/freescale/common/imx/genimage.cfg.template_no_boot_part
 create mode 100644 board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +0 -0
new file mode 100644
index 0000000000..9e19b4ee3e

board/freescale/common/imx/genimage.cfg.template_no_boot_part line 4

Quoted 4 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +4 -0
@@ -0,0 +1,23 @@
+# Minimal SD card image for the Freescale boards Template
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,

Is this one going to be used by anything in practice? I expect that anything
that uses this kind of layout is *not* going to use the .imx format, since that's considered kind of deprecated...

So my suggestion would be to remove it (also from the post-image script).

Quoted 25 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +19 -0
+# * U-Boot is dumped as is,
+# * a single root filesystem partition is required (ext2, ext3 or ext4)
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition u-boot {
+    in-partition-table = "no"
+    image = "%UBOOTBIN%"
+    offset = 1024
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
+}
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +0 -0
new file mode 100644
index 0000000000..6d3ae183e3

board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl line 5

Quoted 5 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +5 -0
@@ -0,0 +1,29 @@
+# Minimal SD card image for the Freescale boards Template for SPL Boot
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,
+# * U-Boot is dumped as is,

Mention SPL here. And mention that SPL is at the offset expected by ROM, while
U-Boot is at the offset expected by SPL.

board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl line 6

Quoted 1 line
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +1 -0
+# * a single root filesystem partition is required (ext2, ext3 or ext4)

Well, to be precise: the first partition is expected to be an ext2 and have a
/boot directory.

Regards,
Arnout

Quoted 41 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +23 -0
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition spl {
+    in-partition-table = "no"
+    image = "SPL"
+    offset = 1024
+  }
+
+  partition u-boot-img {
+    in-partition-table = "no"
+    image = "u-boot.img"
+    offset = 69K
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
+}
board/freescale/common/imx/post-image.sh +6 -0
index 12a5bea73b..851ce97c57 100755
@@ -36,6 +36,12 @@ genimage_type()
 		echo "genimage.cfg.template_imx8"
 	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
+	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then
+		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
+		    echo "genimage.cfg.template_no_boot_part_spl"
+		else
+		    echo "genimage.cfg.template_no_boot_part"
+		fi
 	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_spl"
 	else
#3 lore raw

PATCH 2/3 boards/freescale/common: Introduce template_no_boot_part

Hi Arnoud,

Le 10/06/2019 ? 00:17, Arnout Vandecappelle a ?crit?:

Quoted 4 lines

Okay, this explains a lot... I should have read this patch before looking at
the previous one.

So basically, patch 1 and 2 should be swapped.

Yes, i fix to v2

Quoted 18 lines

Note that I like this very much, I think it's silly that most of our defconfigs
still use a FAT partition.

Quoted 13 lines · Joris Offouga

This includes the no_boot_part templates which use a /boot included in rootfs.

---
  .../imx/genimage.cfg.template_no_boot_part    | 23 +++++++++++++++
  .../genimage.cfg.template_no_boot_part_spl    | 29 +++++++++++++++++++
  board/freescale/common/imx/post-image.sh      |  6 ++++
  3 files changed, 58 insertions(+)

create mode 100644 board/freescale/common/imx/genimage.cfg.template_no_boot_part create mode 100644 board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl

Quoted 13 lines

board/freescale/common/imx/genimage.cfg.template_no_boot_part line 4

Quoted 10 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +4 -0
new file mode 100644
index 0000000000..9e19b4ee3e
@@ -0,0 +1,23 @@
+# Minimal SD card image for the Freescale boards Template
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,

Is this one going to be used by anything in practice? I expect that anything
that uses this kind of layout is *not* going to use the .imx format, since that's considered kind of deprecated...

It depends on the targets, imx7dpico has migrated to the SPL and so its u-boot has gone from .imx to .img,

Example of the warp7 on 2019.01 it's still .imx.

so I think that should not be removed.

Quoted 27 lines

So my suggestion would be to remove it (also from the post-image script).

Quoted 24 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +19 -0
+# * U-Boot is dumped as is,
+# * a single root filesystem partition is required (ext2, ext3 or ext4)
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition u-boot {
+    in-partition-table = "no"
+    image = "%UBOOTBIN%"
+    offset = 1024
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
+}
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +0 -0
new file mode 100644
index 0000000000..6d3ae183e3
Quoted 8 lines

board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl line 5

Quoted 6 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +5 -0
@@ -0,0 +1,29 @@
+# Minimal SD card image for the Freescale boards Template for SPL Boot
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,
+# * U-Boot is dumped as is,

Mention SPL here. And mention that SPL is at the offset expected by ROM, while
U-Boot is at the offset expected by SPL.

Yes, i add to v2

Quoted 4 lines

board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl line 6

Quoted 2 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +1 -0
+# * a single root filesystem partition is required (ext2, ext3 or ext4)

Well, to be precise: the first partition is expected to be an ext2 and have a
/boot directory.

and this

Best regards,

Joris

Quoted 37 lines

Regards,
Arnout

Quoted 33 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +23 -0
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition spl {
+    in-partition-table = "no"
+    image = "SPL"
+    offset = 1024
+  }
+
+  partition u-boot-img {
+    in-partition-table = "no"
+    image = "u-boot.img"
+    offset = 69K
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
+}
board/freescale/common/imx/post-image.sh +2 -0
index 12a5bea73b..851ce97c57 100755
@@ -36,6 +36,12 @@ genimage_type()
  		echo "genimage.cfg.template_imx8"
  	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then
  		echo "genimage.cfg.template_imx8"
+	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then
+		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
Quoted 8 lines

board/freescale/common/imx/post-image.sh genimage_type() · line 47

Quoted 8 lines
board/freescale/common/imx/post-image.sh +4 -0
+		    echo "genimage.cfg.template_no_boot_part_spl"
+		else
+		    echo "genimage.cfg.template_no_boot_part"
+		fi
  	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
  		echo "genimage.cfg.template_spl"
  	else

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190610/75f76e40/attachment.html>

#4 lore raw

PATCH 2/3 boards/freescale/common: Introduce template_no_boot_part

Arnout*, sorry

Le 10/06/2019 ? 20:43, Joris Offouga a ?crit?:

Quoted 129 lines

Hi Arnoud,

Le 10/06/2019 ? 00:17, Arnout Vandecappelle a ?crit?:

Quoted 4 lines

Okay, this explains a lot... I should have read this patch before looking at
the previous one.

So basically, patch 1 and 2 should be swapped.

Yes, i fix to v2

Quoted 17 lines

Note that I like this very much, I think it's silly that most of our defconfigs
still use a FAT partition.

Quoted 13 lines · Joris Offouga

This includes the no_boot_part templates which use a /boot included in rootfs.

---
  .../imx/genimage.cfg.template_no_boot_part    | 23 +++++++++++++++
  .../genimage.cfg.template_no_boot_part_spl    | 29 +++++++++++++++++++
  board/freescale/common/imx/post-image.sh      |  6 ++++
  3 files changed, 58 insertions(+)

create mode 100644 board/freescale/common/imx/genimage.cfg.template_no_boot_part create mode 100644 board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl

Quoted 13 lines

board/freescale/common/imx/genimage.cfg.template_no_boot_part line 4

Quoted 10 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +4 -0
new file mode 100644
index 0000000000..9e19b4ee3e
@@ -0,0 +1,23 @@
+# Minimal SD card image for the Freescale boards Template
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,

Is this one going to be used by anything in practice? I expect that anything
that uses this kind of layout is *not* going to use the .imx format, since that's considered kind of deprecated...

It depends on the targets, imx7dpico has migrated to the SPL and so its u-boot has gone from .imx to .img,

Example of the warp7 on 2019.01 it's still .imx.

so I think that should not be removed.

Quoted 26 lines

So my suggestion would be to remove it (also from the post-image script).

Quoted 24 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +19 -0
+# * U-Boot is dumped as is,
+# * a single root filesystem partition is required (ext2, ext3 or ext4)
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition u-boot {
+    in-partition-table = "no"
+    image = "%UBOOTBIN%"
+    offset = 1024
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
+}
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +0 -0
new file mode 100644
index 0000000000..6d3ae183e3
Quoted 8 lines

board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl line 5

Quoted 6 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +5 -0
@@ -0,0 +1,29 @@
+# Minimal SD card image for the Freescale boards Template for SPL Boot
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,
+# * U-Boot is dumped as is,

Mention SPL here. And mention that SPL is at the offset expected by ROM, while
U-Boot is at the offset expected by SPL.

Yes, i add to v2

Quoted 3 lines

board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl line 6

Quoted 1 line
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +1 -0
+# * a single root filesystem partition is required (ext2, ext3 or ext4)

Well, to be precise: the first partition is expected to be an ext2 and have a
/boot directory.

and this

Best regards,

Joris

Quoted 36 lines

Regards,
Arnout

Quoted 33 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file +23 -0
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition spl {
+    in-partition-table = "no"
+    image = "SPL"
+    offset = 1024
+  }
+
+  partition u-boot-img {
+    in-partition-table = "no"
+    image = "u-boot.img"
+    offset = 69K
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
+}
board/freescale/common/imx/post-image.sh +2 -0
index 12a5bea73b..851ce97c57 100755
@@ -36,6 +36,12 @@ genimage_type()
  		echo "genimage.cfg.template_imx8"
  	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then
  		echo "genimage.cfg.template_imx8"
+	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then
+		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
Quoted 8 lines
Quoted 8 lines

board/freescale/common/imx/post-image.sh genimage_type() · line 47

Quoted 8 lines
board/freescale/common/imx/post-image.sh +4 -0
+		    echo "genimage.cfg.template_no_boot_part_spl"
+		else
+		    echo "genimage.cfg.template_no_boot_part"
+		fi
  	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
  		echo "genimage.cfg.template_spl"
  	else

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190610/93e36f66/attachment.html>

#5 lore raw

PATCH 2/3 boards/freescale/common: Introduce template_no_boot_part

In reply to Joris Offouga
Quoted 4 lines · Joris Offouga

Hi Arnoud,

Le 10/06/2019 ? 00:17, Arnout Vandecappelle a ?crit?:

Quoted 1 line · Joris Offouga

[snip]

Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +0 -0
new file mode 100644
index 0000000000..9e19b4ee3e
Quoted 8 lines

board/freescale/common/imx/genimage.cfg.template_no_boot_part line 4

Quoted 5 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +4 -0
@@ -0,0 +1,23 @@
+# Minimal SD card image for the Freescale boards Template
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,

Is this one going to be used by anything in practice? I expect that anything
that uses this kind of layout is *not* going to use the .imx format, since that's considered kind of deprecated...

Quoted 4 lines

It depends on the targets, imx7dpico has migrated to the SPL and so its u-boot has gone from .imx to .img,

Example of the warp7 on 2019.01 it's still .imx.

OK, let me rephrase it then: does U-Boot 2019.01 have any configuration without
boot FAT partition, but which uses the .imx format instead of SPL?

In any case, I think this enimage.cfg.template_no_boot_part should only be
introduced when there is something that actually uses it. Now it is just dead code.

Regards,
Arnout

[snip]

#6 lore raw

PATCH 2/3 boards/freescale/common: Introduce template_no_boot_part

Le 10/06/2019 ? 21:00, Arnout Vandecappelle a ?crit?:

Quoted 23 lines · Joris Offouga
Quoted 4 lines

Hi Arnoud,

Le 10/06/2019 ? 00:17, Arnout Vandecappelle a ?crit?:

Quoted 1 line · Joris Offouga

[snip]

Quoted 16 lines
Quoted 5 lines
Quoted 5 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +0 -0
new file mode 100644
index 0000000000..9e19b4ee3e
Quoted 8 lines

board/freescale/common/imx/genimage.cfg.template_no_boot_part line 4

Quoted 5 lines
board/freescale/common/imx/genimage.cfg.template_no_boot_part new file +4 -0
@@ -0,0 +1,23 @@
+# Minimal SD card image for the Freescale boards Template
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,

Is this one going to be used by anything in practice? I expect that anything
that uses this kind of layout is *not* going to use the .imx format, since that's considered kind of deprecated...

It depends on the targets, imx7dpico has migrated to the SPL and so its u-boot has gone from .imx to .img,

Quoted 6 lines
Quoted 1 line

Example of the warp7 on 2019.01 it's still .imx.

OK, let me rephrase it then: does U-Boot 2019.01 have any configuration without
boot FAT partition, but which uses the .imx format instead of SPL?

In any case, I think this enimage.cfg.template_no_boot_part should only be
introduced when there is something that actually uses it. Now it is just dead code.

I see you are right if a target will need it it will introduce the variable I drop this file,

thanks for review

Best regards,

Joris

Quoted 6 lines

Regards,
Arnout

[snip]

#7 lore raw

PATCH 3/3 configs/imx7dpico: Add Wifi support

In reply to Joris Offouga

imx7dpico has a BCM4339 Wifi chip. Add Wifi support by default to allow a better customer experience.

---
 board/technexion/imx7dpico/readme.txt         | 11 +++
 .../lib/firmware/brcm/brcmfmac4339-sdio.txt   | 99 +++++++++++++++++++
 configs/imx7dpico_defconfig                   | 12 +++
 3 files changed, 122 insertions(+)
 create mode 100644 board/technexion/imx7dpico/rootfs_overlay/lib/firmware/brcm/brcmfmac4339-sdio.txt
board/technexion/imx7dpico/readme.txt +11 -0
index 07e089c38e..1b9e80a0fd 100644
@@ -57,4 +57,15 @@ To boot your newly created system:
   emulator at 115200 bps, 8n1;
 - power on the board.
 
+Using Wifi
+==========
+
+# modprobe brcmfmac
+# iwconfig wlan0 essid ACCESSPOINTNAME
+# wpa_passphrase ACCESSPOINTNAME > /etc/wpa.conf
+(enter the wifi password and press enter)
+# wpa_supplicant -Dwext -iwlan0 -c /etc/wpa.conf &
+# udhcpc -i wlan0
+# ping buildroot.org
+
 Enjoy!
board/technexion/imx7dpico/rootfs_overlay/lib/firmware/brcm/brcmfmac4339-sdio.txt new file +99 -0

100 lines not on this page · raw message

configs/imx7dpico_defconfig +12 -0
index cd12e282ef..6b1184f672 100644
@@ -28,6 +28,18 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 
+
+# wifi firmware for brcm43439
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y
+
+# For automatic firmware loading
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+
+# wireless packages
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 # required tools to create the eMMC image
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
Signature · 1 line
2.17.1
#8 lore raw

PATCH 3/3 configs/imx7dpico: Add Wifi support

Quoted 2 lines · Joris Offouga

imx7dpico has a BCM4339 Wifi chip. Add Wifi support by default to allow a better customer experience.

I wasn't sure if this one depended on the kernel bump to 5.1, so I haven't
applied yet. Also, minor nits below.

[snip]

configs/imx7dpico_defconfig BR2_TARGET_UBOOT_CUSTOM_VERSION=y · line 31

Quoted 9 lines
configs/imx7dpico_defconfig +1 -0
index cd12e282ef..6b1184f672 100644
@@ -28,6 +28,18 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 
+

Spurious empty line here.

configs/imx7dpico_defconfig BR2_TARGET_UBOOT_CUSTOM_VERSION=y · line 42

Quoted 11 lines
configs/imx7dpico_defconfig +11 -0
+# wifi firmware for brcm43439
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y
+
+# For automatic firmware loading
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+
+# wireless packages
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y

... and a missing empty line here.

With those two things fixed, you can add my

Also, don't forget to keep Pierre-Jean's Tested-by tag.

Regards,
Arnout

Quoted 4 lines
configs/imx7dpico_defconfig +0 -0
 # required tools to create the eMMC image
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
#9 lore raw

PATCH 1/3 configs/imx7dpico: Bump Linux and U-Boot

In reply to Joris Offouga

Hi Joris,

Le 09/06/2019 ? 16:57, Joris Offouga a ?crit?:

Quoted 123 lines

This commit bumps Linux & Linux-headers to 5.1 and U-Boot to version 2019.01. With U-Boot version 2019.01, imx7dpico boot with distrobootcmd also introduce extlinux file also remove patch and change TARGET_UBOOT_BOARNAME for select correct defconfig in U-Boot.

---
  .../patches/uboot/0001-picomx7dname.patch     | 31 -------------------
  board/technexion/imx7dpico/readme.txt         |  3 +-
  .../boot/extlinux/extlinux.conf               |  4 +++
  configs/imx7dpico_defconfig                   | 19 ++++++------
  4 files changed, 16 insertions(+), 41 deletions(-)

delete mode 100644 board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch create mode 100644 board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf

board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch deleted +0 -31
deleted file mode 100644
index 59408bcd7a..0000000000
@@ -1,31 +0,0 @@
-From 6d298b0fcacfc555f93864fa45fb612140902388 Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <[email protected]>
-Date: Tue, 5 Jun 2018 22:12:48 -0300
-Subject: [PATCH] pico-imx7d: Adjust the dtb name
-
-Since kernel commit 41bbeadceb03 ("ARM: dts: imx7d-pico-pi: Separate
-into cpu and baseboard dts") the dtb name has changed.
-
-Fix it accordingly.
-
-Signed-off-by: Fabio Estevam <[email protected]>
----
- include/configs/pico-imx7d.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
-index b208d7f..d2ffa70 100644
---- a/include/configs/pico-imx7d.h
-+++ b/include/configs/pico-imx7d.h
-@@ -41,7 +41,7 @@
- 	"console=ttymxc4\0" \
- 	"fdt_high=0xffffffff\0" \
- 	"initrd_high=0xffffffff\0" \
--	"fdt_file=imx7d-pico.dtb\0" \
-+	"fdt_file=imx7d-pico-pi.dtb\0" \
- 	"fdt_addr=0x83000000\0" \
- 	"ip_dyn=yes\0" \
- 	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
---
-2.7.4
-
board/technexion/imx7dpico/readme.txt +2 -1
index cda3f285eb..07e089c38e 100644
@@ -20,7 +20,8 @@ You will find in output/images/ the following files:
    - rootfs.ext4
    - rootfs.tar
    - sdcard.img
-  - u-boot.imx
+  - u-boot.img
+  - SPL
    - zImage
 
  Flash the eMMC
board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf new file +4 -0
new file mode 100644
index 0000000000..4824aff079
@@ -0,0 +1,4 @@
+Label imx7d-pico-buildroot
+  kernel /boot/zImage
+  devicetree /boot/imx7d-pico-pi.dtb
+  append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate}
\ No newline at end of file
configs/imx7dpico_defconfig +9 -9
index 93e3fd7414..cd12e282ef 100644
@@ -3,11 +3,8 @@ BR2_arm=y
  BR2_cortex_a7=y
  BR2_ARM_FPU_NEON_VFPV4=y
 
-# patches
-BR2_GLOBAL_PATCH_DIR="board/technexion/imx7dpico/patches"
-
-# Linux headers same as kernel, a 4.17 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
+# Linux headers same as kernel, a 5.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y
 
  # system
  BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
@@ -15,18 +12,21 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
  # kernel
  BR2_LINUX_KERNEL=y
  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.6"
  BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
  BR2_LINUX_KERNEL_DTS_SUPPORT=y
  BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi"
  BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
  # bootloader
  BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="pico-imx7d"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d"
  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
 
  # required tools to create the eMMC image
  BR2_PACKAGE_HOST_DOSFSTOOLS=y

configs/imx7dpico_defconfig BR2_PACKAGE_HOST_GENIMAGE=y · line 40

Quoted 7 lines
configs/imx7dpico_defconfig +1 -0
@@ -34,6 +34,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y
  BR2_PACKAGE_HOST_MTOOLS=y
 
  # filesystem / image
+BR2_ROOTFS_OVERLAY="board/technexion/imx7dpico/rootfs_overlay"
  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
  BR2_TARGET_ROOTFS_EXT2=y
  BR2_TARGET_ROOTFS_EXT2_4=y

Works fine on my side:

Net:   FEC0
Hit any key to stop autoboot:  0

Saving Environment to MMC... Writing to MMC(0)... OK switch to partitions #0, OK
mmc0(part 0) is current device
Scanning mmc 0:1...
Found /boot/extlinux/extlinux.conf
Retrieving file: /boot/extlinux/extlinux.conf
159 bytes read in 87 ms (1000 Bytes/s)
1: imx7d-pico-buildroot
Retrieving file: /boot/zImage
8197792 bytes read in 266 ms (29.4 MiB/s)
append: root=PARTUUID=00000000-01 rootwait rw console=ttymxc4,115200 Retrieving file: /boot/imx7d-pico-pi.dtb
33018 bytes read in 70 ms (460 KiB/s)
## Flattened Device Tree blob at 83000000

    Booting using the fdt blob at 0x83000000
    Using Device Tree in place at 83000000, end 8300b0f9

Starting kernel ...

So,

Signature · 2 lines
Best regards,
Pierre-Jean Texier
#10 lore raw

PATCH 1/3 configs/imx7dpico: Bump Linux and U-Boot

In reply to Joris Offouga
Quoted 4 lines · Joris Offouga

This commit bumps Linux & Linux-headers to 5.1 and U-Boot to version 2019.01. With U-Boot version 2019.01, imx7dpico boot with distrobootcmd also introduce extlinux file also remove patch and change TARGET_UBOOT_BOARNAME for select correct defconfig in U-Boot.

Wow, this commit log is pretty dense... I rewrote it to the following:

configs/imx7dpico: Bump Linux and U-Boot

Bump Linux to 5.1 and U-Boot to version 2019.01.

U-Boot patch is no longer needed, applied upstream.

U-Boot defconfig name for this board has changed to pico-pi-imx7d.

U-Boot now supports distrobootcmd for this board, so add the appropriate extlinux.conf and use SPL+u-boot.img instead of u-boot.imx. Note that the common freescale post-image script handles things appropriately based on the selected options in .config.

However, I haven't applied yet because there's something I don't understand...

Quoted 2 lines

[snip]

board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf

Quoted 5 lines
board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf new file +0 -0
new file mode 100644
index 0000000000..4824aff079

So this will be placed in the rootfs, in the second partition. How does U-boot
know how to pick it up from there?

I believe it doesn't, I don't think this file is used at all. It still works,
because the U-Boot config looks for zImage and imx7d-pico-pi.dtb on the first partition by default.

board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf line 4

Quoted 6 lines
board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf new file +4 -0
@@ -0,0 +1,4 @@
+Label imx7d-pico-buildroot
+  kernel /boot/zImage
+  devicetree /boot/imx7d-pico-pi.dtb
+  append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate}
\ No newline at end of file

Please add a newline at the end of the file.

How would uuid get expanded? How does U-Boot know the rootfs's UUID?

However, I believe this file and the OVERLAY config option can just be removed.

Regards,
Arnout

Quoted 53 lines
configs/imx7dpico_defconfig +10 -9
index 93e3fd7414..cd12e282ef 100644
@@ -3,11 +3,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
-# patches
-BR2_GLOBAL_PATCH_DIR="board/technexion/imx7dpico/patches"
-
-# Linux headers same as kernel, a 4.17 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
+# Linux headers same as kernel, a 5.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
@@ -15,18 +12,21 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.6"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
 # bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="pico-imx7d"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
 
 # required tools to create the eMMC image
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
@@ -34,6 +34,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 
 # filesystem / image
+BR2_ROOTFS_OVERLAY="board/technexion/imx7dpico/rootfs_overlay"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y