Skip to contentSkip to conversation

configs/imx6q-sabresd: Drop the 'quad' notation

PATCH New Fabio Estevam 2 participants 7 messages Sep 25, 2017 – Sep 26, 2017 Arm i.MX and Layerscape

lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/6 configs/imx6q-sabresd: Drop the 'quad' notation

Now that SPL is supported a single image can run on the different variants of imx6 sabresd boards: imx6q, imx6dl and imx6qp.

So drop the 'quad' prefix from defconfig, directory and readme file to make it generic.

Signed-off-by Fabio Estevam <[email protected]>
---
 .../linux_qt5.fragment                             |  0
 .../{imx6q-sabresd => imx6-sabresd}/readme.txt     | 23 +++++++++++++---------
 .../rootfs_overlay/root/sabresd.json               |  0
 ...6q-sabresd_defconfig => imx6-sabresd_defconfig} |  0
 configs/imx6q-sabresd_qt5_defconfig                |  4 ++--
 5 files changed, 16 insertions(+), 11 deletions(-)
 rename board/freescale/{imx6q-sabresd => imx6-sabresd}/linux_qt5.fragment (100%)
 rename board/freescale/{imx6q-sabresd => imx6-sabresd}/readme.txt (77%)
 rename board/freescale/{imx6q-sabresd => imx6-sabresd}/rootfs_overlay/root/sabresd.json (100%)
 rename configs/{imx6q-sabresd_defconfig => imx6-sabresd_defconfig} (100%)
board/freescale/imx6-sabresd/linux_qt5.fragment renamed from board/freescale/imx6q-sabresd/linux_qt5.fragment +0 -0
similarity index 100%
rename from board/freescale/imx6q-sabresd/linux_qt5.fragment
rename to board/freescale/imx6-sabresd/linux_qt5.fragment
board/freescale/imx6-sabresd/readme.txt renamed from board/freescale/imx6q-sabresd/readme.txt +14 -9
similarity index 77%
rename from board/freescale/imx6q-sabresd/readme.txt
rename to board/freescale/imx6-sabresd/readme.txt
index b57c4fb..ff6c9ba 100644
@@ -1,18 +1,21 @@
 *******************************
-Freescale i.MX6Q Sabre SD board
+Freescale i.MX6 Sabre SD boards
 *******************************
 
-This file documents the Buildroot support for the Freescale i.MX6Q Sabre SD
-board.
+This file documents the Buildroot support for the Freescale i.MX6 Sabre SD
+boards based on i.MX6Q, i.MX6DL and iMX6QP.
+
+Thanks to the SPL support in U-Boot it is possible to run a single
+sdcard.img in all i.MX6 Sabre SD board variants.
 
 This configuration uses U-Boot mainline and kernel mainline.
 
 Build
 =====
 
-First, configure Buildroot for the i.MX6Q Sabre SD board:
+First, configure Buildroot for the i.MX6 Sabre SD board:
 
-  make imx6q-sabresd_defconfig
+  make imx6-sabresd_defconfig
 
 Build all components:
 

@@ -20,6 +23,8 @@ Build all components:
 
 You will find the following files in output/images/ :
   - imx6q-sabresd.dtb
+  - imx6dl-sabresd.dtb
+  - imx6qp-sabresd.dtb
   - rootfs.ext4
   - rootfs.tar
   - sdcard.img

@@ -45,8 +50,8 @@ command as root:
 For details about the medium image layout, see the definition in
 board/freescale/common/imx/genimage.cfg.template.
 
-Boot the i.MX6Q Sabre SD board
-==============================
+Boot the i.MX6 Sabre SD board
+=============================
 
 To boot your newly created system:
 - insert the SD card in the SD3 slot of the board (close to the HDMI connector);

@@ -54,8 +59,8 @@ To boot your newly created system:
   emulator at 115200 bps, 8n1;
 - power on the board.
 
-Testing graphics on the i.MX6Q Sabre SD board
-=============================================
+Testing graphics on the i.MX6 Sabre SD board
+============================================
 
 The imx6q-sabresd_qt5_defconfig allows to quickly test the graphics
 capabilities of i.MX6 using the opensource Etnaviv graphics stack
board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json renamed from board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json +0 -0
similarity index 100%
rename from board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json
rename to board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json
configs/imx6-sabresd_defconfig renamed from configs/imx6q-sabresd_defconfig +0 -0
similarity index 100%
rename from configs/imx6q-sabresd_defconfig
rename to configs/imx6-sabresd_defconfig
configs/imx6q-sabresd_qt5_defconfig +2 -2
index 801b256..94bf867 100644
@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
-BR2_ROOTFS_OVERLAY="board/freescale/imx6q-sabresd/rootfs_overlay"
+BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay"
 
 # Bootloader
 BR2_TARGET_UBOOT=y

@@ -40,7 +40,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.6"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6q-sabresd/linux_qt5.fragment"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6-sabresd/linux_qt5.fragment"
 
 # GL driver
 BR2_PACKAGE_MESA3D=y
Signature · 1 line
2.7.4
author reviewer
#1 lore raw

PATCH 2/6 configs/imx6-sabresd: Bump kernel and U-Boot versions

Bump U-Boot to 2017.09 and kernel to 4.13.3 versions.

Signed-off-by Fabio Estevam <[email protected]>
---
 configs/imx6-sabresd_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
