From patchwork Sun Jun 9 14:57:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joris OFFOUGA X-Patchwork-Id: 1112653 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.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.b="cU9Cs4Bs"; 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 45MKBj6rkDz9s6w for ; Mon, 10 Jun 2019 00:58:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7275A85B04; Sun, 9 Jun 2019 14:58:03 +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 ffkG2TnJUHgf; Sun, 9 Jun 2019 14:58:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4ED3D854D0; Sun, 9 Jun 2019 14:58:01 +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 E420B1BF59C for ; Sun, 9 Jun 2019 14:57:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DD5052002F for ; Sun, 9 Jun 2019 14:57:59 +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 7oPOCB20j04p for ; Sun, 9 Jun 2019 14:57:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id 811CF1FF59 for ; Sun, 9 Jun 2019 14:57:58 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id n4so6650564wrs.3 for ; Sun, 09 Jun 2019 07:57:58 -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; bh=HHwwiBIXzP1XGpq1vRtbRCJkxH50vHWAu+CIlbn3+t0=; b=cU9Cs4BsAuiM3FnKI//dF+0+3lSBpeLrSXBpnh0PLtLmuwA31x9kbMusB8rUJilM1V syCKhUtcOzGwpHSXmFF4EOzkq+pcRvAsigmEsYTFRC5x3X2HrfVDllc/qKtIxbDaR/lR wLwC9788K6BaMarxPcIToGo+8So0MeO930T+WsOTKc1+uP1J+rCo9cTzA5gcNhq2e5tx lNsonsyHIxo+Q9tRvLXkZO11r9uDDn7jCOQNe0kRFkaUCuCD5T/aIiGeOy9pb53LYpDd W6yVWJQ6ZZn4o3VluIwNKGa9gZWynHov0/QylKTzMLZkLQnMMHKftNIqTkxuoTkIPAXc JlUQ== 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; bh=HHwwiBIXzP1XGpq1vRtbRCJkxH50vHWAu+CIlbn3+t0=; b=payzcDyezGbiVntvH2urj4yiik6z1bwC1LcR0HxZXPGHa0GhWgxfET4ILz6UfBw8zq uLS7P7FJvEKdXM/cSemncRD22XQOzICwc9FFuz238ITthpKQnkVoN27+AXYH/xg+E7yb 9db60Q2EJI2XGaffBakSl0tfItgqpf0CVMeYMBNxuirsO1W7KMYa6YJ+OyL049teCYVM jEfPs0v+Rj10lPClRx1MGWILMxHQqMYxGP9G/hX8cD3aHr6+g3RupnYEkd/Vm5Nxm+4z i30m7C4iBsI/jsHH2UxbknnGNdYXIa/qirJdXw9NmGDTFeDngUjzfeGjVEqgbeey1VrU uWNg== X-Gm-Message-State: APjAAAUsxIpgVCKfZl+ZMHKel6rtuYZp9BgihoTtQnM/K7QaLaQ1UwIH MC0uNO+3okzgOcriL4RFMLOgBcpq7qc= X-Google-Smtp-Source: APXvYqyeS0JaIJnLsdbNgMD4luCWeJbKIDyEHYb9oHEdqnacldGo6uj+hoKFmWibasNYrKlrA+Dgvg== X-Received: by 2002:adf:fdc2:: with SMTP id i2mr24333415wrs.146.1560092276747; Sun, 09 Jun 2019 07:57:56 -0700 (PDT) Received: from furher.home ([2a01:cb19:16b:9900:38ad:5796:9d4b:19c2]) by smtp.gmail.com with ESMTPSA id 11sm7504448wmd.23.2019.06.09.07.57.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jun 2019 07:57:56 -0700 (PDT) From: Joris Offouga To: buildroot@buildroot.org Date: Sun, 9 Jun 2019 16:57:47 +0200 Message-Id: <20190609145749.28766-1-offougajoris@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/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" 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. 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