rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / lib_i386 / board.c

diff --git a/lib_i386/board.c b/lib_i386/board.c
index 5d1c1fb5fc981407ffa810e4666be88a5c76cce3..659f9a243abe2a21a1ce9809e015aedd0b5047e3 100644 (file)
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -34,11 +34,12 @@
 #include <devices.h>
 #include <version.h>
 #include <malloc.h>
-#include <syscall.h>
 #include <net.h>
 #include <ide.h>
 #include <asm/u-boot-i386.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 extern long _i386boot_start;
 extern long _i386boot_end;
 extern long _i386boot_romdata_start;
@@ -81,11 +82,9 @@ static ulong mem_malloc_brk = 0;
 
 static int mem_malloc_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* 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() */
@@ -109,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                                                      *
  ************************************************************************
@@ -129,20 +115,8 @@ char *strmhz (char *buf, long hz)
  * or dropped completely,
  * but let's get it working (again) first...
  */
-static void syscalls_init (void)
-{
-       syscall_tbl[SYSCALL_MALLOC] = (void *) malloc;
-       syscall_tbl[SYSCALL_FREE] = (void *) free;
-
-       syscall_tbl[SYSCALL_INSTALL_HDLR] = (void *) irq_install_handler;
-       syscall_tbl[SYSCALL_FREE_HDLR] = (void *) irq_free_handler;
-
-}
-
 static int init_baudrate (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        char tmp[64];   /* long enough for environment variables */
        int i = getenv_r("baudrate", tmp, 64);
 
@@ -163,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);
@@ -178,7 +152,6 @@ static int display_banner (void)
  */
 static int display_dram_config (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        int i;
 
        puts ("DRAM Configuration:\n");
@@ -240,11 +213,10 @@ init_fnc_t *init_sequence[] = {
        NULL,
 };
 
-gd_t *global_data;
+gd_t *gd;
 
 void start_i386boot (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        char *s;
        int i;
        ulong size;
@@ -254,7 +226,9 @@ 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");
 
        memset (gd, 0, sizeof (gd_t));
        gd->bd = &bd_data;
@@ -292,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;
@@ -316,35 +290,23 @@ void start_i386boot (void)
 
        devices_init ();
 
-       /* allocate syscalls table (console_init_r will fill it in */
-       syscall_tbl = (void **) malloc (NR_SYSCALLS * sizeof (void *));
-       memset(syscall_tbl, 0, NR_SYSCALLS * sizeof (void *));
+       jumptable_init ();
 
        /* Initialize the console (after the relocation and devices init) */
        console_init_r();
-       syscalls_init();
 
 #ifdef CONFIG_MISC_INIT_R
        /* miscellaneous platform dependent initialisations */
        misc_init_r();
 #endif
 
-
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && (0)
-       WATCHDOG_RESET();
-# ifdef DEBUG
-       puts ("Reset Ethernet PHY\n");
-# endif
-       reset_phy();
-#endif
-
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE)
+#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE)
        WATCHDOG_RESET();
        puts ("PCMCIA:");
        pcmcia_init();
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
        WATCHDOG_RESET();
        puts("KGDB:  ");
        kgdb_init();
@@ -373,38 +335,48 @@ void start_i386boot (void)
        if ((s = getenv ("loadaddr")) != NULL) {
                load_addr = simple_strtoul (s, NULL, 16);
        }
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
        if ((s = getenv ("bootfile")) != NULL) {
                copy_filename (BootFile, s, sizeof (BootFile));
        }
-#endif /* CFG_CMD_NET */
+#endif
 
        WATCHDOG_RESET();
 
-#if (CONFIG_COMMANDS & CFG_CMD_IDE)
+#if defined(CONFIG_CMD_IDE)
        WATCHDOG_RESET();
        puts("IDE:   ");
        ide_init();
-#endif /* CFG_CMD_IDE */
+#endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_SCSI)
+#if defined(CONFIG_CMD_SCSI)
        WATCHDOG_RESET();
        puts("SCSI:  ");
        scsi_init();
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
+#if defined(CONFIG_CMD_DOC)
        WATCHDOG_RESET();
        puts("DOC:   ");
        doc_init();
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
+#if defined(CONFIG_CMD_NET)
+#if defined(CONFIG_NET_MULTI)
        WATCHDOG_RESET();
        puts("Net:   ");
+#endif
        eth_initialize(gd->bd);
 #endif
 
+#if ( defined(CONFIG_CMD_NET)) && (0)
+       WATCHDOG_RESET();
+# ifdef DEBUG
+       puts ("Reset Ethernet PHY\n");
+# endif
+       reset_phy();
+#endif
+
 #ifdef CONFIG_LAST_STAGE_INIT
        WATCHDOG_RESET();
        /*
@@ -418,10 +390,6 @@ void start_i386boot (void)
 
 #ifdef CONFIG_POST
        post_run (NULL, POST_RAM | post_bootmode_get(0));
-       if (post_bootmode_get(0) & POST_POWERFAIL) {
-               post_bootmode_clear();
-               board_poweroff();
-       }
 #endif
 
 
@@ -440,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);
+}