summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-07-05 10:03:52 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-07-05 10:03:52 +0200
commit0095b787fe97a43cab575e7383ef681ecfb765f2 (patch)
treebd41cc2589621cf90149832d6cd7046eca7ed91e /board
parent3f7a63e6a34c5b435864c860c1563117e45d1c35 (diff)
parentce05de295032c50e5855b11c72fe18562a872cc9 (diff)
downloadu-boot-imx-0095b787fe97a43cab575e7383ef681ecfb765f2.zip
u-boot-imx-0095b787fe97a43cab575e7383ef681ecfb765f2.tar.gz
u-boot-imx-0095b787fe97a43cab575e7383ef681ecfb765f2.tar.bz2
Merge with /home/m8/git/u-boot
Diffstat (limited to 'board')
-rw-r--r--board/amcc/bamboo/bamboo.c2
-rw-r--r--board/amcc/bamboo/bamboo.h13
-rw-r--r--board/amcc/yucca/yucca.c21
3 files changed, 10 insertions, 26 deletions
diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c
index 7c98920..c93ba6e 100644
--- a/board/amcc/bamboo/bamboo.c
+++ b/board/amcc/bamboo/bamboo.c
@@ -435,7 +435,7 @@ long int initdram (int board_type)
*/
init_spd_array();
- dram_size = spd_sdram (0);
+ dram_size = spd_sdram();
return dram_size;
}
diff --git a/board/amcc/bamboo/bamboo.h b/board/amcc/bamboo/bamboo.h
index 5f5fcde..1ce6366 100644
--- a/board/amcc/bamboo/bamboo.h
+++ b/board/amcc/bamboo/bamboo.h
@@ -283,10 +283,8 @@
/*----------------------------------------------------------------------------+
| PPC440EP GPIOs addresses.
+----------------------------------------------------------------------------*/
-#define GPIO0_BASE 0xEF600B00
#define GPIO0_REAL 0xEF600B00
-#define GPIO1_BASE 0xEF600C00
#define GPIO1_REAL 0xEF600C00
/* Offsets */
@@ -332,17 +330,6 @@
/*----------------------------------------------------------------------------+
- | Declare Configuration values
- +----------------------------------------------------------------------------*/
-typedef enum gpio_select { GPIO_SEL, GPIO_ALT1, GPIO_ALT2, GPIO_ALT3 } gpio_select_t;
-typedef enum gpio_driver { GPIO_DIS, GPIO_IN, GPIO_OUT, GPIO_BI } gpio_driver_t;
-
-typedef struct { unsigned long add; /* gpio core base address */
- gpio_driver_t in_out; /* Driver Setting */
- gpio_select_t alt_nb; /* Selected Alternate */
-} gpio_param_s;
-
-/*----------------------------------------------------------------------------+
| XX XX
|
| XXXXXX XXX XX XXX XXX
diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c
index 8fb4cfa..1ae3a54 100644
--- a/board/amcc/yucca/yucca.c
+++ b/board/amcc/yucca/yucca.c
@@ -541,18 +541,15 @@ int board_early_init_f (void)
int checkboard (void)
{
- sys_info_t sysinfo;
-
- get_sys_info (&sysinfo);
-
- printf ("Board: AMCC 440SPe Evaluation Board\n");
- printf ("\tVCO: %lu MHz\n", sysinfo.freqVCOMhz / 1000000);
- printf ("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000);
- printf ("\tPLB: %lu MHz\n", sysinfo.freqPLB / 1000000);
- printf ("\tOPB: %lu MHz\n", sysinfo.freqOPB / 1000000);
- printf ("\tEPB: %lu MHz\n", sysinfo.freqEPB / 1000000);
- printf ("\tPCI: %lu MHz\n", sysinfo.freqPCI / 1000000);
- printf ("\tDDR: %lu MHz\n", sysinfo.freqDDR / 1000000);
+ char *s = getenv("serial#");
+
+ printf("Board: Yucca - AMCC 440SPe Evaluation Board");
+ if (s != NULL) {
+ puts(", serial# ");
+ puts(s);
+ }
+ putc('\n');
+
return 0;
}