From patchwork Thu Nov 22 09:07:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 151733 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp483790ljp; Thu, 22 Nov 2018 01:09:13 -0800 (PST) X-Google-Smtp-Source: AJdET5eg4wto1oOss/zkvxkpYIBhWReEoybhNqSF56uVCfukjunCDtRRWZ0gpNwHi2IQFnBLtmgs X-Received: by 2002:a17:906:a3d2:: with SMTP id ca18-v6mr7440204ejb.88.1542877753583; Thu, 22 Nov 2018 01:09:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542877753; cv=none; d=google.com; s=arc-20160816; b=ZoyjnFNhh4IGGf9nMksYQupsuEEmoLyoVv8weJq2oI6DFtFXrHipdZkiMJaEfIA1dD 9srn81ZsfH6PbgmqPHabkTXFP7/8AQHmxq0jyIzhctu3xw6i9OcGfeC8O/LeIBxk5pCJ ouzodOLEdG7EHoXFzZD3LBvkE8K03NjlocelT7G0YF5Q600o4JDwV8+Gnm75cMsE1syk hcuSfdMweSZ+RLWX7r08gKktE2DlR8O4HqwS2qHxg9N6Uby4EoFla5e5K5NXFJnLW9Zl 2bSc4jIUmkxuW+2x1AAi/fPOOMX6MA1xNktf009yxBy38CE8NE/dN5HsYwV29QGSahjO OsDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=T4XksDjR0R4Ou7rPW/PtNchq3mHfBQBOG553gEuzch4=; b=rxJN51Q9zfbwhyCemv3kkQmFEs6Jvalv+rQ/hvzGehy8t3vXDJD0da/KbKZ/v8PObj /qHjTieyYKlPZRilSG6JbN4TL31yFHpRMEphSxqq0z2wvRYqTSPNchh13BIF/Doas9v6 vBf+ZFenBin1JQk/+lxz1wvsggniJVlCW9PJzuCM3vf/JS8re31FIlxy3vhROWja45va Ibxb9xMstEEQntKPBaj/okinb46gQIOCFmbgfqr2kP9UY9o4Hagh9h6rx5NYIII+OgaR Toe3owZ+XArFie6sNmgsuuTKICpWipBb38A1e9QJgI5U2QoqSdpyt0OYwcWmZgmAVFmf +GgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=b03+rmXF; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id n20-v6si4127160ejc.171.2018.11.22.01.09.13; Thu, 22 Nov 2018 01:09:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=b03+rmXF; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 41DAFC21F38; Thu, 22 Nov 2018 09:09:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id F3997C21F04; Thu, 22 Nov 2018 09:07:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6304EC21EC5; Thu, 22 Nov 2018 09:07:47 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 15A55C21EC2 for ; Thu, 22 Nov 2018 09:07:47 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id c126so8282534wmh.0 for ; Thu, 22 Nov 2018 01:07:47 -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 :mime-version:content-transfer-encoding; bh=a85oy77SYfIjmTtkUCz5GdioEqjqEEk2Idy3CqHn8OM=; b=b03+rmXFqFVvcjL+wqC8rkpL1031EOHmDtBBHOljcYxoknRffW9EAl07VEOo896SQ8 9SlgQe0q2WVFfMhMk/KuTurTZpQbzgT+ZJ4STETvCc356/diu5Qoa+2GQsKy4Zdc9YyD hCSy4wCF+LHF7ef5REBfnO0u+/NVLXF4DtzhPTU3ZsprAu9xk6FfaifEP3GV8xCjPfZc a7i6GmhbGLLIghmKAW/jNy8syx39h78ZUGuflqEDkR/xHqvhDRSMs29xM4puSAar+xtv RJZpL/lMZAQGB4/Gl9YfxU0SnaKKdtDFvNwUouNkvm3ITWOnvvcgXOYWL+/i5ajFcpbM fzBA== 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:mime-version:content-transfer-encoding; bh=a85oy77SYfIjmTtkUCz5GdioEqjqEEk2Idy3CqHn8OM=; b=pslWsb7CNVMcRTtIj9KaMDHlO7sznTI2sRfTEvyd4THEiMBhQ5kdgJp/c4Ycp3Df8b gEayGZLjAeYkNed7XCWtilaZ1GMxE6KOcWL7VFaDN+90xv6yQ87wQ5burzgJ5/IIj99N jhQfVYGs3HhK1EbZFc0Gl7ei9ePu5BUEuEgs+IgmIrtkQWlPPVBe0Mf9BK7pU9NKvALI diZV+ZX6zVMHg/4LkP5UgGaaFGwxx/MW6SHDWxgyHU3d8tygue6OQAhYVe1F/J9dL0f7 +SGEvldcDvhogQktk8OJr/mWEY3syMwikiMsM5yjsEKK3byyRUxhLq8OsnvSzf+huLD9 Lpcg== X-Gm-Message-State: AGRZ1gLE9rQuC2tZp3uBK/YcAfLKWslVghfBpQLo4rVXdvYaxSz+A7GA 3CmWFQbZ6RJmdLnjgB0SehCL7V4MQP1Gnw== X-Received: by 2002:a1c:4d12:: with SMTP id o18mr9154284wmh.92.1542877666142; Thu, 22 Nov 2018 01:07:46 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id y9sm13856434wrq.55.2018.11.22.01.07.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Nov 2018 01:07:45 -0800 (PST) From: Neil Armstrong To: u-boot@lists.denx.de Date: Thu, 22 Nov 2018 10:07:23 +0100 Message-Id: <20181122090740.29739-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181122090740.29739-1-narmstrong@baylibre.com> References: <20181122090740.29739-1-narmstrong@baylibre.com> MIME-Version: 1.0 Cc: linux-amlogic@lists.infradead.org, trini@konsulko.com Subject: [U-Boot] [PATCH u-boot v2 02/19] configs: meson: remove unnecessary MESON_FDTFILE_SETTING X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 6615f7711d..ff87c02820 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 a0856f98da..95e0f346fd 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 c46522ef7e..c43697665d 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 ef53f20c0f..3fd6e8fba4 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 d117b183aa..87e3ddb342 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 2aa9f5d143..4414293479 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 */