Changeset 58 for trunk

Timestamp:

Jun 26, 2017, 4:38:14 PM (7 years ago)

Author:

max@…

Message:

reduce the diff between the makefiles

Location:

trunk

Files:

• Makefile (modified) (15 diffs)
• Makefile.x86 (modified) (2 diffs)

trunk/Makefile

@@ -1 +1 @@
 #############################################################################
-#                                               ALMOS-MKH  Makefile for TSAR                        #
+#                       ALMOS-MKH  Makefile for TSAR                        #
 #############################################################################
 
@@ -11 +11 @@
 
 # Export all variables to applications sub-Makefile.
-export 
+export
 CC = mipsel-unknown-elf-gcc
 AS = mipsel-unknown-elf-as
@@ -20 +20 @@
 # Default values for hardware parameters.
 # These parameters should be defined in the 'params.mk' file.
-ARCH            ?= /users/alain/soc/tsar-trunk-svn-2013/platforms/tsar_generic_iob 
+ARCH            ?= /users/alain/soc/tsar-trunk-svn-2013/platforms/tsar_generic_iob
 X_SIZE          ?= 2
 Y_SIZE          ?= 2
@@ -34 +34 @@
 endif
 
-# Rules that don't build target files 
+# Rules that don't build target files
 # always out-of-date, need to be regenerated everytime they are called
 .PHONY: compile                         \
@@ -63 +63 @@
                -I.
 
-# Objects to be linked for the soclib drivers library 
+# Objects to be linked for the soclib drivers library
 DRIVERS_OBJS = build/kernel/drivers/soclib_tty.o  \
                build/kernel/drivers/soclib_bdv.o  \
@@ -74 +74 @@
                build/kernel/drivers/soclib_iob.o
 
-# Objects to be linked for kernel.elf generation 
+# Objects to be linked for kernel.elf generation
 KERN_OBJS       = build/kernel/kern/kernel_init.o     \
               build/kernel/kern/printk.o          \
@@ -111 +111 @@
               build/kernel/devices/dev_dma.o      \
               build/kernel/devices/dev_fbf.o      \
-              build/kernel/devices/dev_iob.o 
+              build/kernel/devices/dev_iob.o
 
 MM_OBJS     = build/kernel/mm/ppm.o               \
@@ -191 +191 @@
 
 # List of directories to be searched for included files
-# when compiling for kernel.elf generation 
+# when compiling for kernel.elf generation
 KERNEL_INCLUDE = -Ikernel                \
                  -Ikernel/kern           \
@@ -219 +219 @@
 # The Mtools used to build the FAT32 disk image perfom a few sanity checks, to
 # make sure that the disk is indeed an MS-DOS disk. However, the size of the
-# disk image used by ALMOS-VM is not MS-DOS compliant. 
+# disk image used by ALMOS-VM is not MS-DOS compliant.
 # Setting this variable prevents these checks.
 MTOOLS_SKIP_CHECK := 1
@@ -240 +240 @@
         @mkdir -p build/kernel/libk
         @mkdir -p build/kernel/drivers
-        @mkdir -p build/kernel/vfs 
+        @mkdir -p build/kernel/vfs
         @mkdir -p build/kernel/syscalls
         @mkdir -p hdd
@@ -253 +253 @@
 
 ##############################################################
-# Rule to copy the files generated by the virtual prototype 
+# Rule to copy the files generated by the virtual prototype
 # from the virtual disk 'home' directory to the current directory.
 extract:
         mcopy -o -i $(DISK_IMAGE) ::/home .
 
-# Rules to delete all binary files from Unix File System 
+# Rules to delete all binary files from Unix File System
 # without modifying the virtual disk.
 clean:
@@ -346 +346 @@
 
 ##############################
-# Rule to compile boot_utils.o 
+# Rule to compile boot_utils.o
 build/boot/boot_utils.o:                tools/bootloader_tsar/boot_utils.c       \
                                                                 tools/bootloader_tsar/boot_utils.h       \
@@ -382 +382 @@
 build/boot/boot.elf:                            $(BOOT_OBJS) \
                                                                         tools/bootloader_tsar/boot.ld                                   
-        $(LD) -o $@ -T tools/bootloader_tsar/boot.ld $(BOOT_OBJS) 
+        $(LD) -o $@ -T tools/bootloader_tsar/boot.ld $(BOOT_OBJS)
         $(DU) -D $@ > $@.txt
         dd if=build/boot/boot.elf of=$(DISK_IMAGE) seek=2 conv=notrunc
@@ -388 +388 @@
 
 ##############################
-# rules to compile the drivers 
+# rules to compile the drivers
 build/kernel/drivers/%.o:       kernel/drivers/soclib/%.c   \
                                 kernel/drivers/soclib/%.h   \
@@ -479 +479 @@
                                 $(SYS_OBJS_2)               \
                                 $(SYS_OBJS_3)               \
-                                                                kernel/kernel.ld            
+                                                                kernel/kernel.ld
         $(LD) -o $@ -T kernel/kernel.ld                         \
           $(KERN_OBJS) $(HAL_OBJS) $(DEV_OBJS) $(MM_OBJS)   \
           $(LIBK_OBJS) $(DRIVERS_OBJS) $(VFS_OBJS)          \
-          $(SYS_OBJS_0) $(SYS_OBJS_1) $(SYS_OBJS_2) $(SYS_OBJS_3)
+          $(SYS_OBJS_0) $(SYS_OBJS_1) $(SYS_OBJS_2)         \
+          $(SYS_OBJS_3)
 
         $(DU) -D $@ > $@.txt

trunk/Makefile.x86

@@ -16 +16 @@
 DU = objdump
 AR = ar
-
 
 # Rules that don't build target files
@@ -416 +415 @@
           $(SYS_OBJS_3)
 
-
-#   $(SYS_OBJS_4) $(SYS_OBJS_5)
-
         $(DU) -D $@ > $@.txt
         mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/bin/kernel