summaryrefslogtreecommitdiff
path: root/lib_arm
diff options
context:
space:
mode:
authorwdenk <wdenk>2002-11-03 18:03:52 +0000
committerwdenk <wdenk>2002-11-03 18:03:52 +0000
commit699b13a6064e642280caffaa83c10b359a6c1114 (patch)
tree8883f63834e4328bf51ff1341678b30ae2ffe9a5 /lib_arm
parent24ee89b97a49826ea800b4a6c0d5c0769328e317 (diff)
* Fix mdelay() on TRAB - this was still the debugging version with
seconds instead of ms. * Patch by Robert Schwebel, 1 Nov 2002: XScale related cleanup (affects all ARM boards) * Cleanup of names, warnings and README.
Diffstat (limited to 'lib_arm')
-rw-r--r--lib_arm/armlinux.c13
-rw-r--r--lib_arm/board.c4
2 files changed, 13 insertions, 4 deletions
diff --git a/lib_arm/armlinux.c b/lib_arm/armlinux.c
index e5b8faa81d3..33f86e9ffe9 100644
--- a/lib_arm/armlinux.c
+++ b/lib_arm/armlinux.c
@@ -37,16 +37,20 @@
defined (CONFIG_INITRD_TAG) || \
defined (CONFIG_VFD)
static void setup_start_tag(bd_t *bd);
+# ifdef CONFIG_SETUP_MEMORY_TAGS
static void setup_memory_tags(bd_t *bd);
+# endif
static void setup_commandline_tag(bd_t *bd, char *commandline);
#if 0
static void setup_ramdisk_tag(bd_t *bd);
#endif
+# ifdef CONFIG_INITRD_TAG
static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end);
+# endif
static void setup_end_tag(bd_t *bd);
-#if defined (CONFIG_VFD)
+# if defined (CONFIG_VFD)
static void setup_videolfb_tag(gd_t *gd);
-#endif
+# endif
static struct tag *params;
@@ -220,6 +224,7 @@ static void setup_start_tag(bd_t *bd)
}
+#ifdef CONFIG_SETUP_MEMORY_TAGS
static void setup_memory_tags(bd_t *bd)
{
int i;
@@ -234,6 +239,7 @@ static void setup_memory_tags(bd_t *bd)
params = tag_next(params);
}
}
+#endif /* CONFIG_SETUP_MEMORY_TAGS */
static void setup_commandline_tag(bd_t *bd, char *commandline)
@@ -262,6 +268,8 @@ static void setup_commandline_tag(bd_t *bd, char *commandline)
#ifndef ATAG_INITRD2
#define ATAG_INITRD2 0x54420005
#endif
+
+#ifdef CONFIG_INITRD_TAG
static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end)
{
/* an ATAG_INITRD node tells the kernel where the compressed
@@ -275,6 +283,7 @@ static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end)
params = tag_next(params);
}
+#endif /* CONFIG_INITRD_TAG */
#if 0
diff --git a/lib_arm/board.c b/lib_arm/board.c
index e58529f595c..47dc53ce1b2 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -49,7 +49,7 @@ static ulong mem_malloc_brk = 0;
static void mem_malloc_init (ulong dest_addr)
{
mem_malloc_start = dest_addr;
- mem_malloc_end = dest_addr + CONFIG_MALLOC_SIZE;
+ mem_malloc_end = dest_addr + CFG_MALLOC_LEN;
mem_malloc_brk = mem_malloc_start;
memset ((void *) mem_malloc_start, 0,
@@ -169,7 +169,7 @@ init_fnc_t *init_sequence[] = {
env_init, /* initialize environment */
init_baudrate, /* initialze baudrate settings */
serial_init, /* serial communications setup */
- display_banner,
+ display_banner, /* say that we are here */
dram_init, /* configure available RAM banks */
display_dram_config,