configs/imx6q-sabresd: Drop the 'quad' notation
authorFabio Estevam <festevam@gmail.com>
Mon, 25 Sep 2017 11:59:43 +0000 (08:59 -0300)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tue, 26 Sep 2017 22:26:50 +0000 (00:26 +0200)
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 <festevam@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
board/freescale/imx6-sabresd/linux_qt5.fragment [new file with mode: 0644]
board/freescale/imx6-sabresd/readme.txt [new file with mode: 0644]
board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json [new file with mode: 0644]
board/freescale/imx6q-sabresd/linux_qt5.fragment [deleted file]
board/freescale/imx6q-sabresd/readme.txt [deleted file]
board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json [deleted file]
configs/imx6-sabresd_defconfig [new file with mode: 0644]
configs/imx6q-sabresd_defconfig [deleted file]
configs/imx6q-sabresd_qt5_defconfig

diff --git a/board/freescale/imx6-sabresd/linux_qt5.fragment b/board/freescale/imx6-sabresd/linux_qt5.fragment
new file mode 100644 (file)
index 0000000..5c0505e
--- /dev/null
@@ -0,0 +1,4 @@
+# Currently kernel mainline exhibits issues when running cpufreq as ondemand
+# governor on mx6.
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
diff --git a/board/freescale/imx6-sabresd/readme.txt b/board/freescale/imx6-sabresd/readme.txt
new file mode 100644 (file)
index 0000000..ff6c9ba
--- /dev/null
@@ -0,0 +1,85 @@
+*******************************
+Freescale i.MX6 Sabre SD boards
+*******************************
+
+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.MX6 Sabre SD board:
+
+  make imx6-sabresd_defconfig
+
+Build all components:
+
+  make
+
+You will find the following files in output/images/ :
+  - imx6q-sabresd.dtb
+  - imx6dl-sabresd.dtb
+  - imx6qp-sabresd.dtb
+  - rootfs.ext4
+  - rootfs.tar
+  - sdcard.img
+  - u-boot.imx
+  - zImage
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/freescale/common/imx/genimage.cfg.template.
+
+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);
+- put a micro USB cable into the Debug USB Port and connect using a terminal
+  emulator at 115200 bps, 8n1;
+- power on the 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
+and kernel mainline.
+
+In order to build it:
+
+make imx6q-sabresd_qt5_defconfig
+make
+
+Then flash the SD card as explained above.
+
+Running kmscube application:
+
+# kmscube -D /dev/dri/card1
+
+Running Qt5 Cinematic Demo:
+
+# export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
+# /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
+
+Enjoy!
diff --git a/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json b/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json
new file mode 100644 (file)
index 0000000..9469dc1
--- /dev/null
@@ -0,0 +1,15 @@
+{
+  "device": "/dev/dri/card1",
+  "hwcursor": false,
+  "pbuffers": true,
+  "outputs": [
+    {
+      "name": "HDMI-1",
+      "mode": "off"
+    },
+    {
+      "name": "LVDS-1",
+      "mode": "1024x768"
+    }
+  ]
+}
diff --git a/board/freescale/imx6q-sabresd/linux_qt5.fragment b/board/freescale/imx6q-sabresd/linux_qt5.fragment
deleted file mode 100644 (file)
index 5c0505e..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# Currently kernel mainline exhibits issues when running cpufreq as ondemand
-# governor on mx6.
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
diff --git a/board/freescale/imx6q-sabresd/readme.txt b/board/freescale/imx6q-sabresd/readme.txt
deleted file mode 100644 (file)
index b57c4fb..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-*******************************
-Freescale i.MX6Q Sabre SD board
-*******************************
-
-This file documents the Buildroot support for the Freescale i.MX6Q Sabre SD
-board.
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX6Q Sabre SD board:
-
-  make imx6q-sabresd_defconfig
-
-Build all components:
-
-  make
-
-You will find the following files in output/images/ :
-  - imx6q-sabresd.dtb
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot.imx
-  - zImage
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-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
-==============================
-
-To boot your newly created system:
-- insert the SD card in the SD3 slot of the board (close to the HDMI connector);
-- put a micro USB cable into the Debug USB Port and connect using a terminal
-  emulator at 115200 bps, 8n1;
-- power on the board.
-
-Testing graphics on the i.MX6Q Sabre SD board
-=============================================
-
-The imx6q-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
-
-Then flash the SD card as explained above.
-
-Running kmscube application:
-
-# kmscube -D /dev/dri/card1
-
-Running Qt5 Cinematic Demo:
-
-# export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
-# /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
-
-Enjoy!
diff --git a/board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json b/board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json
deleted file mode 100644 (file)
index 9469dc1..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "device": "/dev/dri/card1",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "HDMI-1",
-      "mode": "off"
-    },
-    {
-      "name": "LVDS-1",
-      "mode": "1024x768"
-    }
-  ]
-}
diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig
new file mode 100644 (file)
index 0000000..18d809c
--- /dev/null
@@ -0,0 +1,38 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# required tools to create the SD card image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+
+# Bootloader
+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_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+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_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
diff --git a/configs/imx6q-sabresd_defconfig b/configs/imx6q-sabresd_defconfig
deleted file mode 100644 (file)
index 18d809c..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_FPU_VFPV3=y
-
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
-
-# System
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-
-# required tools to create the SD card image
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# Filesystem
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-
-# Bootloader
-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_FORMAT_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-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_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
index 801b25657c118d8d7ef199370603e524b24a5f71..94bf8674f70b14a43887e4e73b70fd851d4d3946 100644 (file)
@@ -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