Re: [U-Boot] [PATCH v3 3/7] m68k: remove arch/m68k/lib/board.c

2015-03-23 Thread Simon Glass
On 19 March 2015 at 04:42, Masahiro Yamada
yamada.masah...@socionext.com wrote:
 All the M68000 boards have switched to Generic Board.
 This file is no longer necessary.

 Signed-off-by: Masahiro Yamada yamada.masah...@socionext.com
 Cc: Huan Wang alison.w...@freescale.com
 Cc: Angelo Dureghello ang...@sysam.it
 ---

 Changes in v2: None

  arch/m68k/lib/Makefile |   3 -
  arch/m68k/lib/board.c  | 642 
 -
  2 files changed, 645 deletions(-)
  delete mode 100644 arch/m68k/lib/board.c

Reviewed-by: Simon Glass s...@chromium.org
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH v3 3/7] m68k: remove arch/m68k/lib/board.c

2015-03-19 Thread Masahiro Yamada
All the M68000 boards have switched to Generic Board.
This file is no longer necessary.

Signed-off-by: Masahiro Yamada yamada.masah...@socionext.com
Cc: Huan Wang alison.w...@freescale.com
Cc: Angelo Dureghello ang...@sysam.it
---

Changes in v2: None

 arch/m68k/lib/Makefile |   3 -
 arch/m68k/lib/board.c  | 642 -
 2 files changed, 645 deletions(-)
 delete mode 100644 arch/m68k/lib/board.c

diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index d0e1a84..73d40bd 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -5,9 +5,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
-ifndef CONFIG_SYS_GENERIC_BOARD
-obj-y   += board.o
-endif
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-y  += cache.o
 obj-y  += interrupts.o
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
deleted file mode 100644
index 9caff73..000
--- a/arch/m68k/lib/board.c
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
- * (C) Copyright 2003
- * Josef Baumgartner josef.baumgart...@telex.de
- *
- * (C) Copyright 2000-2002
- * Wolfgang Denk, DENX Software Engineering, w...@denx.de.
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include watchdog.h
-#include command.h
-#include malloc.h
-#include stdio_dev.h
-#include linux/compiler.h
-
-#include asm/immap.h
-
-#if defined(CONFIG_CMD_IDE)
-#include ide.h
-#endif
-#if defined(CONFIG_CMD_SCSI)
-#include scsi.h
-#endif
-#if defined(CONFIG_CMD_KGDB)
-#include kgdb.h
-#endif
-#ifdef CONFIG_STATUS_LED
-#include status_led.h
-#endif
-#include net.h
-#include serial.h
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-#include commproc.h
-#endif
-#include version.h
-
-#if defined(CONFIG_HARD_I2C) || \
-   defined(CONFIG_SYS_I2C)
-#include i2c.h
-#endif
-
-#ifdef CONFIG_CMD_SPI
-#include spi.h
-#endif
-
-#ifdef CONFIG_BITBANGMII
-#include miiphy.h
-#endif
-
-#include nand.h
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static char *failed = *** failed ***\n;
-
-#include environment.h
-
-extern ulong __init_end;
-extern ulong __bss_end;
-
-#if defined(CONFIG_WATCHDOG)
-# undef INIT_FUNC_WATCHDOG_INIT
-# define INIT_FUNC_WATCHDOG_INIT   watchdog_init,
-# define WATCHDOG_DISABLE  watchdog_disable
-
-extern int watchdog_init(void);
-extern int watchdog_disable(void);
-#else
-# define INIT_FUNC_WATCHDOG_INIT   /* undef */
-# define WATCHDOG_DISABLE  /* undef */
-#endif /* CONFIG_WATCHDOG */
-
-ulong monitor_flash_len;
-
-/
- * Utilities   *
- 
- */
-
-/*
- * All attempts to come up with a common initialization sequence
- * that works for all boards and architectures failed: some of the
- * requirements are just _too_ different. To get rid of the resulting
- * mess of board dependend #ifdef'ed code we now make the whole
- * initialization sequence configurable to the user.
- *
- * The requirements for any new initalization function is simple: it
- * receives a pointer to the global data structure as it's only
- * argument, and returns an integer return code, where 0 means
- * continue and != 0 means fatal error, hang the system.
- */
-typedef int (init_fnc_t) (void);
-
-/
- * Init Utilities
- 
- * Some of this code should be moved into the core functions,
- * but let's get it working (again) first...
- */
-
-static int init_baudrate (void)
-{
-   gd-baudrate = getenv_ulong(baudrate, 10, CONFIG_BAUDRATE);
-   return 0;
-}
-
-/***/
-
-static int init_func_ram (void)
-{
-   int board_type = 0; /* use dummy arg */
-   puts (DRAM:  );
-
-   if ((gd-ram_size = initdram (board_type))  0) {
-   print_size (gd-ram_size, \n);
-   return (0);
-   }
-   puts (failed);
-   return (1);
-}
-
-/***/
-
-#if defined(CONFIG_HARD_I2C) ||defined(CONFIG_SYS_I2C)
-static int init_func_i2c (void)
-{
-   puts (I2C:   );
-#ifdef CONFIG_SYS_I2C
-   i2c_init_all();
-#else
-   i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-#endif
-   puts (ready\n);
-   return (0);
-}
-#endif
-
-#if defined(CONFIG_HARD_SPI)
-static int init_func_spi (void)
-{
-   puts (SPI:   );
-   spi_init ();
-   puts (ready\n);
-   return (0);
-}
-#endif
-
-/***/
-
-/
- * Initialization sequence *
- 
- */
-
-init_fnc_t *init_sequence[] = {