configs/imx6-sabresd_defconfig +2 -2
index 18d809c..18dfe27 100644
@@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"

@@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
Signature · 1 line
2.7.4
author reviewer
#2 lore raw

PATCH 3/6 configs/imx6q-sabresd-qt5: Increase the rootfs size

In reply to Fabio Estevam

The QT5 rootfs requires more space, so adjust it a larger size.

Signed-off-by Fabio Estevam <[email protected]>
---
 configs/imx6q-sabresd_qt5_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/imx6q-sabresd_qt5_defconfig +1 -1
index 94bf867..3128555 100644
@@ -23,7 +23,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="320M"
 BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay"
 
 # Bootloader
Signature · 1 line
2.7.4
author reviewer
#3 lore raw

PATCH 4/6 configs/imx6q-sabresd_qt5: Switch to SPL

In reply to Fabio Estevam

U-Boot 2017.09 uses SPL, so bump to this version so that we can have a single qt5 image that supports the different imx6 sabresd
boards: imx6q, imx6dl and imx6qp.

Signed-off-by Fabio Estevam <[email protected]>
---
 board/freescale/imx6-sabresd/readme.txt                        |  4 ++--
 ...{imx6q-sabresd_qt5_defconfig => imx6-sabresd_qt5_defconfig} | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename configs/{imx6q-sabresd_qt5_defconfig => imx6-sabresd_qt5_defconfig} (87%)
board/freescale/imx6-sabresd/readme.txt +2 -2
index ff6c9ba..f13d430 100644
@@ -62,13 +62,13 @@ To boot your newly created system:
 Testing graphics on the i.MX6 Sabre SD board
 ============================================
 
-The imx6q-sabresd_qt5_defconfig allows to quickly test the graphics
+The imx6-sabresd_qt5_defconfig allows to quickly test the graphics
 capabilities of i.MX6 using the opensource Etnaviv graphics stack
 and kernel mainline.
 
 In order to build it:
 
-make imx6q-sabresd_qt5_defconfig
+make imx6-sabresd_qt5_defconfig
 make
 
 Then flash the SD card as explained above.
configs/imx6-sabresd_qt5_defconfig renamed from configs/imx6q-sabresd_qt5_defconfig +6 -4
similarity index 87%
rename from configs/imx6q-sabresd_qt5_defconfig
rename to configs/imx6-sabresd_qt5_defconfig
index 3128555..2ade242 100644
@@ -28,10 +28,12 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay"
 
 # Bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
+BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
 
 # Kernel
 BR2_LINUX_KERNEL=y

@@ -39,7 +41,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.6"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6-sabresd/linux_qt5.fragment"
 
 # GL driver
Signature · 1 line
2.7.4
author reviewer
#4 lore raw

PATCH 5/6 configs/imx6-sabresd_qt5: Bump kernel to 4.13.3

In reply to Fabio Estevam

Bump the kernel version to 4.13.3.

Kernel 4.13.3 uses the /dev/dri/card0 device as rendering node, so adjust it accordingly.

Signed-off-by Fabio Estevam <[email protected]>
---
 board/freescale/imx6-sabresd/readme.txt                       | 2 +-
 board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json | 2 +-
 configs/imx6-sabresd_qt5_defconfig                            | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
board/freescale/imx6-sabresd/readme.txt +1 -1
index f13d430..a4ecfae 100644
@@ -75,7 +75,7 @@ Then flash the SD card as explained above.
 
 Running kmscube application:
 
-# kmscube -D /dev/dri/card1
+# kmscube
 
 Running Qt5 Cinematic Demo:
board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json +1 -1
index 9469dc1..d5d063a 100644
@@ -1,5 +1,5 @@
 {
-  "device": "/dev/dri/card1",
+  "device": "/dev/dri/card0",
   "hwcursor": false,
   "pbuffers": true,
   "outputs": [
configs/imx6-sabresd_qt5_defconfig +3 -3
index 2ade242..832e326 100644
@@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
 
-# Linux headers same as kernel, a 4.11 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 
 # Additional features needed for packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y

@@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
Signature · 1 line
2.7.4
author reviewer
#5 lore raw

PATCH 6/6 imx6-sabresd/readme: Add an entry for glmark benchmark

In reply to Fabio Estevam

Add an entry to explain how to run the glmark benchmark.

Signed-off-by Fabio Estevam <[email protected]>
---
 board/freescale/imx6-sabresd/readme.txt | 4 ++++
 1 file changed, 4 insertions(+)
board/freescale/imx6-sabresd/readme.txt +4 -0
index a4ecfae..2943f8b 100644
@@ -82,4 +82,8 @@ Running Qt5 Cinematic Demo:
 # export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
 # /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
 
+Running gl2mark benchmark:
+
+# glmark2-es2-drm
+
 Enjoy!
Signature · 1 line
2.7.4
#6 lore raw

PATCH 1/6 configs/imx6q-sabresd: Drop the 'quad' notation

In reply to Fabio Estevam
Quoted 7 lines · Fabio Estevam

Now that SPL is supported a single image can run on the different variants of imx6 sabresd boards: imx6q, imx6dl and imx6qp.

So drop the 'quad' prefix from defconfig, directory and readme file to make it generic.

Signed-off-by Fabio Estevam <[email protected]>

Applied the entire series to master. Excellent!

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF