projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
[oweals/u-boot.git]
/
board
/
amcc
/
ocotea
/
ocotea.c
diff --git
a/board/amcc/ocotea/ocotea.c
b/board/amcc/ocotea/ocotea.c
index 951a8b5394f562e984a4cecf76c2d557eaef6db4..bbb5331ef2ef7534929427f27df9d82125a70ddb 100644
(file)
--- a/
board/amcc/ocotea/ocotea.c
+++ b/
board/amcc/ocotea/ocotea.c
@@
-28,7
+28,7
@@
#include "ocotea.h"
#include <asm/processor.h>
#include <spd_sdram.h>
#include "ocotea.h"
#include <asm/processor.h>
#include <spd_sdram.h>
-#include <
ppc4xx_enet
.h>
+#include <
asm/ppc4xx-emac
.h>
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
@@
-400,15
+400,3
@@
void fpga_init(void)
return;
}
return;
}
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-
- return (ctrlc());
-}
-#endif