Changes in / [bd48f4c:bee2d4c] in mainline


Ignore:
Files:
7 deleted
23 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    rbd48f4c rbee2d4c  
    5858
    5959% Machine type
    60 @ "gta02" GTA02 / Neo FreeRunner
    6160@ "testarm" GXEmul Testarm
    6261@ "integratorcp" Integratorcp
    … …  
    390389% Output device class
    391390@ "generic" Monitor or serial line
    392 ! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp)] CONFIG_HID_OUT (choice)
     391! [PLATFORM=arm32&MACHINE=integratorcp] CONFIG_HID_OUT (choice)
    393392
    394393% Output device class
    … …  
    437436% Support for NS16550 controller
    438437! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n)
    439 
    440 % Support for Samsung S3C24XX on-chip UART
    441 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_UART (y/n)
    442438
    443439% Support for Z8530 controller

  • boot/Makefile

    rbd48f4c rbee2d4c  
    7272
    7373clean_dist:
    74         rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
     74        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) *.co
    7575        rm -f $(USPACE_PATH)/dist/srv/*
    7676        rm -f $(USPACE_PATH)/dist/app/*

  • boot/Makefile.build

    rbd48f4c rbee2d4c  
    106106        $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
    107107
    108 $(LINK): $(LINK).comp $(DEPEND)
    109         $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).comp | grep -v "^\#" > $(LINK)
    110 
    111108%.o: %.S $(DEPEND)
    112109        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

  • boot/Makefile.common

    rbd48f4c rbee2d4c  
    5555MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
    5656MKFAT = $(TOOLS_PATH)/mkfat.py
    57 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
    5857
    5958JOBFILE = $(ROOT_PATH)/tools/jobfile.py

  • boot/arch/arm32/Makefile.inc

    rbd48f4c rbee2d4c  
    2727#
    2828
    29 ifeq ($(MACHINE), gta02)
    30         BOOT_OUTPUT = image.boot
    31         POST_OUTPUT = $(ROOT_PATH)/uImage.bin
    32         POSTBUILD = Makefile.uboot
    33 endif
    34 
    3529BFD_NAME = elf32-littlearm
    3630BFD_OUTPUT = $(BFD_NAME)

  • boot/arch/arm32/_link.ld.in

    rbd48f4c rbee2d4c  
    1 #include <arch/arch.h>
    2 
    31ENTRY(start)
    42
    53SECTIONS {
    6         . = BOOT_BASE;
     4        . = 0x0000;
    75        .text : {
    86                *(BOOTSTRAP);
    97                *(.text);
    108        }
    11         . = BOOT_BASE + 0x8000;
     9        . = 0x8000;
    1210        .data : {
    1311                *(BOOTPT);      /* bootstrap page table */

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

    rbd48f4c rbee2d4c  
    3636#define PTL0_ENTRY_SIZE  4
    3737
    38 /*
    39  * Address where the boot stage image starts (beginning of usable physical
    40  * memory).
    41  */
    42 #ifdef MACHINE_gta02
    43 #define BOOT_BASE       0x30008000
    44 #else
    45 #define BOOT_BASE       0x00000000
    46 #endif
    47 
    48 #define BOOT_OFFSET     (BOOT_BASE + 0xa00000)
     38#define BOOT_OFFSET  0xa00000
    4939
    5040#ifndef __ASM__

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

    rbd48f4c rbee2d4c  
    11/*
    22 * Copyright (c) 2007 Michal Kebrt
    3  * Copyright (c) 2010 Jiri Svoboda
    43 * All rights reserved.
    54 *
    … …  
    3938
    4039/** Address where characters to be printed are expected. */
     40#ifdef MACHINE_testarm
     41        #define VIDEORAM_ADDRESS  0x10000000
     42#endif
    4143
    42 /** GTA02 serial console UART register addresses.
    43  *
    44  * This is UART channel 2 of the S3C24xx CPU
    45  */
    46 #define GTA02_SCONS_UTRSTAT     0x50008010
    47 #define GTA02_SCONS_UTXH        0x50008020
    48 
    49 /* Bits in UTXH register */
    50 #define S3C24XX_UTXH_TX_EMPTY   0x00000004
    51 
    52 
    53 /** GXemul testarm serial console output register */
    54 #define TESTARM_SCONS_ADDR      0x10000000
    55 
    56 /** IntegratorCP serial console output register */
    57 #define ICP_SCONS_ADDR          0x16000000
     44#ifdef MACHINE_integratorcp
     45        #define VIDEORAM_ADDRESS  0x16000000
     46#endif
    5847
    5948extern void bootstrap(void);

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

    rbd48f4c rbee2d4c  
    22 * Copyright (c) 2007 Michal Kebrt
    33 * Copyright (c) 2009 Vineeth Pillai
    4  * Copyright (c) 2010 Jiri Svoboda
    54 * All rights reserved.
    65 *
    … …  
    4140#include <str.h>
    4241
    43 #ifdef MACHINE_gta02
    44 
    45 /** Send a byte to the gta02 serial console.
    46  *
    47  * @param byte          Byte to send.
    48  */
    49 static void scons_sendb_gta02(uint8_t byte)
    50 {
    51         volatile uint32_t *utrstat;
    52         volatile uint32_t *utxh;
    53 
    54         utrstat = (volatile uint32_t *) GTA02_SCONS_UTRSTAT;
    55         utxh    = (volatile uint32_t *) GTA02_SCONS_UTXH;
    56 
    57         /* Wait until transmitter is empty. */
    58         while ((*utrstat & S3C24XX_UTXH_TX_EMPTY) == 0)
    59                 ;
    60 
    61         /* Transmit byte. */
    62         *utxh = (uint32_t) byte;
    63 }
    64 
    65 #endif
    66 
    67 #ifdef MACHINE_testarm
    68 
    69 /** Send a byte to the GXemul testarm serial console.
    70  *
    71  * @param byte          Byte to send.
    72  */
    73 static void scons_sendb_testarm(uint8_t byte)
    74 {
    75         *((volatile uint8_t *) TESTARM_SCONS_ADDR) = byte;
    76 }
    77 
    78 #endif
    79 
    80 #ifdef MACHINE_integratorcp
    81 
    82 /** Send a byte to the IntegratorCP serial console.
    83  *
    84  * @param byte          Byte to send.
    85  */
    86 static void scons_sendb_icp(uint8_t byte)
    87 {
    88         *((volatile uint8_t *) ICP_SCONS_ADDR) = byte;
    89 }
    90 
    91 #endif
    92 
    93 /** Send a byte to the serial console.
    94  *
    95  * @param byte          Byte to send.
    96  */
    97 static void scons_sendb(uint8_t byte)
    98 {
    99 #ifdef MACHINE_gta02
    100         scons_sendb_gta02(byte);
    101 #endif
    102 #ifdef MACHINE_testarm
    103         scons_sendb_testarm(byte);
    104 #endif
    105 #ifdef MACHINE_integratorcp
    106         scons_sendb_icp(byte);
    107 #endif
    108 }
    109 
    110 /** Display a character
    111  *
    112  * @param ch    Character to display
    113  */
    11442void putchar(const wchar_t ch)
    11543{
    11644        if (ch == '\n')
    117                 scons_sendb('\r');
    118 
     45                *((volatile char *) VIDEORAM_ADDRESS) = '\r';
     46       
    11947        if (ascii_check(ch))
    120                 scons_sendb((uint8_t) ch);
     48                *((volatile char *) VIDEORAM_ADDRESS) = ch;
    12149        else
    122                 scons_sendb(U_SPECIAL);
     50                *((volatile char *) VIDEORAM_ADDRESS) = U_SPECIAL;
    12351}
    12452

  • kernel/arch/arm32/Makefile.inc

    rbd48f4c rbee2d4c  
    6060        arch/$(KARCH)/src/ras.c
    6161
    62 ifeq ($(MACHINE),gta02)
    63         ARCH_SOURCES += arch/$(KARCH)/src/mach/gta02/gta02.c
    64 endif
    65 
    6662ifeq ($(MACHINE),testarm)
    6763        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c

  • kernel/arch/arm32/_link.ld.in

    rbd48f4c rbee2d4c  
    77 */
    88
    9 #ifdef MACHINE_gta02
    10 #define KERNEL_LOAD_ADDRESS 0xb0a08000
    11 #else
    129#define KERNEL_LOAD_ADDRESS 0x80a00000
    13 #endif
    1410
    1511OUTPUT_ARCH(arm)

  • kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

    rbd48f4c rbee2d4c  
    103103extern void icp_cpu_halt(void);
    104104extern void icp_irq_exception(unsigned int, istate_t *);
    105 extern void icp_get_memory_extents(uintptr_t *, uintptr_t *);
     105extern uintptr_t icp_get_memory_size(void);
    106106extern void icp_frame_init(void);
    107107

  • kernel/arch/arm32/include/mach/testarm/testarm.h

    rbd48f4c rbee2d4c  
    7373extern void gxemul_cpu_halt(void);
    7474extern void gxemul_irq_exception(unsigned int, istate_t *);
    75 extern void gxemul_get_memory_extents(uintptr_t *, uintptr_t *);
     75extern uintptr_t gxemul_get_memory_size(void);
    7676extern void gxemul_frame_init(void);
    7777

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

    rbd48f4c rbee2d4c  
    4747
    4848struct arm_machine_ops {
    49         void (*machine_init)(void);
    50         void (*machine_timer_irq_start)(void);
    51         void (*machine_cpu_halt)(void);
    52         void (*machine_get_memory_extents)(uintptr_t *, uintptr_t *);
    53         void (*machine_irq_exception)(unsigned int, istate_t *);
    54         void (*machine_frame_init)(void);
    55         void (*machine_output_init)(void);
    56         void (*machine_input_init)(void);
     49        void            (*machine_init)(void);
     50        void            (*machine_timer_irq_start)(void);
     51        void            (*machine_cpu_halt)(void);
     52        uintptr_t       (*machine_get_memory_size)(void);
     53        void            (*machine_irq_exception)(unsigned int, istate_t*);
     54        void            (*machine_frame_init)(void);
     55        void            (*machine_output_init)(void);
     56        void            (*machine_input_init)(void);
    5757};
    5858
    … …  
    7474extern void machine_cpu_halt(void);
    7575
    76 /** Get extents of available memory.
     76
     77/** Returns size of available memory.
    7778 *
    78  * @param start         Place to store memory start address.
    79  * @param size          Place to store memory size.
     79 *  @return Size of available memory.
    8080 */
    81 extern void machine_get_memory_extents(uintptr_t *start, uintptr_t *size);
     81extern uintptr_t machine_get_memory_size(void);
     82
    8283
    8384/** Interrupt exception handler.

  • kernel/arch/arm32/include/mm/frame.h

    rbd48f4c rbee2d4c  
    4646
    4747#define BOOT_PAGE_TABLE_SIZE     0x4000
    48 
    49 #ifdef MACHINE_gta02
    50 #define BOOT_PAGE_TABLE_ADDRESS  0x30010000
    51 #else
    52 #define BOOT_PAGE_TABLE_ADDRESS  0x00008000
    53 #endif
     48#define BOOT_PAGE_TABLE_ADDRESS  0x8000
    5449
    5550#define BOOT_PAGE_TABLE_START_FRAME     (BOOT_PAGE_TABLE_ADDRESS >> FRAME_WIDTH)
    5651#define BOOT_PAGE_TABLE_SIZE_IN_FRAMES  (BOOT_PAGE_TABLE_SIZE >> FRAME_WIDTH)
    57 
    58 #ifdef MACHINE_gta02
    59 #define PHYSMEM_START_ADDR      0x30008000
    60 #else
    61 #define PHYSMEM_START_ADDR      0x00000000
    62 #endif
    6352
    6453extern uintptr_t last_frame;

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

    rbd48f4c rbee2d4c  
    6060        icp_timer_irq_start,
    6161        icp_cpu_halt,
    62         icp_get_memory_extents,
     62        icp_get_memory_size,
    6363        icp_irq_exception,
    6464        icp_frame_init,
    … …  
    214214}
    215215
    216 /** Get extents of available memory.
    217  *
    218  * @param start         Place to store memory start address.
    219  * @param size          Place to store memory size.
    220  */
    221 void icp_get_memory_extents(uintptr_t *start, uintptr_t *size)
    222 {
    223         *start = 0;
    224 
     216/** Returns the size of emulated memory.
     217 *
     218 * @return Size in bytes.
     219 */
     220size_t icp_get_memory_size(void)
     221{
    225222        if (hw_map_init_called) {
    226                 *size = (sdram[((*(uint32_t *)icp_hw_map.sdramcr &
    227                     ICP_SDRAM_MASK) >> 2)]);
     223                return (sdram[((*(uint32_t *)icp_hw_map.sdramcr & ICP_SDRAM_MASK) >> 2)]);
    228224        } else {
    229                 *size = SDRAM_SIZE;
    230         }
     225                return SDRAM_SIZE;
     226        }
     227       
    231228}
    232229

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

    rbd48f4c rbee2d4c  
    6060        gxemul_timer_irq_start,
    6161        gxemul_cpu_halt,
    62         gxemul_get_memory_extents,
     62        gxemul_get_memory_size,
    6363        gxemul_irq_exception,
    6464        gxemul_frame_init,
    … …  
    185185}
    186186
    187 /** Get extents of available memory.
    188  *
    189  * @param start         Place to store memory start address.
    190  * @param size          Place to store memory size.
    191  */
    192 void gxemul_get_memory_extents(uintptr_t *start, uintptr_t *size)
    193 {
    194         *start = 0;
    195         *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
    196 }
     187/** Returns the size of emulated memory.
     188 *
     189 * @return Size in bytes.
     190 */
     191uintptr_t gxemul_get_memory_size(void)
     192{
     193        return  *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
     194}
     195
    197196
    198197/** Returns the mask of active interrupts. */

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

    rbd48f4c rbee2d4c  
    3939
    4040#include <arch/machine_func.h>
    41 #include <arch/mach/gta02/gta02.h>
    4241#include <arch/mach/integratorcp/integratorcp.h>
    4342#include <arch/mach/testarm/testarm.h>
    … …  
    4948void machine_ops_init(void)
    5049{
    51 #if defined(MACHINE_gta02)
    52         machine_ops = &gta02_machine_ops;
    53 #elif defined(MACHINE_testarm)
     50#if defined(MACHINE_testarm)
    5451        machine_ops = &gxemul_machine_ops;
    5552#elif defined(MACHINE_integratorcp)
    … …  
    8077}
    8178
    82 /** Get extents of available memory.
     79
     80/** Returns size of available memory.
    8381 *
    84  * @param start         Place to store memory start address.
    85  * @param size          Place to store memory size.
     82 *  @return Size of available memory.
    8683 */
    87 void machine_get_memory_extents(uintptr_t *start, uintptr_t *size)
     84uintptr_t machine_get_memory_size(void)
    8885{
    89         (machine_ops->machine_get_memory_extents)(start, size);
     86        return (machine_ops->machine_get_memory_size)();
    9087}
    9188

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

    rbd48f4c rbee2d4c  
    3838#include <arch/machine_func.h>
    3939#include <config.h>
    40 #include <align.h>
    4140
    4241/** Address of the last frame in the memory. */
    … …  
    4645void frame_arch_init(void)
    4746{
    48         uintptr_t mem_start, mem_size;
    49         uintptr_t first_frame;
    50         uintptr_t num_frames;
    51 
    52         machine_get_memory_extents(&mem_start, &mem_size);
    53         first_frame = ALIGN_UP(mem_start, FRAME_SIZE);
    54         last_frame = ALIGN_DOWN(mem_start + mem_size, FRAME_SIZE);
    55         num_frames = (last_frame - first_frame) >> FRAME_WIDTH;
     47        last_frame = machine_get_memory_size();
    5648       
    5749        /* All memory as one zone */
    58         zone_create(first_frame >> FRAME_WIDTH, num_frames,
     50        zone_create(0, ADDR2PFN(last_frame),
    5951            BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
    6052       

  • kernel/arch/arm32/src/mm/page.c

    rbd48f4c rbee2d4c  
    5858        uintptr_t cur;
    5959        /* Kernel identity mapping */
    60         for (cur = PHYSMEM_START_ADDR; cur < last_frame; cur += FRAME_SIZE)
     60        for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
    6161                page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
    6262       
    … …  
    6868#error "Only high exception vector supported now"
    6969#endif
    70         cur = ALIGN_DOWN(0x50008010, FRAME_SIZE);
    71         page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
    7270
    7371        page_table_unlock(AS_KERNEL, true);

  • kernel/genarch/Makefile.inc

    rbd48f4c rbee2d4c  
    9090endif
    9191
    92 ifeq ($(CONFIG_S3C24XX_UART),y)
    93         GENARCH_SOURCES += \
    94                 genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c
    95 endif
    96 
    9792ifeq ($(CONFIG_Z8530),y)
    9893        GENARCH_SOURCES += \

  • tools/pack.py

    rbd48f4c rbee2d4c  
    191191        link_in.close()
    192192       
    193         link_out = file(os.path.join(arch_path, "%s.comp" % LINK), "w")
     193        link_out = file(os.path.join(arch_path, LINK), "w")
    194194        link_out.write(template.replace("[[COMPONENTS]]", "\n".join(link_ctx)))
    195195        link_out.close()

  • uspace/srv/hid/kbd/Makefile

    rbd48f4c rbee2d4c  
    5858
    5959ifeq ($(UARCH),arm32)
    60         ifeq ($(MACHINE),gta02)
    61                 SOURCES += \
    62                         port/dummy.c \
    63                         ctl/pc.c
    64         endif
    6560        ifeq ($(MACHINE),testarm)
    6661                SOURCES += \
Note: See TracChangeset for help on using the changeset viewer.