From patchwork Tue Mar 13 18:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rafal Susz X-Patchwork-Id: 885347 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="XoXjPkXe"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4012h86F7mz9sT8 for ; Wed, 14 Mar 2018 05:00:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A7DA287500; Tue, 13 Mar 2018 18:00:21 +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 7XZmrCDGZJTV; Tue, 13 Mar 2018 18:00:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1035B87562; Tue, 13 Mar 2018 18:00:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0AD441C05B5 for ; Tue, 13 Mar 2018 18:00:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 07F0487562 for ; Tue, 13 Mar 2018 18:00:20 +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 l_sfkxVY53BR for ; Tue, 13 Mar 2018 18:00:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B4E7687500 for ; Tue, 13 Mar 2018 18:00:18 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id p74-v6so765162lfd.3 for ; Tue, 13 Mar 2018 11:00:18 -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=wYPYeOS0/WaeWHLUaBJpIRTqrR3pKQLGd2v+IRYcVf0=; b=XoXjPkXeoXsMTjxiBUEoTHDT+tadlrYBVxmo1suPk9NQHnfXadOFigfYJA7y9YBlFO E2iXq++QvYXKwhH/mn2+DW8a+JKI9fgJA0UydBkctvW4ME3drs+yurYR1pc/Tt0ZgrS8 ODPKKbhMDnhQFIzJuhD+dbKIXwZnNC/D2D4cRcT58sVW091dk2dI6egZBKYKYPiNUF6U u8fooJWrsAM6G5skclr3OSDlTYEf22Po/sMlZLt5Mocypl/M2/yHLLIh6/qtVsJ/yeFQ 1mpFrKwdNmJDGnwUygo1WHUKGUiK843dJ5ylSk4Kc2F9ZDD/uflgUruPBlQaPqCvYbeQ P87g== 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=wYPYeOS0/WaeWHLUaBJpIRTqrR3pKQLGd2v+IRYcVf0=; b=ie/6PFuJWiR7gKcXkERzNe7hZiiMowsRZkz/Fdg+PwiCnXynmp6vDdAKnYudCQs2CW OaReMlSBBWvSCiNEPrBQk4qngx/hJ4B8WJD+4nJSPYrAuzqlk3t9nrco0ZXAMiNUWq20 0J86YUROZUxLIy3EW0uhK1/znmtJcyWHKRRScY4GODxKDb3H0zUYFIV7RNleOIvisDFe 7rTZexrOQH9j7atuXlEpu5QtnDP5xUr0un3x/UQgwCrgMpUC5DAxR0LPVYMDLCsY0C7J FyaZPLH+1SaY2kSI2JZqWoMdCtiOajNEDDjA1k1Hn/Tg4LYLMfBA0Ox9SQK17XaA0MVN 4lfQ== X-Gm-Message-State: AElRT7Hrlj2fYzdS55Wy3lHVFjTT/yrfoM5rdiVjNCaWYVRceUATsh5V xh0Ki3zGv7Pey59c/pn47OwncvPZ X-Google-Smtp-Source: AG47ELvyOAw638NHPGk/kEkLE/V2aeHtxJUAbbqLGTBaZoVd4kHeYoY4CSnoDbYbrv6FzyzFMH3dIA== X-Received: by 10.46.99.130 with SMTP id s2mr1117481lje.17.1520964016384; Tue, 13 Mar 2018 11:00:16 -0700 (PDT) Received: from hdebnix.gdynia.vectranet.pl (095160149204.unknown.vectranet.pl. [95.160.149.204]) by smtp.googlemail.com with ESMTPSA id c70sm156581ljf.34.2018.03.13.11.00.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 11:00:15 -0700 (PDT) From: Rafal Susz To: buildroot@buildroot.org Date: Tue, 13 Mar 2018 19:00:05 +0100 Message-Id: <20180313180006.5364-1-rafal.susz@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180313142635.27423-1-rafal.susz@gmail.com> References: <20180313142635.27423-1-rafal.susz@gmail.com> Subject: [Buildroot] [PATCH 1/2] package/linux: fix custom dts files handling X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rafal Susz , yann.morin.1998@free.fr MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Custom dts files are still conditionally copied based on non existing boolean. So it is currently not possible to use custom dts file(s) at all. List of dts files is now iterated and files are copied into dedicated kernel arch dir. Signed-off-by: Rafal Susz Tested-by: Jan Kundrát --- linux/linux.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index e98b25cb72..cf1cae7cc0 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -370,8 +370,9 @@ endif # Compilation. We make sure the kernel gets rebuilt when the # configuration has changed. define LINUX_BUILD_CMDS - $(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS), - cp -f $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/) + @for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \ + cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ; \ + done $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \ @@ -482,9 +483,9 @@ $(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUST endif endif -ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y) +ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:) $(error No kernel device tree source specified, check your \ -BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings) +BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings) endif endif # BR_BUILDING From patchwork Tue Mar 13 18:00:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafal Susz X-Patchwork-Id: 885348 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="pmotwOrN"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4012hd1vFGz9sT8 for ; Wed, 14 Mar 2018 05:00:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2B1832CA9D; Tue, 13 Mar 2018 18:00:46 +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 GelQ+OB-RZpo; Tue, 13 Mar 2018 18:00:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 974AD27B72; Tue, 13 Mar 2018 18:00:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 516681C05B5 for ; Tue, 13 Mar 2018 18:00:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4E54787572 for ; Tue, 13 Mar 2018 18:00:32 +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 dITHQYEaDsnV for ; Tue, 13 Mar 2018 18:00:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id ECE8287570 for ; Tue, 13 Mar 2018 18:00:30 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id x205-v6so777934lfa.0 for ; Tue, 13 Mar 2018 11:00:30 -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=ewZr3xeJBjSQmF7Aid70ABeKSxYoXl2hdRi03b5ZWW4=; b=pmotwOrNG6seY99FyQcJjkzVM+bqbUPc5AbC/qvpWIPg6RUShRfNtKv3gV5vUoOUGu p9ZyAAg3Ak/xmY7jf1x9L/wbSavRvIIUUMgw4+aQyvWb04x6QJGeN8ndbPM6aRuSK1SM YR6VYU4rq3OuRHKqAi6OoW9R6aG20DFlNekbghYUl4t+HW6TnsShGM06WEMQivD4emQS xC5Udw3Y4JDq1nK2wRDbvZzYsn7mYf/FBlAzuMYR29jWIGFt39Ma2rs874p2KrEFmtOK dKBahTvmc+4qKfob2dsL/uyV/wDYvM2ndfRIWZStcn8WQbcirPfL+mbYao7vJVEPgqRU OfQw== 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=ewZr3xeJBjSQmF7Aid70ABeKSxYoXl2hdRi03b5ZWW4=; b=pudQJihNXk5fq+tPfCJKfJ+XvINk7zTwrDVR7yeBbQRAWm3fmzUJrUQ9JJOS559YX0 6hJTyyvaKze+DOq2JNa3SHcExYrnKdNojdDOyTzs1pAt4LAKB4VQpKV9vBEVIVZetTND u8QJfqsDmKoV5nRp+8U+O1o20+TSLCUR+AHLONeU9qSqghuHU3Cle90hh+ouWwIOKRH4 YhqUWEuXzYJd4laq4Prjph1G9nt0AK7h/61M7xd+Omhw3sl0dSB21MTXhh6bqfXIPe7t RVuUL1kHxhiyqSqJRaV0lgsXNTypTf9rgj4h8DORMyM5DKbV0B7UlTv7pttfzrKQeVPg cxUA== X-Gm-Message-State: AElRT7FrcGUu/a1d6UkIkxmwfxcDqtrM7q0ZLORbyMGAkK38okmE/h0T Vc8LlwurP2BMukh4FTB9cykx6IzS X-Google-Smtp-Source: AG47ELu8xZLp5YiNAU3Rt0FqFA+FGaH8be5YDvfCc+iWM8ScJn7gOQIGbvHKT057BsX9d7hNOMkDPA== X-Received: by 10.46.33.86 with SMTP id h83mr1142393ljh.54.1520964028996; Tue, 13 Mar 2018 11:00:28 -0700 (PDT) Received: from hdebnix.gdynia.vectranet.pl (095160149204.unknown.vectranet.pl. [95.160.149.204]) by smtp.googlemail.com with ESMTPSA id c70sm156581ljf.34.2018.03.13.11.00.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 11:00:28 -0700 (PDT) From: Rafal Susz To: buildroot@buildroot.org Date: Tue, 13 Mar 2018 19:00:06 +0100 Message-Id: <20180313180006.5364-2-rafal.susz@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180313180006.5364-1-rafal.susz@gmail.com> References: <20180313142635.27423-1-rafal.susz@gmail.com> <20180313180006.5364-1-rafal.susz@gmail.com> Subject: [Buildroot] [PATCH 2/2] configs/s6lx9_microboard_defconfig: purge custom dts boolean X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rafal Susz , yann.morin.1998@free.fr MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since custom dts files are unconditionally handled *KERNEL_USE_CUSTOM_DTS is no longer available/needed. Signed-off-by: Rafal Susz --- configs/s6lx9_microboard_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/s6lx9_microboard_defconfig b/configs/s6lx9_microboard_defconfig index f77c80ba87..97b2d3fe79 100644 --- a/configs/s6lx9_microboard_defconfig +++ b/configs/s6lx9_microboard_defconfig @@ -10,5 +10,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/avnet/s6lx9_microboard/lx9_mmu_defconfig" -BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/avnet/s6lx9_microboard/lx9_mmu.dts"