Remove the deprecated CONFIG_OF_FLAT_TREE
PATCH 3/3 Remove the deprecated CONFIG_OF_FLAT_TREE
Use CONFIG_OF_LIBFDT instead to support flattened device trees. It is cleaner, has better functionality, and is better supported.
Signed-off-by Gerald Van Baren <[email protected]>
--- README | 9 +- board/freescale/mpc7448hpc2/mpc7448hpc2.c | 22 +-- board/tqm8272/tqm8272.c | 4 - common/Makefile | 1 - common/ft_build.c | 471 ----------------------------- cpu/74xx_7xx/cpu.c | 4 - include/configs/mpc7448hpc2.h | 1 + include/ft_build.h | 71 ----- 8 files changed, 3 insertions(+), 580 deletions(-) delete mode 100644 common/ft_build.c delete mode 100644 include/ft_build.h
README +1 -8
@@ -350,7 +350,7 @@ The following options need to be configured: expect it to be in bytes, others in MB. Define CONFIG_MEMSIZE_IN_BYTES to make it in bytes. - CONFIG_OF_LIBFDT / CONFIG_OF_FLAT_TREE + CONFIG_OF_LIBFDT New kernel versions are expecting firmware settings to be passed using flattened device trees (based on open firmware
@@ -361,13 +361,6 @@ The following options need to be configured: * Adds the "fdt" command * The bootm command automatically updates the fdt - CONFIG_OF_FLAT_TREE - * Deprecated, see CONFIG_OF_LIBFDT - * Original ft_build.c-based support - * Automatically modifies the dft as part of the bootm command - * The environment variable "disable_of", when set, - disables this functionality. - OF_CPU - The proper name of the cpus node. OF_SOC - The proper name of the soc node. OF_TBCLK - The timebase frequency.
board/freescale/mpc7448hpc2/mpc7448hpc2.c +1 -21
@@ -31,10 +31,7 @@#include <common.h> #include <74xx_7xx.h> -#if defined(CONFIG_OF_FLAT_TREE ) -#include <ft_build.h> -extern void ft_cpu_setup (void *blob,bd_t *bd); -#endif +#include <fdt_support.h> #undef DEBUG
@@ -89,23 +86,6 @@ long int initdram (int board_type)return dram_size (board_type); } -#if defined(CONFIG_OF_FLAT_TREE ) && defined(CONFIG_OF_BOARD_SETUP ) -void -ft_board_setup (void *blob,bd_t *bd) -{ -u32 *p; -int len; - -ft_cpu_setup (blob, bd); - - p =ft_get_prop (blob,"/memory/reg" , &len); -if (p !=NULL ) { - *p++ =cpu_to_be32 (bd->bi_memstart); - *p =cpu_to_be32 (bd->bi_memsize); - } -} -#endif -#if defined(CONFIG_OF_BOARD_SETUP )void ft_board_setup (void *blob,bd_t *bd)
board/tqm8272/tqm8272.c +0 -4
@@ -30,10 +30,6 @@#include <pci.h> #include <asm/m8260_pci.h> #endif -#if CONFIG_OF_FLAT_TREE -#include <ft_build.h> -#include <image.h> -#endif #if 0 #define deb_printf(fmt,arg...) \
common/Makefile +0 -1
@@ -118,7 +118,6 @@ COBJS-y += env_nowhere.o COBJS-y += exports.o COBJS-y += flash.o COBJS-y += fpga.o -COBJS-y += ft_build.o COBJS-y += hush.o COBJS-y += kgdb.o COBJS-y += lcd.o
common/ft_build.c deleted +0 -471
471 lines not on this page · raw message
cpu/74xx_7xx/cpu.c +0 -4
@@ -49,10 +49,6 @@#include <fdt_support.h> #endif -#if defined(CONFIG_OF_FLAT_TREE ) -#include <ft_build.h> -#endif -#ifdef CONFIG_AMIGAONEG3SE #include "../board/MAI/AmigaOneG3SE/via686.h" #include "../board/MAI/AmigaOneG3SE/memio.h"
include/configs/mpc7448hpc2.h +1 -0
@@ -58,6 +58,7 @@#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R +#define CONFIG_HAS_ETH0 #define CONFIG_HAS_ETH1 #define CONFIG_ENV_OVERWRITE
include/ft_build.h deleted +0 -71
71 lines not on this page · raw message
Signature · 1 line
1.5.5.1