Changeset 58


Ignore:
Timestamp:
Jun 26, 2017, 4:38:14 PM (4 years ago)
Author:
max@…
Message:

reduce the diff between the makefiles

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r56 r58  
    11#############################################################################
    2 #                                               ALMOS-MKH  Makefile for TSAR                        #
     2#                       ALMOS-MKH  Makefile for TSAR                        #
    33#############################################################################
    44
     
    1111
    1212# Export all variables to applications sub-Makefile.
    13 export 
     13export
    1414CC = mipsel-unknown-elf-gcc
    1515AS = mipsel-unknown-elf-as
     
    2020# Default values for hardware parameters.
    2121# These parameters should be defined in the 'params.mk' file.
    22 ARCH            ?= /users/alain/soc/tsar-trunk-svn-2013/platforms/tsar_generic_iob 
     22ARCH            ?= /users/alain/soc/tsar-trunk-svn-2013/platforms/tsar_generic_iob
    2323X_SIZE          ?= 2
    2424Y_SIZE          ?= 2
     
    3434endif
    3535
    36 # Rules that don't build target files 
     36# Rules that don't build target files
    3737# always out-of-date, need to be regenerated everytime they are called
    3838.PHONY: compile                         \
     
    6363               -I.
    6464
    65 # Objects to be linked for the soclib drivers library 
     65# Objects to be linked for the soclib drivers library
    6666DRIVERS_OBJS = build/kernel/drivers/soclib_tty.o  \
    6767               build/kernel/drivers/soclib_bdv.o  \
     
    7474               build/kernel/drivers/soclib_iob.o
    7575
    76 # Objects to be linked for kernel.elf generation 
     76# Objects to be linked for kernel.elf generation
    7777KERN_OBJS       = build/kernel/kern/kernel_init.o     \
    7878              build/kernel/kern/printk.o          \
     
    111111              build/kernel/devices/dev_dma.o      \
    112112              build/kernel/devices/dev_fbf.o      \
    113               build/kernel/devices/dev_iob.o 
     113              build/kernel/devices/dev_iob.o
    114114
    115115MM_OBJS     = build/kernel/mm/ppm.o               \
     
    191191
    192192# List of directories to be searched for included files
    193 # when compiling for kernel.elf generation 
     193# when compiling for kernel.elf generation
    194194KERNEL_INCLUDE = -Ikernel                \
    195195                 -Ikernel/kern           \
     
    219219# The Mtools used to build the FAT32 disk image perfom a few sanity checks, to
    220220# make sure that the disk is indeed an MS-DOS disk. However, the size of the
    221 # disk image used by ALMOS-VM is not MS-DOS compliant. 
     221# disk image used by ALMOS-VM is not MS-DOS compliant.
    222222# Setting this variable prevents these checks.
    223223MTOOLS_SKIP_CHECK := 1
     
    240240        @mkdir -p build/kernel/libk
    241241        @mkdir -p build/kernel/drivers
    242         @mkdir -p build/kernel/vfs 
     242        @mkdir -p build/kernel/vfs
    243243        @mkdir -p build/kernel/syscalls
    244244        @mkdir -p hdd
     
    253253
    254254##############################################################
    255 # Rule to copy the files generated by the virtual prototype 
     255# Rule to copy the files generated by the virtual prototype
    256256# from the virtual disk 'home' directory to the current directory.
    257257extract:
    258258        mcopy -o -i $(DISK_IMAGE) ::/home .
    259259
    260 # Rules to delete all binary files from Unix File System 
     260# Rules to delete all binary files from Unix File System
    261261# without modifying the virtual disk.
    262262clean:
     
    346346
    347347##############################
    348 # Rule to compile boot_utils.o 
     348# Rule to compile boot_utils.o
    349349build/boot/boot_utils.o:                tools/bootloader_tsar/boot_utils.c       \
    350350                                                                tools/bootloader_tsar/boot_utils.h       \
     
    382382build/boot/boot.elf:                            $(BOOT_OBJS) \
    383383                                                                        tools/bootloader_tsar/boot.ld                                   
    384         $(LD) -o $@ -T tools/bootloader_tsar/boot.ld $(BOOT_OBJS) 
     384        $(LD) -o $@ -T tools/bootloader_tsar/boot.ld $(BOOT_OBJS)
    385385        $(DU) -D $@ > $@.txt
    386386        dd if=build/boot/boot.elf of=$(DISK_IMAGE) seek=2 conv=notrunc
     
    388388
    389389##############################
    390 # rules to compile the drivers 
     390# rules to compile the drivers
    391391build/kernel/drivers/%.o:       kernel/drivers/soclib/%.c   \
    392392                                kernel/drivers/soclib/%.h   \
     
    479479                                $(SYS_OBJS_2)               \
    480480                                $(SYS_OBJS_3)               \
    481                                                                 kernel/kernel.ld           
     481                                                                kernel/kernel.ld
    482482        $(LD) -o $@ -T kernel/kernel.ld                         \
    483483          $(KERN_OBJS) $(HAL_OBJS) $(DEV_OBJS) $(MM_OBJS)   \
    484484          $(LIBK_OBJS) $(DRIVERS_OBJS) $(VFS_OBJS)          \
    485           $(SYS_OBJS_0) $(SYS_OBJS_1) $(SYS_OBJS_2) $(SYS_OBJS_3)
     485          $(SYS_OBJS_0) $(SYS_OBJS_1) $(SYS_OBJS_2)         \
     486          $(SYS_OBJS_3)
    486487
    487488        $(DU) -D $@ > $@.txt
  • trunk/Makefile.x86

    r57 r58  
    1616DU = objdump
    1717AR = ar
    18 
    1918
    2019# Rules that don't build target files
     
    416415          $(SYS_OBJS_3)
    417416
    418 
    419 #   $(SYS_OBJS_4) $(SYS_OBJS_5)
    420 
    421417        $(DU) -D $@ > $@.txt
    422418        mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/bin/kernel
Note: See TracChangeset for help on using the changeset viewer.