Changeset 6b781c0 in mainline for boot


Ignore:
Timestamp:
2007-06-08T15:02:49Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c03ee1c
Parents:
3ee8a075
Message:

Merge arm32 into trunk.

Location:
boot
Files:
15 added
7 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/arm32/Makefile.inc

    r3ee8a075 r6b781c0  
    11#
    2 # Copyright (c) 2007 Jakub Jermar
     2# Copyright (c) 2006 Martin Decky
    33# All rights reserved.
    44#
     
    2727#
    2828
    29 #
    30 # So far, this is just a placeholder.
    31 #
     29build: $(BASE)/image.boot
     30
     31$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
     32        cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
     33
     34depend:
     35        -rm arch/$(ARCH)/loader/image.boot
     36
     37arch/$(ARCH)/loader/image.boot:
     38        make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
     39
     40clean:
     41        make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
     42        -rm -f $(BASE)/image.boot
  • boot/boot.config

    r3ee8a075 r6b781c0  
    5050@ "ecoff" Ecoff image (GXEmul)
    5151! [ARCH=mips32] IMAGE (choice)
     52
  • boot/generic/align.h

    r3ee8a075 r6b781c0  
    2727 */
    2828
     29/** @addtogroup generic
     30 * @{
     31 */
     32/** @file
     33 */
     34
    2935#ifndef BOOT_ALIGN_H_
    3036#define BOOT_ALIGN_H_
     
    3844
    3945#endif
     46
     47/** @}
     48 */
  • boot/generic/gentypes.h

    r3ee8a075 r6b781c0  
    2727 */
    2828
     29/** @addtogroup generic
     30 * @{
     31 */
     32/** @file
     33 */
     34
    2935#ifndef BOOT_GENTYPES_H_
    3036#define BOOT_GENTYPES_H_
     
    3743
    3844#endif
     45
     46/** @}
     47 */
  • boot/generic/printf.c

    r3ee8a075 r6b781c0  
    2727 */
    2828
     29/** @addtogroup generic
     30 * @{
     31 */
     32/** @file
     33 */
     34
    2935#include "printf.h"
    3036#include "stdarg.h"
     
    242248        va_end(ap);
    243249}
     250
     251/** @}
     252 */
  • boot/generic/printf.h

    r3ee8a075 r6b781c0  
    2727 */
    2828
     29/** @addtogroup generic
     30 * @{
     31 */
     32/** @file
     33 */
     34
    2935#ifndef BOOT_PRINTF_H_
    3036#define BOOT_PRINTF_H_
     
    4147
    4248#endif
     49
     50/** @}
     51 */
  • boot/generic/stdarg.h

    r3ee8a075 r6b781c0  
    2727 */
    2828
     29/** @addtogroup generic
     30 * @{
     31 */
     32/** @file
     33 */
     34
    2935#ifndef STDARG_H__
    3036#define STDARG_H__
     
    3743
    3844#endif
     45
     46/** @}
     47 */
Note: See TracChangeset for help on using the changeset viewer.