rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / lib_i386 / board.c

diff --git a/lib_i386/board.c b/lib_i386/board.c
index 47fbab4ccb4dd9d96a00e5b1bd81d1d3effa69da..659f9a243abe2a21a1ce9809e015aedd0b5047e3 100644 (file)
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -84,7 +84,7 @@ static int mem_malloc_init(void)
 {
        /* start malloc area right after the stack */
        mem_malloc_start = i386boot_bss_start +
-               i386boot_bss_size + CFG_STACK_SIZE;
+               i386boot_bss_size + CONFIG_SYS_STACK_SIZE;
        mem_malloc_start = (mem_malloc_start+3)&~3;
 
        /* Use all available RAM for malloc() */
@@ -108,19 +108,6 @@ void *sbrk (ptrdiff_t increment)
        return ((void *) old);
 }
 
-char *strmhz (char *buf, long hz)
-{
-       long l, n;
-       long m;
-
-       n = hz / 1000000L;
-       l = sprintf (buf, "%ld", n);
-       m = (hz % 1000000L) / 1000L;
-       if (m != 0)
-               sprintf (buf + l, ".%03ld", m);
-       return (buf);
-}
-
 /************************************************************************
  * Init Utilities                                                      *
  ************************************************************************
@@ -150,7 +137,7 @@ static int display_banner (void)
                i386boot_romdata_dest, i386boot_romdata_dest+i386boot_romdata_size-1,
                i386boot_bss_start, i386boot_bss_start+i386boot_bss_size-1,
                i386boot_bss_start+i386boot_bss_size,
-               i386boot_bss_start+i386boot_bss_size+CFG_STACK_SIZE-1);
+               i386boot_bss_start+i386boot_bss_size+CONFIG_SYS_STACK_SIZE-1);
 
 
        return (0);
@@ -226,7 +213,7 @@ init_fnc_t *init_sequence[] = {
        NULL,
 };
 
-gd_t *global_data;
+gd_t *gd;
 
 void start_i386boot (void)
 {
@@ -239,7 +226,7 @@ void start_i386boot (void)
 
        show_boot_progress(0x21);
 
-       gd = global_data = &gd_data;
+       gd = &gd_data;
        /* compiler optimization barrier needed for GCC >= 3.4 */
        __asm__ __volatile__("": : :"memory");
 
@@ -279,7 +266,7 @@ void start_i386boot (void)
                int i;
                ulong reg;
                char *s, *e;
-               uchar tmp[64];
+               char tmp[64];
 
                i = getenv_r ("ethaddr", tmp, sizeof (tmp));
                s = (i > 0) ? tmp : NULL;
@@ -421,3 +408,14 @@ void hang (void)
        puts ("### ERROR ### Please RESET the board ###\n");
        for (;;);
 }
+
+unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *argv[])
+{
+       /*
+        * TODO: Test this function - changed to fix compiler error.
+        * Original code was:
+        *   return (entry >> 1) (argc, argv);
+        * with a comment about Nios function pointers are address >> 1
+        */
+       return (entry) (argc, argv);
+}