projects
/
platform
/
kernel
/
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-samsung
[platform/kernel/u-boot.git]
/
board
/
Marvell
/
guruplug
/
guruplug.c
diff --git
a/board/Marvell/guruplug/guruplug.c
b/board/Marvell/guruplug/guruplug.c
index
72bccc8
..
af0c491
100644
(file)
--- a/
board/Marvell/guruplug/guruplug.c
+++ b/
board/Marvell/guruplug/guruplug.c
@@
-8,8
+8,9
@@
#include <common.h>
#include <miiphy.h>
#include <common.h>
#include <miiphy.h>
+#include <asm/mach-types.h>
#include <asm/arch/cpu.h>
#include <asm/arch/cpu.h>
-#include <asm/arch/
kirkwood
.h>
+#include <asm/arch/
soc
.h>
#include <asm/arch/mpp.h>
#include "guruplug.h"
#include <asm/arch/mpp.h>
#include "guruplug.h"
@@
-22,9
+23,9
@@
int board_early_init_f(void)
* There are maximum 64 gpios controlled through 2 sets of registers
* the below configuration configures mainly initial LED status
*/
* There are maximum 64 gpios controlled through 2 sets of registers
* the below configuration configures mainly initial LED status
*/
-
kw
_config_gpio(GURUPLUG_OE_VAL_LOW,
- GURUPLUG_OE_VAL_HIGH,
- GURUPLUG_OE_LOW, GURUPLUG_OE_HIGH);
+
mvebu
_config_gpio(GURUPLUG_OE_VAL_LOW,
+
GURUPLUG_OE_VAL_HIGH,
+
GURUPLUG_OE_LOW, GURUPLUG_OE_HIGH);
/* Multi-Purpose Pins Functionality configuration */
static const u32 kwmpp_config[] = {
/* Multi-Purpose Pins Functionality configuration */
static const u32 kwmpp_config[] = {
@@
-92,7
+93,7
@@
int board_init(void)
gd->bd->bi_arch_number = MACH_TYPE_GURUPLUG;
/* adress of boot parameters */
gd->bd->bi_arch_number = MACH_TYPE_GURUPLUG;
/* adress of boot parameters */
- gd->bd->bi_boot_params =
kw
_sdram_bar(0) + 0x100;
+ gd->bd->bi_boot_params =
mvebu
_sdram_bar(0) + 0x100;
return 0;
}
return 0;
}