[PATCH u-boot v2 02/19] configs: meson: remove unnecessary MESON_FDTFILE_SETTING

Linux-Amlogic Archive on lore.kernel.org
 help / color / mirror / Atom feed

From: narmstrong@baylibre.com (Neil Armstrong)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH u-boot v2 02/19] configs: meson: remove unnecessary MESON_FDTFILE_SETTING
Date: Thu, 22 Nov 2018 10:07:23 +0100	[thread overview]
Message-ID: <20181122090740.29739-3-narmstrong@baylibre.com> (raw)
In-Reply-To: <20181122090740.29739-1-narmstrong@baylibre.com>

From: Jerome Brunet <jbrunet@baylibre.com>

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 <jbrunet@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 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 <configs/meson-gx-common.h>
 
 #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 <configs/meson-gx-common.h>
 
 #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 <configs/meson-gx-common.h>
 
 #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 <configs/meson-gx-common.h>
 
 #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 <configs/meson-gx-common.h>
 
 #endif /* __CONFIG_H */
-- 
2.19.1

next prev parent reply	other threads:[~2018-11-22  9:07 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-22  9:07 [PATCH u-boot v2 00/19] Amlogic Meson cleanup for AXG SoC support Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 01/19] ARM: meson: clean-up platform selection Neil Armstrong
2018-11-22  9:07 ` Neil Armstrong [this message]
2018-11-22  9:07 ` [PATCH u-boot v2 03/19] board: amlogic: remove p212 derivatives Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 04/19] board: amlogic: move khadas-vim2 as q200 ref board Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 05/19] board: amlogic: factorise gxbb boards Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 06/19] ARM: rework amlogic configuration Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 07/19] configs: meson: change default load addresses Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 08/19] pinctrl: meson: rework gx pmx function Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 09/19] pinctrl: meson: select generic pinctrl Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 10/19] pinctrl: meson: add axg support Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 11/19] clk: meson: add static to meson_gates table Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 12/19] clk: meson: silence debug print Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 13/19] ARM: meson: rework soc arch file to prepare for new SoC Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 14/19] ARM: meson: Add support for AXG family Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 15/19] ARM: dts: Sync Amlogic Meson AXG DT from Linux 4.20-rc1 Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 16/19] clk: Add clock driver for AXG Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 17/19] board: amlogic: add support for S400 board Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 18/19] ARM: meson: factorize common code out amlogic's boards Neil Armstrong
2018-11-22  9:07 ` [PATCH u-boot v2 19/19] ARM: meson: Add boot device discovery Neil Armstrong
2018-11-26  8:59 ` [PATCH u-boot v2 00/19] Amlogic Meson cleanup for AXG SoC support Neil Armstrong
2018-11-26 12:58   ` Tom Rini
2018-11-26 13:34     ` Neil Armstrong

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:6615f7711 dfblob:ff87c0282 dfblob:a0856f98d dfblob:95e0f346f
dfblob:c46522ef7 dfblob:c43697665 dfblob:ef53f20c0 dfblob:3fd6e8fba
dfblob:d117b183a dfblob:87e3ddb34 dfblob:2aa9f5d14 dfblob:441429347 )
 OR (
bs:"[PATCH u-boot v2 02/19] configs: meson: remove unnecessary MESON_FDTFILE_SETTING" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181122090740.29739-3-narmstrong@baylibre.com \
    --to=narmstrong@baylibre.com \
    --cc=linus-amlogic@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox