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: 995603 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="glY9hMtN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42s3vm59gwz9s1x for ; Sat, 10 Nov 2018 02:28:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 630FEC22592; Fri, 9 Nov 2018 15:28:08 +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_DNSWL_BLOCKED, 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 E9CCCC22582; Fri, 9 Nov 2018 15:27:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 494A7C220FD; Fri, 9 Nov 2018 15:27:04 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id CFE15C22095 for ; Fri, 9 Nov 2018 15:27:03 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id f10-v6so2374436wme.3 for ; Fri, 09 Nov 2018 07:27:03 -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=jpecQDvcuwnJqFekdGtvncHClTcGYZ5Gu8PBtfjzL4CDZ3SjuafFGiXAz9JBKPNF2y JxZ2U1golDRvVTK4lWFNkQGjJBhTk6HTmPFnHnAGagg+ZoldyYR/PuDkkcy5A1dpZfgn 5t/dDDONy9fPEKLYLhCyLJ/XjfxujShcfGbNhVLi1VQf48UFToH6nZCudYc4DfjgyOZ0 ghQhzbq0XseN7hi+CN54+fzjZX56x0kpLeZQ97uEWz3SKQcrY9QYRUnIegKXXmztZ0Jg J7w7w1bn1YeIrBcnd++liSNVf4S1FgYVL0LTjb/fMeOaQysXCCEEJuVeCi+jkQrTlg3q j8WA== X-Gm-Message-State: AGRZ1gK8BEFaWSfJ88+rHVcjgNgJr6DI+mR646CiL1VXAqX/No5xzpuF YCQhX5JWX0i+T7pe47reuPfWg+KN4RQ= 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 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> Cc: linux-amlogic@lists.infradead.org, trini@konsulko.com, Jerome Brunet Subject: [U-Boot] [PATCH u-boot 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: , MIME-Version: 1.0 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 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 */