summaryrefslogtreecommitdiff
path: root/lib_ppc
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-01-27 16:12:21 -0500
committerWolfgang Denk <wd@denx.de>2009-01-27 23:42:39 +0100
commitcf7e399fb35b3aea90a27d1df72f45f5d6156204 (patch)
tree63add98351b9cef8c16b0a8f6d293ca3b3db3fdd /lib_ppc
parent50970839712dda35399e2fa83fe818df9354d618 (diff)
downloadu-boot-imx-cf7e399fb35b3aea90a27d1df72f45f5d6156204.zip
u-boot-imx-cf7e399fb35b3aea90a27d1df72f45f5d6156204.tar.gz
u-boot-imx-cf7e399fb35b3aea90a27d1df72f45f5d6156204.tar.bz2
SATA: do not auto-initialize during boot
Rather than have the board code initialize SATA automatically during boot, make the user manually run "sata init". This brings the SATA subsystem in line with common U-Boot policy. Rather than having a dedicated weak function "is_sata_supported", people can override sata_initialize() to do their weird board stuff. Then they can call the actual __sata_initialize(). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'lib_ppc')
-rw-r--r--lib_ppc/board.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 61c29b5..df1cf13 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -38,9 +38,6 @@
#if defined(CONFIG_CMD_IDE)
#include <ide.h>
#endif
-#if defined(CONFIG_CMD_SATA)
-#include <sata.h>
-#endif
#if defined(CONFIG_CMD_SCSI)
#include <scsi.h>
#endif
@@ -639,16 +636,6 @@ void board_init_f (ulong bootflag)
/* NOTREACHED - relocate_code() does not return */
}
-int __is_sata_supported(void)
-{
- /* For some boards, when sata disabled by the switch, and the
- * driver still access the sata registers, the cpu will hangup.
- * please define platform specific is_sata_supported() if your
- * board have such issue.*/
- return 1;
-}
-int is_sata_supported(void) __attribute__((weak, alias("__is_sata_supported")));
-
/************************************************************************
*
* This is the next part if the initialization sequence: we are now
@@ -1152,13 +1139,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif
#endif
-#if defined(CONFIG_CMD_SATA)
- if (is_sata_supported()) {
- puts("SATA: ");
- sata_initialize();
- }
-#endif
-
#ifdef CONFIG_LAST_STAGE_INIT
WATCHDOG_RESET ();
/*