From patchwork Mon Jun 10 19:35:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joris OFFOUGA X-Patchwork-Id: 1113299 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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.b="ARSlS8VI"; 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 45N3Jr1XsLz9s6w for ; Tue, 11 Jun 2019 05:35:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 563C92041E; Mon, 10 Jun 2019 19:35:54 +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 poZXkFZBJyUu; Mon, 10 Jun 2019 19:35:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id BB5BE20445; Mon, 10 Jun 2019 19:35:48 +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 5D7D61BF47D for ; Mon, 10 Jun 2019 19:35:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 54E2186576 for ; Mon, 10 Jun 2019 19:35:47 +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 LDFfTLXMxyLg for ; Mon, 10 Jun 2019 19:35:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 30F518651E for ; Mon, 10 Jun 2019 19:35:46 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id x15so493867wmj.3 for ; Mon, 10 Jun 2019 12:35:46 -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; bh=Jz9XMsTrOeEJt9tcRaG4PUkLFagufJGM1OcVyun1T/8=; b=ARSlS8VIjGgp7SjzIuAQch4TyguEA6AFURTTPysd8TBNj3ALLAwS4Vke/RVqK4/ASJ F16DNtyKFy+ouqQ1y4bsB5fjEkMgtBCvfijqQYm6M16lYLn4+wSP52tI6qSuuDYgCi2Y w8SJ9jUCy66KJvsT1CEpdCGIPcJMD8SbiaqM4FsOHV9NKpWxz0Mtnf86qWnGYEfxuJaP f6aJMVr8pr/p5XYBGnqbS0cUb6CR43+p1GmDSKbodSsAXvZkCc51HEeqlTmFFOt/zN2D rIah81UDqC1ObBtWAMci0VtvB52Vata9nTxVjsAdCVqB3B68NJjPMcHbgao8ToWVaNKt cIMg== 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; bh=Jz9XMsTrOeEJt9tcRaG4PUkLFagufJGM1OcVyun1T/8=; b=KuIBSxpui+5KDP2PgMWxgR/yDd+HBAhtuXrtZ7T9I2h1SYOesVEvI1JwJJDq4smSvH fC8kjqVfE7iB5EvBly64XFq+jOloShC8WL6k587PJ+2MoiMJvPFIuYs2KyZbYs1Mf0Wr fOHpbztdG9fTrSsYVRq/VzqeZjLYaIEzmuJ/kaaRr1Jqj+w5rowsPuyaYhEpsZTG3ZCM 324cMoLIJsqzjNBTAr7kWjZEO7cV2tYHfiwZvt5/tr0k1VkFkV3MwruwECMU6mCZ9Lut SfwBK60F1XALVys0K83UA4fZDEnxDNGl0r9XP/9Ir8SCsAuOl0SdVopCd0TDsLS7T5Cs EAjA== X-Gm-Message-State: APjAAAVVFfH+BmPfPdzvGXpZoixa9nhLnJXHPX96WcalUGosFncH7SVE 7Q0T/l7Kc2l6YU2QvUKR5kKQa3KOjnI= X-Google-Smtp-Source: APXvYqwg+T6GSFXoTzVFZxJnVrAjbdkgnzVBaxKDu+WhvS7jJ7dL7qep36EopEsuYq2WDWwbFtqVoQ== X-Received: by 2002:a05:600c:218d:: with SMTP id e13mr14863290wme.101.1560195344536; Mon, 10 Jun 2019 12:35:44 -0700 (PDT) Received: from furher.home ([2a01:cb19:16b:9900:a924:2336:79a9:d19d]) by smtp.gmail.com with ESMTPSA id y133sm922035wmg.5.2019.06.10.12.35.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 12:35:44 -0700 (PDT) From: Joris Offouga To: buildroot@buildroot.org Date: Mon, 10 Jun 2019 21:35:35 +0200 Message-Id: <20190610193540.25174-2-offougajoris@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190610193540.25174-1-offougajoris@gmail.com> References: <20190610193540.25174-1-offougajoris@gmail.com> Subject: [Buildroot] [PATCH 2/3] configs/imx7dpico: Bump Linux and U-Boot 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: Joris Offouga , Fabio Estevam MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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. Signed-off-by: Joris Offouga Tested-by: Pierre-Jean Texier --- .../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 diff --git a/board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch b/board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch deleted file mode 100644 index 59408bcd7a..0000000000 --- a/board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6d298b0fcacfc555f93864fa45fb612140902388 Mon Sep 17 00:00:00 2001 -From: Fabio Estevam -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 ---- - 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 - diff --git a/board/technexion/imx7dpico/readme.txt b/board/technexion/imx7dpico/readme.txt index cda3f285eb..07e089c38e 100644 --- a/board/technexion/imx7dpico/readme.txt +++ b/board/technexion/imx7dpico/readme.txt @@ -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 diff --git a/board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf b/board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..4824aff079 --- /dev/null +++ b/board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf @@ -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 diff --git a/configs/imx7dpico_defconfig b/configs/imx7dpico_defconfig index 93e3fd7414..cd12e282ef 100644 --- a/configs/imx7dpico_defconfig +++ b/configs/imx7dpico_defconfig @@ -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