Changeset 232cd4f in mainline for kernel/arch/mips32

Timestamp:

2012-12-05T21:39:28Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

295732b

Parents:

c0a7545

Message:

Remove support for the lgxemul and bgxemul machines and GXemul drivers.

Location:

kernel/arch/mips32

Files:

• Makefile.inc (modified) (1 diff)
• src/mips32.c (modified) (3 diffs)
• src/mm/frame.c (modified) (2 diffs)

kernel/arch/mips32/Makefile.inc

@@ -36 +36 @@
 #
 
-ifeq ($(MACHINE),lgxemul)
-        BFD_NAME = elf32-tradlittlemips
-        ENDIANESS = LE
-endif
-ifeq ($(MACHINE),bgxemul)
-        BFD_NAME = elf32-tradbigmips
-        ENDIANESS = BE
-        GCC_CFLAGS += -D__BE__
-endif
 ifeq ($(MACHINE),msim)
         BFD_NAME = elf32-tradlittlemips

kernel/arch/mips32/src/mips32.c

@@ -125 +125 @@
         interrupt_init();
         
-#ifdef CONFIG_FB
-        /* GXemul framebuffer */
-        fb_properties_t gxemul_prop = {
-                .addr = 0x12000000,
-                .offset = 0,
-                .x = 640,
-                .y = 480,
-                .scan = 1920,
-                .visual = VISUAL_RGB_8_8_8,
-        };
-        
-        outdev_t *fbdev = fb_init(&gxemul_prop);
-        if (fbdev)
-                stdout_wire(fbdev);
-#endif
-
 #ifdef CONFIG_MIPS_PRN
         outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
@@ -164 +148 @@
         platform = "msim";
 #endif
-#ifdef MACHINE_bgxemul
-        platform = "gxemul";
-#endif
-#ifdef MACHINE_lgxemul
-        platform = "gxemul";
-#endif
         sysinfo_set_item_data("platform", NULL, (void *) platform,
             str_size(platform));
@@ -175 +153 @@
 #ifdef CONFIG_MIPS_KBD
         /*
-         * Initialize the msim/GXemul keyboard port. Then initialize the serial line
-         * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
+         * Initialize the msim keyboard port. Then initialize the serial line
+         * module and connect it to the msim keyboard. Enable keyboard
+         * interrupts.
          */
         dsrlnin_instance_t *dsrlnin_instance

kernel/arch/mips32/src/mm/frame.c

@@ -82 +82 @@
         /* MSIM device (dkeyboard) */
         if (frame == (KA2PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH))
-                return false;
-#endif
-        
-#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
-        /* gxemul devices */
-        if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
-            0x10000000, MiB2SIZE(256)))
                 return false;
 #endif
@@ -225 +218 @@
                                         if (ZERO_PAGE_VALUE != 0xdeadbeef)
                                                 avail = false;
-#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
-                                        else {
-                                                ZERO_PAGE_VALUE_KSEG1(frame) = 0xaabbccdd;
-                                                if (ZERO_PAGE_VALUE_KSEG1(frame) != 0xaabbccdd)
-                                                        avail = false;
-                                        }
-#endif
                                 }
                         }