diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2018-10-19 12:00:51 +0200 |
|---|---|---|
| committer | Neil Armstrong <narmstrong@baylibre.com> | 2018-11-26 14:40:51 +0100 |
| commit | e4623f75e4b0128e9cc38e42699e5c0169ec58d0 (patch) | |
| tree | d936d34f64247b80568d2161adba07c83ae997f4 | |
| parent | 32caa1e2f14cd50b8fe4cbc0541c49fa0a9fcf84 (diff) | |
| download | u-boot-e4623f75e4b0128e9cc38e42699e5c0169ec58d0.zip u-boot-e4623f75e4b0128e9cc38e42699e5c0169ec58d0.tar.gz u-boot-e4623f75e4b0128e9cc38e42699e5c0169ec58d0.tar.bz2 | |
configs: meson: remove unnecessary MESON_FDTFILE_SETTING
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>
| -rw-r--r-- | include/configs/khadas-vim.h | 2 | ||||
| -rw-r--r-- | include/configs/libretech-cc.h | 2 | ||||
| -rw-r--r-- | include/configs/meson-gx-common.h | 2 | ||||
| -rw-r--r-- | include/configs/nanopi-k2.h | 4 | ||||
| -rw-r--r-- | include/configs/odroid-c2.h | 4 | ||||
| -rw-r--r-- | include/configs/p212.h | 4 |
6 files changed, 1 insertions, 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 <configs/meson-gx-common.h> #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 <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 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 <configs/meson-gx-common.h> #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 <configs/meson-gx-common.h> #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 <configs/meson-gx-common.h> #endif /* __CONFIG_H */ |