Changeset f9ab562 in mainline


Ignore:
Timestamp:
2012-12-02T22:29:34Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5a00ee0, 5df69cb
Parents:
5481a22e
Message:

Remove support for the testarm machine.

Files:
4 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r5481a22e rf9ab562  
    6363% Machine type
    6464@ "gta02" GTA02 / Neo FreeRunner
    65 @ "testarm" GXEmul Testarm
    6665@ "integratorcp" Integratorcp
    6766@ "beagleboardxm" BeogleBoard-xM
    … …  
    8988% CPU type
    9089@ "armv4" ARMv4
    91 ! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=testarm)] PROCESSOR (choice)
     90! [PLATFORM=arm32&(MACHINE=gta02)] PROCESSOR (choice)
    9291
    9392% CPU type
    … …  
    415414@ "generic" Keyboard or serial line
    416415@ "none" No input device
    417 ! [PLATFORM=ia32|(PLATFORM=arm32&MACHINE=testarm)|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice)
     416! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice)
    418417
    419418% Input device class
    … …  
    440439! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] CONFIG_HID_OUT (choice)
    441440
    442 % Output device class
    443 @ "generic" Monitor or serial line
    444 @ "monitor" Monitor
    445 @ "serial" Serial line
    446 @ "none" No output device
    447 ! [PLATFORM=arm32&MACHINE=testarm] CONFIG_HID_OUT (choice)
    448 
    449441% PC keyboard support
    450442! [CONFIG_HID_IN=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
    … …  
    461453% Support for msim/GXemul printer
    462454! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_PRN (y/n)
    463 
    464 % Support for GXemul keyboard
    465 ! [CONFIG_HID_IN=generic&PLATFORM=arm32&MACHINE=testarm] CONFIG_ARM_KBD (y/n)
    466 
    467 % Support for GXemul printer
    468 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=testarm] CONFIG_ARM_PRN (y/n)
    469455
    470456% Support for VIA CUDA controller

  • boot/arch/arm32/Makefile.inc

    r5481a22e rf9ab562  
    5757endif
    5858
    59 ifeq ($(MACHINE), gxemul)
    60 RD_SRVS_NON_ESSENTIAL += \
    61         $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
    62 endif
    63 
    6459RD_DRVS += \
    6560        infrastructure/rootamdm37x \

  • boot/arch/arm32/include/main.h

    r5481a22e rf9ab562  
    6363
    6464
    65 /** GXemul testarm serial console output register */
    66 #define TESTARM_SCONS_ADDR      0x10000000
    67 
    6865/** IntegratorCP serial console output register */
    6966#define ICP_SCONS_ADDR          0x16000000

  • boot/arch/arm32/src/putchar.c

    r5481a22e rf9ab562  
    8787#endif
    8888
    89 #ifdef MACHINE_testarm
    90 
    91 /** Send a byte to the GXemul testarm serial console.
    92  *
    93  * @param byte          Byte to send.
    94  */
    95 static void scons_sendb_testarm(uint8_t byte)
    96 {
    97         *((volatile uint8_t *) TESTARM_SCONS_ADDR) = byte;
    98 }
    99 
    100 #endif
    101 
    10289#ifdef MACHINE_integratorcp
    10390
    … …  
    125112        scons_sendb_gta02(byte);
    126113#endif
    127 #ifdef MACHINE_testarm
    128         scons_sendb_testarm(byte);
    129 #endif
    130114#ifdef MACHINE_integratorcp
    131115        scons_sendb_icp(byte);

  • kernel/arch/arm32/Makefile.inc

    r5481a22e rf9ab562  
    7676endif
    7777
    78 ifeq ($(MACHINE),testarm)
    79         ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
    80 endif
    81 
    8278ifeq ($(MACHINE),integratorcp)
    8379        ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c

  • kernel/arch/arm32/include/fpu_context.h

    r5481a22e rf9ab562  
    3131 */
    3232/** @file
    33  *  @brief FPU context (not implemented).
    34  *
    35  *  GXemul doesn't support FPU on its ARM CPU.
     33 *  @brief FPU context.
    3634 */
    3735

  • kernel/arch/arm32/src/mach/gta02/gta02.c

    r5481a22e rf9ab562  
    2727 */
    2828
    29 /** @addtogroup arm32gxemul
     29/** @addtogroup arm32gta02
    3030 * @{
    3131 */

  • kernel/arch/arm32/src/machine_func.c

    r5481a22e rf9ab562  
    4141#include <arch/mach/gta02/gta02.h>
    4242#include <arch/mach/integratorcp/integratorcp.h>
    43 #include <arch/mach/testarm/testarm.h>
    4443#include <arch/mach/beagleboardxm/beagleboardxm.h>
    4544
    … …  
    5251#if defined(MACHINE_gta02)
    5352        machine_ops = &gta02_machine_ops;
    54 #elif defined(MACHINE_testarm)
    55         machine_ops = &gxemul_machine_ops;
    5653#elif defined(MACHINE_integratorcp)
    5754        machine_ops = &icp_machine_ops;

  • release/Makefile

    r5481a22e rf9ab562  
    3232SRC_ARCHIVE = HelenOS-$(RELEASE).tar.bz2
    3333
    34 PROFILES = amd64 arm32/GXemul arm32/integratorcp arm32/gta02 ia32 \
     34PROFILES = amd64 arm32/integratorcp arm32/gta02 arm32/beagleboardxm ia32 \
    3535    ia64/i460GX ia64/ski mips32/GXemul mips32/msim ppc32 \
    3636    sparc64/ultra

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

    r5481a22e rf9ab562  
    423423        kbd_add_dev(&chardev_port, &stty_ctl);
    424424#endif
    425 #if defined(UARCH_arm32) && defined(MACHINE_testarm) && defined(CONFIG_FB)
    426         kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
    427 #endif
    428 #if defined(UARCH_arm32) && defined(MACHINE_testarm) && !defined(CONFIG_FB)
    429         kbd_add_dev(&gxemul_port, &stty_ctl);
    430 #endif
    431425#if defined(UARCH_arm32) && defined(MACHINE_integratorcp)
    432426        kbd_add_dev(&pl050_port, &pc_ctl);
Note: See TracChangeset for help on using the changeset viewer.