Changeset 5206

Timestamp:

Mar 13, 2010 11:07:15 PM (3 years ago)

Author:

oxygene

Message:

Fix llshell

Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Patrick Georgi <patrick.georgi@…>

Location:

trunk/src

Files:

• Kconfig (modified) (1 diff)
• arch/i386/Makefile.inc (modified) (1 diff)
• arch/i386/include/arch/llshell.h (added)
• arch/i386/llshell/console.inc (added)
• arch/i386/llshell/llshell.inc (modified) (1 diff)
• arch/i386/llshell/pci.inc (added)
• arch/i386/llshell/ramtest.inc (added)
• mainboard/thomson/ip1000/romstage.c (modified) (2 diffs)

trunk/src/Kconfig

@@ -794 +794 @@
           If unsure, say N.
 
+config LLSHELL
+        bool "Built-in low-level shell"
+        default n
+        help
+          If enabled, you will have a low level shell to examine your machine.
+          Put llshell() in your (romstage) code to start the shell.
+          See src/arch/i386/llshell/llshell.inc for details.
+
 endmenu
 

trunk/src/arch/i386/Makefile.inc

@@ -149 +149 @@
 endif
 endif
+
+ifeq ($(CONFIG_LLSHELL),y)
+crt0s += $(src)/arch/i386/llshell/llshell.inc
+endif
+
 crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 

trunk/src/arch/i386/llshell/llshell.inc

@@ +1 @@
+#include "console.inc"
+#include "pci.inc"
+#include "ramtest.inc"
+
 jmp llshell_out
 

trunk/src/mainboard/thomson/ip1000/romstage.c

@@ -29 +29 @@
 #include <arch/romcc_io.h>
 #include <arch/hlt.h>
+#include <arch/llshell.h>
 #include "pc80/serial.c"
 #include "pc80/udelay_io.c"
@@ -130 +131 @@
         sdram_initialize();
 
+#if CONFIG_LLSHELL
+        llshell();
+#endif
         /* Check RAM. */
         /* ram_check(0, 640 * 1024); */