Re: [U-Boot] [PATCH v2 08/33] x86: Remove unnecessary find_fdt(), prepare_fdt() functions

2014-11-12 Thread Simon Glass 
On 11 November 2014 02:34, Bin Meng bmeng...@gmail.com wrote:
 On Tue, Nov 11, 2014 at 9:00 AM, Simon Glass s...@chromium.org wrote:
 These are no-longer needed so drop them.

 Signed-off-by: Simon Glass s...@chromium.org
 ---

 Changes in v2:
 - Remove definition of find_fdt() also
 - Remove prepare_fdt() also

  arch/x86/include/asm/init_helpers.h |  2 --
  arch/x86/lib/init_helpers.c | 27 ---
  common/board_f.c|  5 -
  3 files changed, 34 deletions(-)

[snip]

 Reviewed-by: Bin Meng bmeng...@gmail.com

Applied to u-boot-x86.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v2 08/33] x86: Remove unnecessary find_fdt(), prepare_fdt() functions

2014-11-11 Thread Bin Meng 
On Tue, Nov 11, 2014 at 9:00 AM, Simon Glass s...@chromium.org wrote:
 These are no-longer needed so drop them.

 Signed-off-by: Simon Glass s...@chromium.org
 ---

 Changes in v2:
 - Remove definition of find_fdt() also
 - Remove prepare_fdt() also

  arch/x86/include/asm/init_helpers.h |  2 --
  arch/x86/lib/init_helpers.c | 27 ---
  common/board_f.c|  5 -
  3 files changed, 34 deletions(-)

 diff --git a/arch/x86/include/asm/init_helpers.h 
 b/arch/x86/include/asm/init_helpers.h
 index b07887e..8cbe08e 100644
 --- a/arch/x86/include/asm/init_helpers.h
 +++ b/arch/x86/include/asm/init_helpers.h
 @@ -13,7 +13,5 @@ int calculate_relocation_address(void);
  int init_cache_f_r(void);
  int init_bd_struct_r(void);
  int init_func_spi(void);
 -int find_fdt(void);
 -int prepare_fdt(void);

  #endif /* !_INIT_HELPERS_H_ */
 diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
 index b5d937f..be4eb12 100644
 --- a/arch/x86/lib/init_helpers.c
 +++ b/arch/x86/lib/init_helpers.c
 @@ -87,30 +87,3 @@ int init_func_spi(void)
 puts(ready\n);
 return 0;
  }
 -
 -int find_fdt(void)
 -{
 -#ifdef CONFIG_OF_EMBED
 -   /* Get a pointer to the FDT */
 -   gd-fdt_blob = __dtb_dt_begin;
 -#elif defined CONFIG_OF_SEPARATE
 -   /* FDT is at end of image */
 -   gd-fdt_blob = (ulong *)_end;
 -#endif
 -   /* Allow the early environment to override the fdt address */
 -   gd-fdt_blob = (void *)getenv_ulong(fdtcontroladdr, 16,
 -   (uintptr_t)gd-fdt_blob);
 -
 -   return 0;
 -}
 -
 -int prepare_fdt(void)
 -{
 -   /* For now, put this check after the console is ready */
 -   if (fdtdec_prepare_fdt()) {
 -   panic(** CONFIG_OF_CONTROL defined but no FDT - please see 
 -   doc/README.fdt-control);
 -   }
 -
 -   return 0;
 -}
 diff --git a/common/board_f.c b/common/board_f.c
 index f81f70d..6e6a1a2 100644
 --- a/common/board_f.c
 +++ b/common/board_f.c
 @@ -818,11 +818,6 @@ static init_fnc_t init_sequence_f[] = {
 probecpu,
  #endif
 arch_cpu_init,  /* basic arch cpu dependent setup */
 -#ifdef CONFIG_X86
 -# ifdef CONFIG_OF_CONTROL
 -   find_fdt,   /* TODO(s...@chromium.org): remove */
 -# endif
 -#endif
 mark_bootstage,
  #ifdef CONFIG_OF_CONTROL
 fdtdec_check_fdt,
 --

Reviewed-by: Bin Meng bmeng...@gmail.com
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2 08/33] x86: Remove unnecessary find_fdt(), prepare_fdt() functions

2014-11-10 Thread Simon Glass 
These are no-longer needed so drop them.

Signed-off-by: Simon Glass s...@chromium.org
---

Changes in v2:
- Remove definition of find_fdt() also
- Remove prepare_fdt() also

 arch/x86/include/asm/init_helpers.h |  2 --
 arch/x86/lib/init_helpers.c | 27 ---
 common/board_f.c|  5 -
 3 files changed, 34 deletions(-)

diff --git a/arch/x86/include/asm/init_helpers.h 
b/arch/x86/include/asm/init_helpers.h
index b07887e..8cbe08e 100644
--- a/arch/x86/include/asm/init_helpers.h
+++ b/arch/x86/include/asm/init_helpers.h
@@ -13,7 +13,5 @@ int calculate_relocation_address(void);
 int init_cache_f_r(void);
 int init_bd_struct_r(void);
 int init_func_spi(void);
-int find_fdt(void);
-int prepare_fdt(void);
 
 #endif /* !_INIT_HELPERS_H_ */
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index b5d937f..be4eb12 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -87,30 +87,3 @@ int init_func_spi(void)
puts(ready\n);
return 0;
 }
-
-int find_fdt(void)
-{
-#ifdef CONFIG_OF_EMBED
-   /* Get a pointer to the FDT */
-   gd-fdt_blob = __dtb_dt_begin;
-#elif defined CONFIG_OF_SEPARATE
-   /* FDT is at end of image */
-   gd-fdt_blob = (ulong *)_end;
-#endif
-   /* Allow the early environment to override the fdt address */
-   gd-fdt_blob = (void *)getenv_ulong(fdtcontroladdr, 16,
-   (uintptr_t)gd-fdt_blob);
-
-   return 0;
-}
-
-int prepare_fdt(void)
-{
-   /* For now, put this check after the console is ready */
-   if (fdtdec_prepare_fdt()) {
-   panic(** CONFIG_OF_CONTROL defined but no FDT - please see 
-   doc/README.fdt-control);
-   }
-
-   return 0;
-}
diff --git a/common/board_f.c b/common/board_f.c
index f81f70d..6e6a1a2 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -818,11 +818,6 @@ static init_fnc_t init_sequence_f[] = {
probecpu,
 #endif
arch_cpu_init,  /* basic arch cpu dependent setup */
-#ifdef CONFIG_X86
-# ifdef CONFIG_OF_CONTROL
-   find_fdt,   /* TODO(s...@chromium.org): remove */
-# endif
-#endif
mark_bootstage,
 #ifdef CONFIG_OF_CONTROL
fdtdec_check_fdt,
-- 
2.1.0.rc2.206.gedb03e5

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot