From patchwork Sat Oct 10 06:30:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1379913 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=I59++Huy; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C7Zfp3lLbz9sTD for ; Sat, 10 Oct 2020 17:24:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4D98A86E56; Sat, 10 Oct 2020 06:24:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Cy89eoQ7Nw8Z; Sat, 10 Oct 2020 06:24:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7CEA186DDA; Sat, 10 Oct 2020 06:24:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6A6B51BF84C for ; Sat, 10 Oct 2020 06:24:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 675B120442 for ; Sat, 10 Oct 2020 06:24:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s451diQKNan8 for ; Sat, 10 Oct 2020 06:24:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by silver.osuosl.org (Postfix) with ESMTPS id 5372B2042B for ; Sat, 10 Oct 2020 06:24:38 +0000 (UTC) Received: by mail-lj1-f194.google.com with SMTP id a15so11682293ljk.2 for ; Fri, 09 Oct 2020 23:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CfF14sh38MJMJ109bcxzHV/hx+qK6abjVtsFT7u5DqI=; b=I59++HuyqK7gg1MQhL9AFI0SDCtZXkh3mvH91Z+Vg4U9cfMQy5+IBYOFCTS6lxBmaN 9YAHewFX9RaOGdS7Day4msO29b9Yol7gn3kVZEEpDwn+lukaWisZJa1RXDOcfINY3PZT hXVIFrLcfJ8v0otF6OnP6OcNOoxe7belDxKnuwFAl3GeHgNSlEaXAxIkfHGBHmqqBXrT fTTFhcrpfQKFQv341ldk6l9BHUU5ij/YEA88Ov8IheJt35PiqC9rRfzq3/9IQCHaOsrz Kkse1Vb4cJLU+nV4vVWAR4Z1Aj8SZS8JDr4h8OWSOZS9M08xpNv3pHtEWIIq915g4s+2 WPPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CfF14sh38MJMJ109bcxzHV/hx+qK6abjVtsFT7u5DqI=; b=OQftDjlwsJseQxlWeiK5sXq1XdZHnLit4eZVs4RsXkh7IE1CCH3c8TYL10TKGGE8Tj azAtyEkMQr6Bq6VEeo8UxaQZcUrlXeGmt9jP4GN7BcNdNqIaktejF4xT5/scvtOtnkGY 2tLJ4Npl9uWNhlmjWX+XemLPFodHAXZni98vWxS8i1fo27dYNm+4TkIi2qudyNNpgFu6 1dZszruQsoNbDPqP1FGEVIIl7j+31g5hUdQnXLUycvNokdXUiqpXPviz/+3/c4zbqCWj qxHoy0ByE0YWDFn/kLKjUwfmGJesdOYP7SJJXcY4h13fmg4Kgj61BEQD52lm2uAWjqXy diyQ== X-Gm-Message-State: AOAM532oHzSfoq1ehJ+7WdmGadfTQZZV8VCJ49VafchM6xAlTmZhoHte 6k8jnIyrSBb92GYpeACuPr13xU4QMoI= X-Google-Smtp-Source: ABdhPJxOHB82F4R12ON5G/vm+qfwJEPyHxc59X8H6DtWbvvbcsjUN3ff7e2ozWiJnBuSXCIS1KGL/Q== X-Received: by 2002:a2e:a499:: with SMTP id h25mr4881169lji.359.1602311075881; Fri, 09 Oct 2020 23:24:35 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id z21sm1943870lfb.20.2020.10.09.23.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 23:24:35 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sat, 10 Oct 2020 09:30:18 +0300 Message-Id: <20201010063022.448414-2-geomatsi@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201010063022.448414-1-geomatsi@gmail.com> References: <20201010063022.448414-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/5] configs/mx6sx_udoo_neo: bump kernel and U-Boot versions X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , Sergey Matyukevich Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Bump Linux kernel to 5.8.13 and U-Boot to 2020.10. Signed-off-by: Sergey Matyukevich --- configs/mx6sx_udoo_neo_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index e2e36b907b..57b9562c06 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -3,8 +3,8 @@ 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 +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y @@ -12,13 +12,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" From patchwork Sat Oct 10 06:30:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1379914 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=lFMv7Hig; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C7Zfq1H8jz9sTL for ; Sat, 10 Oct 2020 17:24:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0C8B62042B; Sat, 10 Oct 2020 06:24:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HVWHeAdcfFVw; Sat, 10 Oct 2020 06:24:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9260E20442; Sat, 10 Oct 2020 06:24:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 450831BF84C for ; Sat, 10 Oct 2020 06:24:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3ECAE8777E for ; Sat, 10 Oct 2020 06:24:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RnrxiesSnMwi for ; Sat, 10 Oct 2020 06:24:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 490C18776A for ; Sat, 10 Oct 2020 06:24:39 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id b1so9587632lfp.11 for ; Fri, 09 Oct 2020 23:24:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HC/MTnwTV1RiUP8rSdb+pMH2wW6lNZepcBCkD5FeTcs=; b=lFMv7HigJJpvxSRxkfVvvxxtmLATBMgHfuZYc/ZWB/kr7Wk45bjU2azEK7fv8HTs4I 2TrK8FmcuLuED+LG3AmkLoUDW90eL0Piq5p4NnaV46GnWKbpGqaYYlUFwAKWTnwo9b4m ZfMfvehpogajSNg9JMf4MRS0Uc7m4t4sdg4g7SzbkJa84MIOb6u9Xklp3/Yleg/e4D7W m8isaf0WQPhuVybfjBHS0lxt4/U+uGHzyt2+lb2CU4nrLj5ET2cgBOZuOPd72X/U1wHp jt1YDlhU6HlLqJ6q1b3vVjL7e7a4j0I1cCPJmXZpERu5q+wZYJD0JaXq6waczZCe+wdM B3eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HC/MTnwTV1RiUP8rSdb+pMH2wW6lNZepcBCkD5FeTcs=; b=FrZkSkus0wflC6M6EgdPEpP3Sn4DImC14Rso1FXbGtgRncEzMN8qgZsmwdUPS4KIiD BZAgrINbDKIXWBZ0uZztrgfO4rJXQsgaI8A+Wd5tQ26FkbiC8SVOoWWfW01Is5gurTzr HJUrpx67juutAmQUbpwhNRU5x/pm+qxbZWVzp7sakAD+UUq0UEKfQYLZegK2DIUBpRMo d3ydHek08OeTWj5wc4M0a91iyEmF63GoEaQWqVIByrkTvYIOkpNovey7cxGVYExrj2tc 81vqkRbRoDMLwSePSfbi15pixM3tXof0AKG4VwyCyXMiWH9Ie2oy0FIyLSk2tAC4Dq9B fQjQ== X-Gm-Message-State: AOAM530vNxINGR/65/XW9dceXHUe4bHfIBvi729pc/HNSE0Uv7MXmZSb UPQu1GZGZKSKMFATrjTaDLQNLmzYxJg= X-Google-Smtp-Source: ABdhPJyeSsick9iZEF8a9r6BHqVhx5WPRqcwajhUxZeutDc9uBuYqE/jmKk0UjGLeph2+QA0m2AqdA== X-Received: by 2002:ac2:505a:: with SMTP id a26mr4808945lfm.300.1602311076740; Fri, 09 Oct 2020 23:24:36 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id z21sm1943870lfb.20.2020.10.09.23.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 23:24:36 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sat, 10 Oct 2020 09:30:19 +0300 Message-Id: <20201010063022.448414-3-geomatsi@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201010063022.448414-1-geomatsi@gmail.com> References: <20201010063022.448414-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/5] configs/mx6udoo: bump bsp versions and modify image X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , Sergey Matyukevich Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Bump U-Boot to 2020.10 and kernel to 5.8.13 version. Updated U-Boot no longer provides specific boot command in default environment for this board. So boot script needs to be added to the image. For this purpose switch from Freescale common scripts to custom image generation similar to what Udoo Neo board does. Create a single rootfs partition with all the required boot files including boot.scr, kernel, and dtb. Signed-off-by: Sergey Matyukevich --- board/udoo/mx6qdl/boot.scr.txt | 7 +++++++ board/udoo/mx6qdl/genimage.cfg | 32 ++++++++++++++++++++++++++++++++ board/udoo/mx6qdl/post-build.sh | 7 +++++++ board/udoo/mx6qdl/post-image.sh | 15 +++++++++++++++ configs/mx6udoo_defconfig | 13 ++++++++----- 5 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 board/udoo/mx6qdl/boot.scr.txt create mode 100644 board/udoo/mx6qdl/genimage.cfg create mode 100755 board/udoo/mx6qdl/post-build.sh create mode 100755 board/udoo/mx6qdl/post-image.sh diff --git a/board/udoo/mx6qdl/boot.scr.txt b/board/udoo/mx6qdl/boot.scr.txt new file mode 100644 index 0000000000..7acceed0fb --- /dev/null +++ b/board/udoo/mx6qdl/boot.scr.txt @@ -0,0 +1,7 @@ +setenv finduuid "part uuid mmc 0:1 uuid" +run finduuid +run findfdt +setenv bootargs "console=${console} root=PARTUUID=${uuid} rootwait rootfstype=ext4" +load mmc 0:1 ${fdt_addr} boot/${fdtfile} +load mmc 0:1 ${loadaddr} boot/zImage +bootz ${loadaddr} - ${fdt_addr} diff --git a/board/udoo/mx6qdl/genimage.cfg b/board/udoo/mx6qdl/genimage.cfg new file mode 100644 index 0000000000..46209120f0 --- /dev/null +++ b/board/udoo/mx6qdl/genimage.cfg @@ -0,0 +1,32 @@ +# Minimal SD card image for the MX6SX Udoo Neo board +# +# The SD card must have at least 1 MB free at the beginning. +# U-Boot and its environment are dumped as is. +# A single root filesystem partition is required (Ext4 in this case). +# +# For details about the layout, see: +# http://wiki.wandboard.org/index.php/Boot-process + +image sdcard.img { + hdimage { + } + + partition spl { + in-partition-table = "no" + image = "SPL" + offset = 1K + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.img" + offset = 69K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + size = 512M + } +} diff --git a/board/udoo/mx6qdl/post-build.sh b/board/udoo/mx6qdl/post-build.sh new file mode 100755 index 0000000000..6ccd87fafd --- /dev/null +++ b/board/udoo/mx6qdl/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -d -m 755 $TARGET_DIR/boot +$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ + -n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr diff --git a/board/udoo/mx6qdl/post-image.sh b/board/udoo/mx6qdl/post-image.sh new file mode 100755 index 0000000000..18e76aa40d --- /dev/null +++ b/board/udoo/mx6qdl/post-image.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 86ad13bbf3..2cf13ae559 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -3,27 +3,30 @@ 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.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/mx6qdl/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/mx6qdl/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/mx6qdl/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" +BR2_LINUX_KERNEL_INSTALL_TARGET=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From patchwork Sat Oct 10 06:30:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1379915 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=If65oUlj; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C7Zft5CLrz9sSG for ; Sat, 10 Oct 2020 17:24:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0300B87726; Sat, 10 Oct 2020 06:24:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q6IjJ5LDkspe; Sat, 10 Oct 2020 06:24:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5DD6F8784A; Sat, 10 Oct 2020 06:24:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 51F941BF84C for ; Sat, 10 Oct 2020 06:24:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4883A8778C for ; Sat, 10 Oct 2020 06:24:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L-UG+vesS6kw for ; Sat, 10 Oct 2020 06:24:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id BEF978776C for ; Sat, 10 Oct 2020 06:24:39 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id l2so12996577lfk.0 for ; Fri, 09 Oct 2020 23:24:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xbwNL3lZYVDNe2H5VTd3WpKusf3u7DLdaESAFSt6bjA=; b=If65oUlj5rl3+gV29SGPdS8f1A7zFZWya+8z1Wxjm8xrOE1ZGj8BsWCN6JMv+8T0mw 60Bz1TwIgb2wdmBAZQFFhNDjgyR99/Ejxbnc8a1PN3FL4kz9hNkyyFWackRFSX2lWsM2 8bHcBRJC34PIvzkE1HZyvkMLkcyNRf1qrs2Dwf3qLBBUWjQr3nNY0X6ic2m1OUJpdv3s padVEhr2eAdSGUCnyPUN4W8gbfVu94vkG6KeHEIXzO4oRvhP6gwhW5bituDaY00i5ite GufWIJoia63ZKHcdA0C7eEpRNu9x/qn2iCXNVjDq+TAZLqJFcnxV4JKkf+zFHOsmzMmA GWtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xbwNL3lZYVDNe2H5VTd3WpKusf3u7DLdaESAFSt6bjA=; b=Ghf8K3WK3SDcz5Tqm+yDjc4AQamef/cc9juNwte74yQB5hfXMRyyZrjhTVjv/O0gaN HOHK1LXOa+/pTP2dadhTFtTJOcfahM1Ijn99hl08mYWtQHpeC48U7xBJrx4c8UHQ+Q8E adg9EyaRcg6nQvxqfApSWOSv7eaggMZ/0Cyd9gfL6GA8OCogJJ8kRZ5v12IS5iFAstes PI9/+HAFBQFEmCzEpv38poazPVIb3/hX0CJ5T3NTTv7nhkeNA/Mi7nr2dT7Q53lO8WOz l1ei0zSn9UUGIikIZkugBx1arafed5V95Hyb/lSu/URpRovtX/oBYrdO0sCuh3MNoVjW IshQ== X-Gm-Message-State: AOAM533wXYKabX24MubyXYChBXJ1vkT9xADOGYmGFS0lMZDyH8l3oSku y+MFMsY+4JfGEez1JzkXOUsccCLrAHs= X-Google-Smtp-Source: ABdhPJyIzzLEhZDumDiqXijpSAKke1m6w4qGp1xMchqEJYuMVL2PR2wWiDElGnSBAc/JBFZbxdo0Kw== X-Received: by 2002:a05:6512:2fc:: with SMTP id m28mr4972924lfq.100.1602311077564; Fri, 09 Oct 2020 23:24:37 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id z21sm1943870lfb.20.2020.10.09.23.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 23:24:37 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sat, 10 Oct 2020 09:30:20 +0300 Message-Id: <20201010063022.448414-4-geomatsi@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201010063022.448414-1-geomatsi@gmail.com> References: <20201010063022.448414-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/5] board/udoo: use common image generation files X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , Sergey Matyukevich Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Both Udoo boards use the same set of boot scripts and image generation scripts. Move all such scripts and files to common directory in order to avoid duplication. Signed-off-by: Sergey Matyukevich --- board/udoo/{mx6qdl => common}/boot.scr.txt | 0 board/udoo/{neo => common}/genimage.cfg | 9 ------ board/udoo/{mx6qdl => common}/post-build.sh | 0 board/udoo/{mx6qdl => common}/post-image.sh | 0 board/udoo/mx6qdl/genimage.cfg | 32 --------------------- board/udoo/mx6qdl/readme.txt | 2 +- board/udoo/neo/boot.scr.txt | 7 ----- board/udoo/neo/post-build.sh | 7 ----- board/udoo/neo/post-image.sh | 15 ---------- board/udoo/neo/readme.txt | 2 +- configs/mx6sx_udoo_neo_defconfig | 4 +-- configs/mx6udoo_defconfig | 4 +-- 12 files changed, 6 insertions(+), 76 deletions(-) rename board/udoo/{mx6qdl => common}/boot.scr.txt (100%) rename board/udoo/{neo => common}/genimage.cfg (50%) rename board/udoo/{mx6qdl => common}/post-build.sh (100%) rename board/udoo/{mx6qdl => common}/post-image.sh (100%) delete mode 100644 board/udoo/mx6qdl/genimage.cfg delete mode 100644 board/udoo/neo/boot.scr.txt delete mode 100755 board/udoo/neo/post-build.sh delete mode 100755 board/udoo/neo/post-image.sh diff --git a/board/udoo/mx6qdl/boot.scr.txt b/board/udoo/common/boot.scr.txt similarity index 100% rename from board/udoo/mx6qdl/boot.scr.txt rename to board/udoo/common/boot.scr.txt diff --git a/board/udoo/neo/genimage.cfg b/board/udoo/common/genimage.cfg similarity index 50% rename from board/udoo/neo/genimage.cfg rename to board/udoo/common/genimage.cfg index 46209120f0..79d3ba6fee 100644 --- a/board/udoo/neo/genimage.cfg +++ b/board/udoo/common/genimage.cfg @@ -1,12 +1,3 @@ -# Minimal SD card image for the MX6SX Udoo Neo board -# -# The SD card must have at least 1 MB free at the beginning. -# U-Boot and its environment are dumped as is. -# A single root filesystem partition is required (Ext4 in this case). -# -# For details about the layout, see: -# http://wiki.wandboard.org/index.php/Boot-process - image sdcard.img { hdimage { } diff --git a/board/udoo/mx6qdl/post-build.sh b/board/udoo/common/post-build.sh similarity index 100% rename from board/udoo/mx6qdl/post-build.sh rename to board/udoo/common/post-build.sh diff --git a/board/udoo/mx6qdl/post-image.sh b/board/udoo/common/post-image.sh similarity index 100% rename from board/udoo/mx6qdl/post-image.sh rename to board/udoo/common/post-image.sh diff --git a/board/udoo/mx6qdl/genimage.cfg b/board/udoo/mx6qdl/genimage.cfg deleted file mode 100644 index 46209120f0..0000000000 --- a/board/udoo/mx6qdl/genimage.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# Minimal SD card image for the MX6SX Udoo Neo board -# -# The SD card must have at least 1 MB free at the beginning. -# U-Boot and its environment are dumped as is. -# A single root filesystem partition is required (Ext4 in this case). -# -# For details about the layout, see: -# http://wiki.wandboard.org/index.php/Boot-process - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "SPL" - offset = 1K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.img" - offset = 69K - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - offset = 1M - size = 512M - } -} diff --git a/board/udoo/mx6qdl/readme.txt b/board/udoo/mx6qdl/readme.txt index cf1a610421..2e439ffa4c 100644 --- a/board/udoo/mx6qdl/readme.txt +++ b/board/udoo/mx6qdl/readme.txt @@ -14,4 +14,4 @@ directory, ready to be dumped on a micro SD card: dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in -board/udoo/mx6qdl/genimage.cfg. +board/udoo/common/genimage.cfg. diff --git a/board/udoo/neo/boot.scr.txt b/board/udoo/neo/boot.scr.txt deleted file mode 100644 index 7a8aa4bd54..0000000000 --- a/board/udoo/neo/boot.scr.txt +++ /dev/null @@ -1,7 +0,0 @@ -setenv finduuid "part uuid mmc 0:1 uuid" -run finduuid -run findfdt -setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdtfile} -load mmc 0:1 ${loadaddr} boot/zImage -bootz ${loadaddr} - ${fdt_addr} diff --git a/board/udoo/neo/post-build.sh b/board/udoo/neo/post-build.sh deleted file mode 100755 index 6ccd87fafd..0000000000 --- a/board/udoo/neo/post-build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -d -m 755 $TARGET_DIR/boot -$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ - -n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr diff --git a/board/udoo/neo/post-image.sh b/board/udoo/neo/post-image.sh deleted file mode 100755 index 18e76aa40d..0000000000 --- a/board/udoo/neo/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - diff --git a/board/udoo/neo/readme.txt b/board/udoo/neo/readme.txt index f037ad484a..4d9659e02f 100644 --- a/board/udoo/neo/readme.txt +++ b/board/udoo/neo/readme.txt @@ -13,4 +13,4 @@ directory, ready to be dumped on an SD card: dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in -board/udoo/neo/genimage.cfg. +board/udoo/common/genimage.cfg. diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 57b9562c06..bec87561bb 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -5,8 +5,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 5.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 2cf13ae559..bd0583b955 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -6,8 +6,8 @@ BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 5.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/mx6qdl/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/mx6qdl/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y From patchwork Sat Oct 10 06:30:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1379912 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eX4EycvC; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C7Zfp3Prlz9sSn for ; Sat, 10 Oct 2020 17:24:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C17B187835; Sat, 10 Oct 2020 06:24:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N-h5csfNjvdV; Sat, 10 Oct 2020 06:24:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1437E8772D; Sat, 10 Oct 2020 06:24:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EA13A1BF84C for ; Sat, 10 Oct 2020 06:24:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E69C48772D for ; Sat, 10 Oct 2020 06:24:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lnzlvDpRNOjC for ; Sat, 10 Oct 2020 06:24:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id F075D87726 for ; Sat, 10 Oct 2020 06:24:40 +0000 (UTC) Received: by mail-lj1-f194.google.com with SMTP id a15so11682360ljk.2 for ; Fri, 09 Oct 2020 23:24:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5mk90Mk9Jm/jbL00DGudWKblJth8tUy7NoTxWPM0sTs=; b=eX4EycvCYuCNSsEUmyKAIhwFUgvqu8H+kM8piMKp4G0EptI/POd/mWPtoi63SUtcjd pe7irvDiaXh8LwTmFCJ0aSxBu0AI0yQg19WMKpXA5F2Qb5D1k6LhaZL/8/qHXhvLFtIO SGw4F/yQUkUn9v+N+WTmB2EpxVREAo8P1tJOFRm/Bh2col6kH2G9awN2YWKFw2pAO6y8 UO36t493+hiP/wwKFjFOE1gt+MknQsRejO8Hl15IeJL8V/hWEsLe3Lw7AFMJ51fPgvFf OGbMqaA0//JuvRYSrq811+5hpuSgkiI3CmFCtIOosOvNsCoJMwi3ZW7EChBMH+2oq3Ku I/pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5mk90Mk9Jm/jbL00DGudWKblJth8tUy7NoTxWPM0sTs=; b=VtMk0Fi0qCpdd+sPY5XZVovwlaMArcAtOHqFXKVviGbfEAj5gVE6y+hwRgOyZcEGP9 ECmg/bxR9EP6CQ8w4167m20iP690uAtD7mxtB8o/l+R2Z0SBYepPd3drcQIcPKUFzeAu cbYvwoCV8XNZD/MxSyw4AjqIpZ11N9G0gFTh1hqHStrVCKt2FNny2BC7jMc+tRnA7XLi 0NVozZy4mgKsVQpgbswBWTiNuq3mEAgyTjYJTEwJOdTDUrlWiOo2e5L89tSaCtw+LsWz FIQZEkeH4lurP755jMNhknn6tQZVt0RWYwz245/bJULv02OfHHat0Jr/GTewjDMeDn7D arSg== X-Gm-Message-State: AOAM532n+A3czb6uKAGz3ujlMlhfayufvvRFl0axr6vnRtYZAyrvuunp IKaOsORocAxUGdELipK72rfF8Jry0aw= X-Google-Smtp-Source: ABdhPJwFZq4oD4zToqOppVY8+N8d3xnZ526X/tL6ztQn3s1SAKQefwJGtiAiteV274QXJ2HrEvDZAA== X-Received: by 2002:a2e:879a:: with SMTP id n26mr6738416lji.347.1602311078455; Fri, 09 Oct 2020 23:24:38 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id z21sm1943870lfb.20.2020.10.09.23.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 23:24:37 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sat, 10 Oct 2020 09:30:21 +0300 Message-Id: <20201010063022.448414-5-geomatsi@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201010063022.448414-1-geomatsi@gmail.com> References: <20201010063022.448414-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/5] board/udoo/mx6qdl: disable usb device in device tree X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , Sergey Matyukevich Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" After BSP update Udoo Quad/Dual board once again hangs on boot. On a new kernel disabling CONFIG_USB option is not enough to work around the troublesome usb host on Udoo Quad/Dual board. So it makes sense to disable usbh1 block in device tree rather than fine-tune kernel configuration. Replace Linux configuration fragment by dts patch. Signed-off-by: Sergey Matyukevich --- board/udoo/mx6qdl/linux.fragment | 1 - .../linux/0000-udoo-disable-usbh1.patch | 26 +++++++++++++++++++ configs/mx6udoo_defconfig | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) delete mode 100644 board/udoo/mx6qdl/linux.fragment create mode 100644 board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch diff --git a/board/udoo/mx6qdl/linux.fragment b/board/udoo/mx6qdl/linux.fragment deleted file mode 100644 index 1d2509982b..0000000000 --- a/board/udoo/mx6qdl/linux.fragment +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_USB is not set diff --git a/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch b/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch new file mode 100644 index 0000000000..d151a40d6e --- /dev/null +++ b/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch @@ -0,0 +1,26 @@ +[PATCH] ARM: dts: imx6qdl-udoo: Disable usbh1 to avoid kernel hang + +Currently the kernel hangs when USB Host1 is enabled due to the lack of +support for controlling the USB hub clock and GPIO reset line. + +Peter Chen has made several attempts to fix this problem, but his series +has not been applied yet, so better disable USB host1 for now to avoid +the kernel hang. + +Signed-off-by: Fabio Estevam +--- + +diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi +index 828dd20cd27d..c9e122865312 100644 +--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi +@@ -292,7 +292,8 @@ &usbh1 { + pinctrl-0 = <&pinctrl_usbh>; + vbus-supply = <®_usb_h1_vbus>; + clocks = <&clks IMX6QDL_CLK_CKO>; +- status = "okay"; ++ /* currently USB support causes a kernel hang. Disable it for now */ ++ status = "disabled"; + }; + + &usbotg { diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index bd0583b955..5be82e5e39 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -3,6 +3,7 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y +BR2_GLOBAL_PATCH_DIR="board/udoo/mx6qdl/patches" # Linux headers same as kernel, a 5.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" @@ -21,7 +22,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/mx6qdl/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" BR2_LINUX_KERNEL_INSTALL_TARGET=y From patchwork Sat Oct 10 06:30:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1379916 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=J/7e9ZKW; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C7Zg116pfz9sSG for ; Sat, 10 Oct 2020 17:25:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E313D20451; Sat, 10 Oct 2020 06:24:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0WbzmRHMO6fo; Sat, 10 Oct 2020 06:24:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A598420464; Sat, 10 Oct 2020 06:24:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0989B1BF84C for ; Sat, 10 Oct 2020 06:24:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 030DB87775 for ; Sat, 10 Oct 2020 06:24:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UIchLpy95PQ1 for ; Sat, 10 Oct 2020 06:24:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 372A48777D for ; Sat, 10 Oct 2020 06:24:41 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id a9so12963399lfc.7 for ; Fri, 09 Oct 2020 23:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AZrPuTDnuTOuVdBqUtcnTf6lbV9LuURseHi88XVgMqA=; b=J/7e9ZKW7iapUthoNGxcwWKgENHf6dJ0Njp8TrpTjLRc0SNS6kxcWl5kJN24HolNfz A8ZnhBF6V4F0UjSMLdeYvPCufNIgTnJsQr38t5JREQcahMOg9lx2tUExqI3wsKsWnaSQ FUxouEwpZLvDL5y4StSSSgMa2hI4XqvRH/5zC2zOrS0VznKOeaGr103pkkIGxDJ4Nbvt veNlqvaZD7AR7iCeOplh4zvnu0XpJVZ6uTnJAJ1vr3xYLjdEv0ryk/CyTGJfTK1ttEEY qlOvH3BDtmWk+PL6u9LPwf6zKMdSLKCRnJ6Xa4Lo3b7QdM8DR9KYKut21BuQldUb4VJg 5GuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AZrPuTDnuTOuVdBqUtcnTf6lbV9LuURseHi88XVgMqA=; b=oXDRgufStzcdXeVIDf0tt9WM7ALdhPb13T7Y6oPPFFtYwLFX/GxkHn0GCrV/T+5Vy8 ago2t+aMZ/TjrMjVX367StESsmj2BLqNUpz99NIgqR8t+taznmTxqh1CCaf98rVPU+lC DWCiZwjiyMca6D/HHojazCzh0G5YDmzzJFNrmyE90p9uy7bZAZ0VEJvoDGzbEi5fgyT+ BRpe8mFP2EtxYfM5Q2jBPk6YY0PMdgoKepbdXZkwKf4CXkbi/6nCVPa3FL9gU5/AWkci 5QPcu+tz7GJFTctDH6CVXImJUqcYZhQe2N8iaMUXaGDDkxdCCQ2hnovb8G7YjtJFSG9z s2vg== X-Gm-Message-State: AOAM533sIr2nGWmzP4z9D1ayJ84bYiVnffSactqNKMF7MPiOauFAooZr TZsSD1tibXhUuOD60UzlKUOXV0TLZ2k= X-Google-Smtp-Source: ABdhPJwtgGy/GU8riTFPJW/Xy0msflWITucWjI5Q9KfuFz3uFG8/1I65mcJq6R/P/Vu6II3Qyx8Vrw== X-Received: by 2002:a19:8005:: with SMTP id b5mr5047463lfd.70.1602311079142; Fri, 09 Oct 2020 23:24:39 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id z21sm1943870lfb.20.2020.10.09.23.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 23:24:38 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sat, 10 Oct 2020 09:30:22 +0300 Message-Id: <20201010063022.448414-6-geomatsi@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201010063022.448414-1-geomatsi@gmail.com> References: <20201010063022.448414-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/5] board/udoo: drop custom post-image script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , Sergey Matyukevich Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use generic genimage.sh script instead. Signed-off-by: Sergey Matyukevich --- board/udoo/common/post-image.sh | 15 --------------- configs/mx6sx_udoo_neo_defconfig | 3 ++- configs/mx6udoo_defconfig | 3 ++- 3 files changed, 4 insertions(+), 17 deletions(-) delete mode 100755 board/udoo/common/post-image.sh diff --git a/board/udoo/common/post-image.sh b/board/udoo/common/post-image.sh deleted file mode 100755 index 18e76aa40d..0000000000 --- a/board/udoo/common/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index bec87561bb..e22f6a35af 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -6,7 +6,8 @@ BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 5.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/udoo/common/genimage.cfg" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 5be82e5e39..388c9c7b64 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -8,7 +8,8 @@ BR2_GLOBAL_PATCH_DIR="board/udoo/mx6qdl/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/udoo/common/genimage.cfg" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y