Remove unused CONFIG_SERIAL_SOFTWARE_FIFO feature

[platform/kernel/u-boot.git] / arch / i386 / lib / board.c

diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c
index 684cdb8..5002203 100644 (file)
--- a/arch/i386/lib/board.c
+++ b/arch/i386/lib/board.c
@@ -335,13 +335,6 @@ void board_init_r(gd_t *id, ulong dest_addr)
        enable_interrupts();
        show_boot_progress(0x28);
 
-       /* Must happen after interrupts are initialized since
-        * an irq handler gets installed
-        */
-#ifdef CONFIG_SERIAL_SOFTWARE_FIFO
-       serial_buffered_init();
-#endif
-
 #ifdef CONFIG_STATUS_LED
        status_led_set (STATUS_LED_BOOT, STATUS_LED_BLINKING);
 #endif
@@ -431,15 +424,30 @@ void hang (void)
        for (;;);
 }
 
-unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char * const argv[])
+unsigned long do_go_exec (ulong (*entry)(int, char * const []), int argc, char * const argv[])
 {
+       unsigned long ret = 0;
+       char **argv_tmp;
+
        /*
-        * x86 does not use a dedicated register to pass the pointer
-        * to the global_data
+        * x86 does not use a dedicated register to pass the pointer to
+        * the global_data, so it is instead passed as argv[-1]. By using
+        * argv[-1], the called 'Application' can use the contents of
+        * argv natively. However, to safely use argv[-1] a new copy of
+        * argv is needed with the extra element
         */
-       argv[-1] = (char *)gd;
+       argv_tmp = malloc(sizeof(char *) * (argc + 1));
+
+       if (argv_tmp) {
+               argv_tmp[0] = (char *)gd;
+
+               memcpy(&argv_tmp[1], argv, (size_t)(sizeof(char *) * argc));
+
+               ret = (entry) (argc, &argv_tmp[1]);
+               free(argv_tmp);
+       }
 
-       return (entry) (argc, argv);
+       return ret;
 }
 
 void setup_pcat_compatibility(void)