From patchwork Sat Sep 14 12:05:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1162330 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.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="RImylLm4"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Vrn75GT7z9sNF for ; Sat, 14 Sep 2019 22:05:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DCB0787120; Sat, 14 Sep 2019 12:05: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 zzYiTcswxtDE; Sat, 14 Sep 2019 12:05:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E33B286AF9; Sat, 14 Sep 2019 12:05:40 +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 4D4DD1BF310 for ; Sat, 14 Sep 2019 12:05:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4620386B30 for ; Sat, 14 Sep 2019 12:05:39 +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 DqusmKk1J36X for ; Sat, 14 Sep 2019 12:05:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 04A0486A4F for ; Sat, 14 Sep 2019 12:05:38 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id a23so26988324edv.5 for ; Sat, 14 Sep 2019 05:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ggdZjAxGJZLoziBc26yuvDcSvFkApVp9QslQGUmUwJU=; b=RImylLm4yl7kR8rIRCQsn23pobVR3vYFPCVXpcjlVtPxsn23X74ZRV+16453QWlASF q2KYvc8/L5Hu7rIo9t9l7u4d2R8upKBOW7i1IQZ8yz37lwLA+VB4a/bSJiHsEHFJNP4H pgAPqqNTTfDTkJ7QzUU56n+LgpcD+48NotMFw34dW0c45hm7HjitIyjG4ZdP2/BFsrYy ZUMtYlfWJFoxpy4N3y3v3iT0KtE0IGVywdKNfkrMe0Sv/UCm9DTUI75jhi7zI1Nr1I69 tRLh7dI/4FvUoJUAqqM7S0OFQ1nhykzKsPDzDgcNHPcb8fPxXnjrtSdUic2OUcvTprJU 7KaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=ggdZjAxGJZLoziBc26yuvDcSvFkApVp9QslQGUmUwJU=; b=DLfnEEXatECmvSsHenJ3szv42V9RWE2EwVEd6EKY/naaejQM9o7r7zFcIafj1styNL YrcXeMPwgoYn4Rnk7/5aMCD7+W37rKl/eaKL9Hl4nvYsFVggzwRw4unkzsCCGFGkHeyD 6ZhkJrU4MWEAyerzyu6IbNpyViqIzLmgAIT9pVrJSKyHlZxt9klj6USLLXgeLTReahoJ OaFdgHBcY9ZORptwTbdvGc6PLmtQ4Gb6gSH63HFVaXHLY4/YeIM+Lg6PWxHu/cViQofD STNxFdciZrYBbBY41ii3nrCekzP2iOYRkGH7MVeVR1eUu1wuJjmkwstqNM+dvs9X73f2 B3/w== X-Gm-Message-State: APjAAAWpBn7GaXRB4J8iNzuQdmURBjzYjhq/uB5Uz3b5vkzwYG3YqqZL opf3+7L3NcI/0jMrrmBXu/n7bHeR X-Google-Smtp-Source: APXvYqxz/kdk5a+ETqhBUl6RVm2m8+B9J2JFYH/S0EA3Qt8QDjj08VhhLDiD5DjpF/4sYDnff3DtdQ== X-Received: by 2002:aa7:da8b:: with SMTP id q11mr52134439eds.19.1568462735912; Sat, 14 Sep 2019 05:05:35 -0700 (PDT) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id 36sm5165128edz.92.2019.09.14.05.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Sep 2019 05:05:35 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1i96o2-0004OM-NN; Sat, 14 Sep 2019 14:05:34 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Sat, 14 Sep 2019 14:05:28 +0200 Message-Id: <20190914120530.16829-1-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] configs/raspberrypi0w: fix dts file name after kernel bump 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: Peter Korsgaard , Peter Seiderer , Martin Bark Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes #12816 Commit 42d22f3bdba41da ({configs/raspberrypi,package/rpi-firmware}: bump kernel/firmware to 20190819 version) updated the kernel version but failed to take into consideration that the rpi0w dts file has been renamed: https://github.com/raspberrypi/linux/commit/6f91b5dbfdb62a434571a73f2dc15181963e3bea Fix it by renaming the dts/dtb file referenced from the kernel build and genimage. Signed-off-by: Peter Korsgaard --- board/raspberrypi/genimage-raspberrypi0w.cfg | 2 +- configs/raspberrypi0w_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi/genimage-raspberrypi0w.cfg b/board/raspberrypi/genimage-raspberrypi0w.cfg index 3aafd9b6fc..f76256ef8a 100644 --- a/board/raspberrypi/genimage-raspberrypi0w.cfg +++ b/board/raspberrypi/genimage-raspberrypi0w.cfg @@ -1,7 +1,7 @@ image boot.vfat { vfat { files = { - "bcm2708-rpi-0-w.dtb", + "bcm2708-rpi-zero-w.dtb", "rpi-firmware/bootcode.bin", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 2a567cbb03..57276aa8f7 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -12,7 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20190819-1)/linux-raspberrypi-kernel_1.20190819-1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y