[U-Boot] [PATCH 6/8] config: don't define CONFIG_ARCH_DEVICE_TREE

Jagan Teki jagannadh.teki at gmail.com
Tue Jun 11 08:52:38 CEST 2013


Hi,

I think we can wait some more time to mature the fdt support on
u-boot, as not many boards were using this future.
may be I am also incorrect.

And need to remove the CONFIG_ARCH_DEVICE_TREE references in
dts/Makefile to for working this.

--
Thanks,
Jagan.

On Tue, Jun 11, 2013 at 4:47 AM, Stephen Warren <swarren at wwwdotorg.org> wrote:
> From: Stephen Warren <swarren at nvidia.com>
>
> Now that nothing uses CONFIG_ARCH_DEVICE_TREE, stop defining it.
>
> Signed-off-by: Stephen Warren <swarren at nvidia.com>
> ---
>  arch/arm/cpu/armv7/tegra114/config.mk | 19 -------------------
>  arch/arm/cpu/armv7/tegra20/config.mk  | 26 --------------------------
>  arch/arm/cpu/armv7/tegra30/config.mk  | 19 -------------------
>  arch/microblaze/config.mk             |  2 --
>  arch/x86/cpu/coreboot/config.mk       | 23 -----------------------
>  doc/README.fdt-control                |  3 +--
>  include/configs/exynos5250-dt.h       |  1 -
>  7 files changed, 1 insertion(+), 92 deletions(-)
>  delete mode 100644 arch/arm/cpu/armv7/tegra114/config.mk
>  delete mode 100644 arch/arm/cpu/armv7/tegra20/config.mk
>  delete mode 100644 arch/arm/cpu/armv7/tegra30/config.mk
>  delete mode 100644 arch/x86/cpu/coreboot/config.mk
>
> diff --git a/arch/arm/cpu/armv7/tegra114/config.mk b/arch/arm/cpu/armv7/tegra114/config.mk
> deleted file mode 100644
> index cb1a19d..0000000
> --- a/arch/arm/cpu/armv7/tegra114/config.mk
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -#
> -# Copyright (c) 2010-2013, NVIDIA CORPORATION.  All rights reserved.
> -#
> -# (C) Copyright 2002
> -# Gary Jennejohn, DENX Software Engineering, <garyj at denx.de>
> -#
> -# This program is free software; you can redistribute it and/or modify it
> -# under the terms and conditions of the GNU General Public License,
> -# version 2, as published by the Free Software Foundation.
> -#
> -# This program is distributed in the hope it will be useful, but WITHOUT
> -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
> -# more details.
> -#
> -# You should have received a copy of the GNU General Public License
> -# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> -#
> -CONFIG_ARCH_DEVICE_TREE := tegra114
> diff --git a/arch/arm/cpu/armv7/tegra20/config.mk b/arch/arm/cpu/armv7/tegra20/config.mk
> deleted file mode 100644
> index 6432e75..0000000
> --- a/arch/arm/cpu/armv7/tegra20/config.mk
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -#
> -# (C) Copyright 2010,2011
> -# NVIDIA Corporation <www.nvidia.com>
> -#
> -# (C) Copyright 2002
> -# Gary Jennejohn, DENX Software Engineering, <garyj at denx.de>
> -#
> -# See file CREDITS for list of people who contributed to this
> -# project.
> -#
> -# This program is free software; you can redistribute it and/or
> -# modify it under the terms of the GNU General Public License as
> -# published by the Free Software Foundation; either version 2 of
> -# the License, or (at your option) any later version.
> -#
> -# This program is distributed in the hope that it will be useful,
> -# but WITHOUT ANY WARRANTY; without even the implied warranty of
> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> -# GNU General Public License for more details.
> -#
> -# You should have received a copy of the GNU General Public License
> -# along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> -# MA 02111-1307 USA
> -#
> -CONFIG_ARCH_DEVICE_TREE := tegra20
> diff --git a/arch/arm/cpu/armv7/tegra30/config.mk b/arch/arm/cpu/armv7/tegra30/config.mk
> deleted file mode 100644
> index 719ca81..0000000
> --- a/arch/arm/cpu/armv7/tegra30/config.mk
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -#
> -# Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
> -#
> -# (C) Copyright 2002
> -# Gary Jennejohn, DENX Software Engineering, <garyj at denx.de>
> -#
> -# This program is free software; you can redistribute it and/or modify it
> -# under the terms and conditions of the GNU General Public License,
> -# version 2, as published by the Free Software Foundation.
> -#
> -# This program is distributed in the hope it will be useful, but WITHOUT
> -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
> -# more details.
> -#
> -# You should have received a copy of the GNU General Public License
> -# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> -#
> -CONFIG_ARCH_DEVICE_TREE := tegra30
> diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk
> index b4935f0..aca79e2 100644
> --- a/arch/microblaze/config.mk
> +++ b/arch/microblaze/config.mk
> @@ -31,5 +31,3 @@ CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000
>  PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__
>
>  LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds
> -
> -CONFIG_ARCH_DEVICE_TREE := microblaze
> diff --git a/arch/x86/cpu/coreboot/config.mk b/arch/x86/cpu/coreboot/config.mk
> deleted file mode 100644
> index 4858fc3..0000000
> --- a/arch/x86/cpu/coreboot/config.mk
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -#
> -# Copyright (c) 2012 The Chromium OS Authors.
> -#
> -# See file CREDITS for list of people who contributed to this
> -# project.
> -#
> -# This program is free software; you can redistribute it and/or
> -# modify it under the terms of the GNU General Public License as
> -# published by the Free Software Foundation; either version 2 of
> -# the License, or (at your option) any later version.
> -#
> -# This program is distributed in the hope that it will be useful,
> -# but WITHOUT ANY WARRANTY; without even the implied warranty of
> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> -# GNU General Public License for more details.
> -#
> -# You should have received a copy of the GNU General Public License
> -# along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> -# MA 02111-1307 USA
> -#
> -
> -CONFIG_ARCH_DEVICE_TREE := coreboot
> diff --git a/doc/README.fdt-control b/doc/README.fdt-control
> index 95a88a7..8512beb 100644
> --- a/doc/README.fdt-control
> +++ b/doc/README.fdt-control
> @@ -135,8 +135,7 @@ file into
>         board/<vendor>/dts/<name>.dts
>
>  This should include your CPU or SOC's device tree file, placed in
> -arch/<arch>/dts, and then make any adjustments required. The name of this
> -is CONFIG_ARCH_DEVICE_TREE.dts.
> +arch/<arch>/dts, and then make any adjustments required.
>
>  If CONFIG_OF_EMBED is defined, then it will be picked up and built into
>  the U-Boot image (including u-boot.bin).
> diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
> index 8a82892..a749c42 100644
> --- a/include/configs/exynos5250-dt.h
> +++ b/include/configs/exynos5250-dt.h
> @@ -39,7 +39,6 @@
>  #define CONFIG_DISPLAY_BOARDINFO
>
>  /* Enable fdt support for Exynos5250 */
> -#define CONFIG_ARCH_DEVICE_TREE                exynos5250
>  #define CONFIG_OF_CONTROL
>  #define CONFIG_OF_SEPARATE
>
> --
> 1.8.1.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot


More information about the U-Boot mailing list