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 tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
board
/
Marvell
/
guruplug
/
guruplug.c
diff --git
a/board/Marvell/guruplug/guruplug.c
b/board/Marvell/guruplug/guruplug.c
index 72bccc821ce2cc2b7d9fe21e83382f0546a9663e..f3981c66d20bc4897ca08ff87aa615f2d00bb2e1 100644
(file)
--- a/
board/Marvell/guruplug/guruplug.c
+++ b/
board/Marvell/guruplug/guruplug.c
@@
-1,15
+1,17
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
* Written-by: Siddarth Gore <gores@marvell.com>
/*
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
* Written-by: Siddarth Gore <gores@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <init.h>
#include <miiphy.h>
#include <miiphy.h>
+#include <net.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
+24,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
+94,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;
}