summaryrefslogtreecommitdiffstats
path: root/board/keymile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-29 22:03:00 +0200
committerWolfgang Denk <wd@denx.de>2010-10-29 22:03:00 +0200
commit0c0892be0d93a5a892b93739c5eb3bf692fed4ff (patch)
treea046b11024bdf0a41082647c95df23a10cb206fc /board/keymile
parentd75c2a3d7f34ff1eb9920ad72483cff7cb6d358f (diff)
parent28e57108a61bd0e554d9847170b8ad9dad093e07 (diff)
downloadbootable_bootloader_goldelico_gta04-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.zip
bootable_bootloader_goldelico_gta04-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.gz
bootable_bootloader_goldelico_gta04-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Conflicts: include/configs/km_arm.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/keymile')
-rw-r--r--board/keymile/km_arm/config.mk28
-rw-r--r--board/keymile/km_arm/km_arm.c24
2 files changed, 15 insertions, 37 deletions
diff --git a/board/keymile/km_arm/config.mk b/board/keymile/km_arm/config.mk
deleted file mode 100644
index df4828c..0000000
--- a/board/keymile/km_arm/config.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# (C) Copyright 2009
-# Marvell Semiconductor <www.marvell.com>
-# Prafulla Wadaskar <prafulla@marvell.com>
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
-#
-
-CONFIG_SYS_TEXT_BASE = 0x004000000
-
-# Kirkwood Boot Image configuration file
-KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index ed5ed44..2e20644 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -143,7 +143,7 @@ int misc_init_r(void)
return 0;
}
-int board_init(void)
+int board_early_init_f(void)
{
u32 tmp;
@@ -160,14 +160,6 @@ int board_init(void)
writel(tmp & (~FLASH_GPIO_PIN) , KW_GPIO0_BASE + 4);
printf("KM: setting NAND mode\n");
- /*
- * arch number of board
- */
- gd->bd->bi_arch_number = MACH_TYPE_SUEN3;
-
- /* address of boot parameters */
- gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
-
#if defined(CONFIG_SOFT_I2C)
/* init the GPIO for I2C Bitbang driver */
kw_gpio_set_valid(SUEN3_SDA_PIN, 1);
@@ -179,6 +171,20 @@ int board_init(void)
kw_gpio_set_valid(SUEN3_ENV_WP, 38);
kw_gpio_direction_output(SUEN3_ENV_WP, 1);
#endif
+
+ return 0;
+}
+
+int board_init(void)
+{
+ /*
+ * arch number of board
+ */
+ gd->bd->bi_arch_number = MACH_TYPE_SUEN3;
+
+ /* address of boot parameters */
+ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
+
return 0;
}