From patchwork Fri Nov 9 15:26:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10676169 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF2995A4 for ; Fri, 9 Nov 2018 15:27:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9ADE428305 for ; Fri, 9 Nov 2018 15:27:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F17B2ED55; Fri, 9 Nov 2018 15:27:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 291AF28305 for ; Fri, 9 Nov 2018 15:27:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=X3QTyOzn1RFosN1A6lHLZwA9hT62Gt4o612YOuu+LbA=; b=CuosUuwYtLTFPfCIqbKDdKCY/E S9zCTYwKIZEPemBPkJ0+53w+R356LeRCIjhj8IhZiQp3Z7CnelOpy69+llrwEyu3PRd4ClHxTH1jI 46L+qyrZhAr2KJlInXayjlhC+QtUcAqA0lsp+C6SUgMKGqebC4YPiE9QR078ijZfi/0VDwUhmmHmi oOsqkbd9wnjtkusYMNg6T9OKKl39440EAr1PUbmqLx/9g9O4wG/QBlaEgQAuCL/d3VZ+/+hVc0O+Z /rDfgzB0DtIFJiaQKUbql+FQZJtstIKSEHAUt9m+mpX6OUy6oDEado59DRm6DDoDAUadkRqufuf9R LdytepWA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL8gt-0002et-8j; Fri, 09 Nov 2018 15:27:23 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL8gm-0002YI-3K for linux-amlogic@lists.infradead.org; Fri, 09 Nov 2018 15:27:19 +0000 Received: by mail-wm1-x343.google.com with SMTP id w7-v6so2391222wmc.1 for ; Fri, 09 Nov 2018 07:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kj5gu3vlN1RBW9DUGqxEP/WF3hW+SKF8qQ1LcVmGSwE=; b=glY9hMtN9mvRKT0ObtduGMT6A0kesTeqPXbk9jLeFP424WCRS95jwTN/YxwEGT3COt /8oiFVipEDDnABWxUC2eXyEryX0PAd4RwISxkbnNQ7l6hmtMqyLxohm7u3wtX0jfwr2C h5Yud0BaFO8egtaMSSsL8X6neCi4zj3PXEADZTI8H9YYlhS7daH1U7iPtVOPIU20L2nA dTj6A3qyFVBnkxlQn8MDA0ToP0+7ReUXOab8PPbMXSAKjhzl4IR4AgM7LyS2W/Z9FuY5 mBzKKFR5NMaIg7ZF7J3m+bESu9Nbm1fiFmlDS/wxBBlrbsU+sBrudYBqqhf92h2NhY2G alAA== 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=kj5gu3vlN1RBW9DUGqxEP/WF3hW+SKF8qQ1LcVmGSwE=; b=P2CCyVbJu3qha/bIp0Xc63g3H9hzeVofef2SYRavnvI4LlPDHexyLgwOumJKkVjQ0c QrQtXtk8k/cUWPcUNi2gxSqHStvl2nCx3m8//MImBPpUCBdFmILTXZ8WMtDhbLXUXkNj dPFEpEqaT3BblSWd2ItT6EKzifU4KMEmCuLC+GVakQBHoSDsytRODVnbuBF0mU/z4THh gYF68NEML4BlqK2ZsLr1vqv1CqzydTK1suGWUOYpcIpqc6ywK//WUpluI9ofivxte/tF Vg1q83jSFDca6LrxMIbxEVpeeQJMtPL1hNvXxfxFnzgaYJBpwWR33n/UE2VN8Kzh+rLn Zvng== X-Gm-Message-State: AGRZ1gJjAzdwoxWMTTKmF+KFSPR/vuVI9iwD8DxnAE+25W3N2pNaCs98 qHRHek32nDIf6YeXs560CV+c0w== X-Google-Smtp-Source: AJdET5fldVylQUt8Jq9FJMRjSlGJsmKUiq15vj1prnI2jsv9dMK2AqWVQJ312sguwCSlNSmnh0fvPA== X-Received: by 2002:a1c:8511:: with SMTP id h17-v6mr5040657wmd.127.1541777222968; Fri, 09 Nov 2018 07:27:02 -0800 (PST) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id a127-v6sm1748545wmh.24.2018.11.09.07.27.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Nov 2018 07:27:02 -0800 (PST) From: Neil Armstrong To: u-boot@lists.denx.de Subject: [PATCH u-boot 02/19] configs: meson: remove unnecessary MESON_FDTFILE_SETTING Date: Fri, 9 Nov 2018 16:26:41 +0100 Message-Id: <1541777218-472-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541777218-472-1-git-send-email-narmstrong@baylibre.com> References: <1541777218-472-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181109_072716_154871_33AB0125 X-CRM114-Status: GOOD ( 11.09 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, Neil Armstrong , trini@konsulko.com, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jerome Brunet MESON_FDTFILE_SETTING is used to define the default name of the fdt file in u-boot environment. We can easily derive it from CONFIG_DEFAULT_DEVICE_TREE instead. This will help factorize the code a bit Signed-off-by: Jerome Brunet Signed-off-by: Neil Armstrong --- include/configs/khadas-vim.h | 2 -- include/configs/libretech-cc.h | 2 -- include/configs/meson-gx-common.h | 2 +- include/configs/nanopi-k2.h | 4 ---- include/configs/odroid-c2.h | 4 ---- include/configs/p212.h | 4 ---- 6 files changed, 1 insertion(+), 17 deletions(-) diff --git a/include/configs/khadas-vim.h b/include/configs/khadas-vim.h index 6615f77..ff87c02 100644 --- a/include/configs/khadas-vim.h +++ b/include/configs/khadas-vim.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-khadas-vim.dtb\0" - #include #endif /* __CONFIG_H */ diff --git a/include/configs/libretech-cc.h b/include/configs/libretech-cc.h index a0856f9..95e0f34 100644 --- a/include/configs/libretech-cc.h +++ b/include/configs/libretech-cc.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-libretech-cc.dtb\0" - #include #endif /* __CONFIG_H */ diff --git a/include/configs/meson-gx-common.h b/include/configs/meson-gx-common.h index c46522e..c436976 100644 --- a/include/configs/meson-gx-common.h +++ b/include/configs/meson-gx-common.h @@ -44,7 +44,7 @@ "kernel_addr_r=0x01080000\0" \ "pxefile_addr_r=0x01080000\0" \ "ramdisk_addr_r=0x13000000\0" \ - MESON_FDTFILE_SETTING \ + "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ BOOTENV #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64 MiB */ diff --git a/include/configs/nanopi-k2.h b/include/configs/nanopi-k2.h index ef53f20..3fd6e8f 100644 --- a/include/configs/nanopi-k2.h +++ b/include/configs/nanopi-k2.h @@ -7,10 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* Serial setup */ - -#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-nanopi-k2.dtb\0" - #include #endif /* __CONFIG_H */ diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index d117b18..87e3ddb 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -7,10 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* Serial setup */ - -#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" - #include #endif /* __CONFIG_H */ diff --git a/include/configs/p212.h b/include/configs/p212.h index 2aa9f5d..4414293 100644 --- a/include/configs/p212.h +++ b/include/configs/p212.h @@ -9,10 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* Serial setup */ - -#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-p212.dtb\0" - #include #endif /* __CONFIG_H */