summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-05-16 10:47:41 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:47:16 +0200
commit72601d04fdfdd4c7597afcf1f6aab654bd99366c (patch)
tree2862b1f2af04dbecbf0466b57bbfdd3f18b0da71 /board
parentdebf87415579c0f50aab9e0832976d4506babe0f (diff)
downloadu-boot-imx-72601d04fdfdd4c7597afcf1f6aab654bd99366c.zip
u-boot-imx-72601d04fdfdd4c7597afcf1f6aab654bd99366c.tar.gz
u-boot-imx-72601d04fdfdd4c7597afcf1f6aab654bd99366c.tar.bz2
Rename ads5121 board into mpc5121ads
We rename the board so we use a consistent name in U-Boot and in Linux. Also, we use this opportunity to move the board into the Freecale vendor directory. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: John Rigby <jcrigby@gmail.com>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mpc5121ads/Makefile (renamed from board/ads5121/Makefile)0
-rw-r--r--board/freescale/mpc5121ads/README (renamed from board/ads5121/README)0
-rw-r--r--board/freescale/mpc5121ads/config.mk (renamed from board/ads5121/config.mk)0
-rw-r--r--board/freescale/mpc5121ads/mpc5121ads.c (renamed from board/ads5121/ads5121.c)15
4 files changed, 8 insertions, 7 deletions
diff --git a/board/ads5121/Makefile b/board/freescale/mpc5121ads/Makefile
index 20fbf6e..20fbf6e 100644
--- a/board/ads5121/Makefile
+++ b/board/freescale/mpc5121ads/Makefile
diff --git a/board/ads5121/README b/board/freescale/mpc5121ads/README
index defcd6b..defcd6b 100644
--- a/board/ads5121/README
+++ b/board/freescale/mpc5121ads/README
diff --git a/board/ads5121/config.mk b/board/freescale/mpc5121ads/config.mk
index 14998f4..14998f4 100644
--- a/board/ads5121/config.mk
+++ b/board/freescale/mpc5121ads/config.mk
diff --git a/board/ads5121/ads5121.c b/board/freescale/mpc5121ads/mpc5121ads.c
index 405432c..e8eb491 100644
--- a/board/ads5121/ads5121.c
+++ b/board/freescale/mpc5121ads/mpc5121ads.c
@@ -33,6 +33,8 @@
DECLARE_GLOBAL_DATA_PTR;
+extern int mpc5121_diu_init(void);
+
/* Clocks in use */
#define SCCR1_CLOCKS_EN (CLOCK_SCCR1_CFG_EN | \
CLOCK_SCCR1_LPC_EN | \
@@ -216,7 +218,6 @@ long int fixed_sdram (void)
int misc_init_r(void)
{
u8 tmp_val;
- extern int mpc5121_diu_init(void);
/* Using this for DIU init before the driver in linux takes over
* Enable the TFP410 Encoder (I2C address 0x38)
@@ -238,13 +239,13 @@ int misc_init_r(void)
debug("DVI Encoder Read: 0x%02lx\n", tmp_val);
#ifdef CONFIG_FSL_DIU_FB
-#if !(defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE))
+# if !(defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE))
mpc5121_diu_init();
+# endif
#endif
-#endif
-
return 0;
}
+
static iopin_t ioregs_init[] = {
/* FUNC1=FEC_RX_DV Sets Next 3 to FEC pads */
{
@@ -312,12 +313,12 @@ int checkboard (void)
printf ("Board: ADS5121 rev. 0x%04x (CPLD rev. 0x%02x)\n",
brd_rev, cpld_rev);
+
/* initialize function mux & slew rate IO inter alia on IO Pins */
+ iopin_initialize(ioregs_init, ARRAY_SIZE(ioregs_init));
- iopin_initialize(ioregs_init, sizeof(ioregs_init) / sizeof(ioregs_init[0]));
- if (SVR_MJREV (im->sysconf.spridr) >= 2) {
+ if (SVR_MJREV (im->sysconf.spridr) >= 2)
iopin_initialize(rev2_silicon_pci_ioregs_init, 1);
- }
return 0;
}