Changeset 232cd4f in mainline


Ignore:
Timestamp:
2012-12-05T21:39:28Z (11 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.

Files:
6 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    rc0a7545 r232cd4f  
    4444% Machine type
    4545@ "msim" MSIM
    46 @ "bgxemul" GXEmul big endian
    47 @ "lgxemul" GXEmul little endian
    4846@ "bmalta" MIPS Malta Development Board big endian
    4947@ "lmalta" MIPS Malta Development Board little endian
    … …  
    186184% User space architecture
    187185@ "mips32"
    188 ! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lgxemul|MACHINE=lmalta)] UARCH (choice)
     186! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lmalta)] UARCH (choice)
    189187
    190188% User space architecture
    191189@ "mips32eb"
    192 ! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=bmalta)] UARCH (choice)
     190! [PLATFORM=mips32&MACHINE=bmalta] UARCH (choice)
    193191
    194192% User space architecture
    … …  
    265263@ "elf"
    266264! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] IMAGE (choice)
    267 
    268 % Image format
    269 @ "ecoff"
    270 ! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice)
    271265
    272266% Image format
    … …  
    357351! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64] CONFIG_FPU (y)
    358352
    359 % FPU support
    360 ! [PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FPU (y)
    361 
    362353## armv7 made fpu hardware compulsory
    363354% FPU support
    … …  
    446437! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&(MACHINE=msim|MACHINE=bmalta|MACHINE=lmalta))|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice)
    447438
    448 % Output device class
    449 @ "generic" Monitor or serial line
    450 @ "monitor" Monitor
    451 @ "serial" Serial line
    452 @ "none" No output device
    453 ! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] CONFIG_HID_OUT (choice)
    454 
    455439% PC keyboard support
    456440! [CONFIG_HID_IN=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
    … …  
    462446! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n)
    463447
    464 % Support for msim/GXemul keyboard
     448% Support for msim keyboard
    465449! [CONFIG_HID_IN=generic&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_KBD (y/n)
    466450
    467 % Support for msim/GXemul printer
     451% Support for msim printer
    468452! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_PRN (y/n)
    469453
    … …  
    518502% Framebuffer support
    519503! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ppc32)] CONFIG_FB (y/n)
    520 
    521 % Framebuffer support
    522 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FB (y/n)
    523504
    524505% Framebuffer support

  • boot/arch/mips32/Makefile.inc

    rc0a7545 r232cd4f  
    3131EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
    3232
    33 RD_SRVS_NON_ESSENTIAL += \
    34         $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
    35 
    36 ifeq ($(MACHINE),lgxemul)
    37         BFD_NAME = elf32-tradlittlemips
    38         BFD_OUTPUT = ecoff-littlemips
    39         ENDIANESS = LE
    40 endif
    41 ifeq ($(MACHINE),bgxemul)
    42         BFD_NAME = elf32-tradbigmips
    43         BFD_OUTPUT = ecoff-bigmips
    44         ENDIANESS = BE
    45 endif
    4633ifeq ($(MACHINE),msim)
    4734        BFD_NAME = elf32-tradlittlemips

  • kernel/arch/mips32/Makefile.inc

    rc0a7545 r232cd4f  
    3636#
    3737
    38 ifeq ($(MACHINE),lgxemul)
    39         BFD_NAME = elf32-tradlittlemips
    40         ENDIANESS = LE
    41 endif
    42 ifeq ($(MACHINE),bgxemul)
    43         BFD_NAME = elf32-tradbigmips
    44         ENDIANESS = BE
    45         GCC_CFLAGS += -D__BE__
    46 endif
    4738ifeq ($(MACHINE),msim)
    4839        BFD_NAME = elf32-tradlittlemips

  • kernel/arch/mips32/src/mips32.c

    rc0a7545 r232cd4f  
    125125        interrupt_init();
    126126       
    127 #ifdef CONFIG_FB
    128         /* GXemul framebuffer */
    129         fb_properties_t gxemul_prop = {
    130                 .addr = 0x12000000,
    131                 .offset = 0,
    132                 .x = 640,
    133                 .y = 480,
    134                 .scan = 1920,
    135                 .visual = VISUAL_RGB_8_8_8,
    136         };
    137        
    138         outdev_t *fbdev = fb_init(&gxemul_prop);
    139         if (fbdev)
    140                 stdout_wire(fbdev);
    141 #endif
    142 
    143127#ifdef CONFIG_MIPS_PRN
    144128        outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
    … …  
    164148        platform = "msim";
    165149#endif
    166 #ifdef MACHINE_bgxemul
    167         platform = "gxemul";
    168 #endif
    169 #ifdef MACHINE_lgxemul
    170         platform = "gxemul";
    171 #endif
    172150        sysinfo_set_item_data("platform", NULL, (void *) platform,
    173151            str_size(platform));
    … …  
    175153#ifdef CONFIG_MIPS_KBD
    176154        /*
    177          * Initialize the msim/GXemul keyboard port. Then initialize the serial line
    178          * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
     155         * Initialize the msim keyboard port. Then initialize the serial line
     156         * module and connect it to the msim keyboard. Enable keyboard
     157         * interrupts.
    179158         */
    180159        dsrlnin_instance_t *dsrlnin_instance

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

    rc0a7545 r232cd4f  
    8282        /* MSIM device (dkeyboard) */
    8383        if (frame == (KA2PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH))
    84                 return false;
    85 #endif
    86        
    87 #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
    88         /* gxemul devices */
    89         if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
    90             0x10000000, MiB2SIZE(256)))
    9184                return false;
    9285#endif
    … …  
    225218                                        if (ZERO_PAGE_VALUE != 0xdeadbeef)
    226219                                                avail = false;
    227 #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
    228                                         else {
    229                                                 ZERO_PAGE_VALUE_KSEG1(frame) = 0xaabbccdd;
    230                                                 if (ZERO_PAGE_VALUE_KSEG1(frame) != 0xaabbccdd)
    231                                                         avail = false;
    232                                         }
    233 #endif
    234220                                }
    235221                        }

  • kernel/arch/mips64/src/mips64.c

    rc0a7545 r232cd4f  
    153153#ifdef CONFIG_MIPS_KBD
    154154        /*
    155          * Initialize the msim/GXemul keyboard port. Then initialize the serial line
    156          * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
     155         * Initialize the msim keyboard port. Then initialize the serial line
     156         * module and connect it to the msim keyboard. Enable keyboard
     157         * interrupts.
    157158         */
    158159        dsrlnin_instance_t *dsrlnin_instance

  • release/Makefile

    rc0a7545 r232cd4f  
    3333
    3434PROFILES = amd64 arm32/integratorcp arm32/gta02 arm32/beagleboardxm ia32 \
    35     ia64/i460GX ia64/ski mips32/GXemul mips32/msim ppc32 \
    36     sparc64/ultra
     35    ia64/i460GX ia64/ski mips32/msim ppc32 sparc64/ultra
    3736
    3837BZR = bzr

  • tools/autotool.py

    rc0a7545 r232cd4f  
    676676                                common['CC_ARGS'].append("-mabi=32")
    677677                               
    678                                 if ((config['MACHINE'] == "lgxemul") or (config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):
     678                                if ((config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):
    679679                                        target = config['PLATFORM']
    680680                                        gnu_target = "mipsel-linux-gnu"
    681681                               
    682                                 if ((config['MACHINE'] == "bgxemul") or (config['MACHINE'] == "bmalta")):
     682                                if ((config['MACHINE'] == "bmalta")):
    683683                                        target = "mips32eb"
    684684                                        gnu_target = "mips-linux-gnu"

  • uspace/Makefile

    rc0a7545 r232cd4f  
    9393        srv/bd/sata_bd \
    9494        srv/bd/file_bd \
    95         srv/bd/gxe_bd \
    9695        srv/bd/rd \
    9796        srv/bd/part/guid_part \

  • uspace/app/init/init.c

    rc0a7545 r232cd4f  
    369369#ifdef CONFIG_START_BD
    370370        srv_start("/srv/ata_bd");
    371         srv_start("/srv/gxe_bd");
    372371#endif
    373372       

  • uspace/srv/hid/input/Makefile

    rc0a7545 r232cd4f  
    3838        port/adb_mouse.c \
    3939        port/chardev.c \
    40         port/gxemul.c \
    4140        port/msim.c \
    4241        port/niagara.c \
    … …  
    4746        proto/mousedev.c \
    4847        ctl/apple.c \
    49         ctl/gxe_fb.c \
    5048        ctl/kbdev.c \
    5149        ctl/pc.c \

  • uspace/srv/hid/input/input.c

    rc0a7545 r232cd4f  
    432432        kbd_add_dev(&msim_port, &stty_ctl);
    433433#endif
    434 #if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)
    435         kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
    436 #endif
    437 #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul) && !defined(CONFIG_FB)
    438         kbd_add_dev(&gxemul_port, &stty_ctl);
    439 #endif
    440434#if defined(UARCH_ppc32)
    441435        kbd_add_dev(&adb_port, &apple_ctl);

  • uspace/srv/hid/input/kbd_ctl.h

    rc0a7545 r232cd4f  
    4949
    5050extern kbd_ctl_ops_t apple_ctl;
    51 extern kbd_ctl_ops_t gxe_fb_ctl;
    5251extern kbd_ctl_ops_t kbdev_ctl;
    5352extern kbd_ctl_ops_t pc_ctl;

  • uspace/srv/hid/input/kbd_port.h

    rc0a7545 r232cd4f  
    5151extern kbd_port_ops_t adb_port;
    5252extern kbd_port_ops_t chardev_port;
    53 extern kbd_port_ops_t gxemul_port;
    5453extern kbd_port_ops_t msim_port;
    5554extern kbd_port_ops_t niagara_port;
Note: See TracChangeset for help on using the changeset viewer.