[L4alpha-cvscommit] CVS: L4Alpha Makefile.conf,1.10,1.11

[Daniel P. <dp...@us...>]

Update of /cvsroot/l4alpha/L4Alpha
In directory usw-pr-cvs1:/tmp/cvs-serv14050

Modified Files:
	Makefile.conf 
Log Message:
Cleanup for Makefile.conf.



Index: Makefile.conf
===================================================================
RCS file: /cvsroot/l4alpha/L4Alpha/Makefile.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.conf	2001/11/12 04:07:26	1.10
--- Makefile.conf	2001/11/12 05:23:25	1.11
***************
*** 6,13 ****
  BOOTPFILE := /tftp/bootpfile
  
- # Bootloader
- L4BL := $(L4ROOT)/../L4Alpha-bl/l4bl.nh
- 
- 
  # Define output format
  #DEBUG = GDB
--- 6,9 ----
***************
*** 25,31 ****
  #SYS_PLATFORM = dp264
  
- 
  MAX_NUM_CPUS = 1
  
  # The path of the cross-compiler binaries, should be blank if you are using 
  # a native compiler.
--- 21,33 ----
  #SYS_PLATFORM = dp264
  
  MAX_NUM_CPUS = 1
  
+ # Bootloader
+ ifneq ($(MAX_NUM_CPUS),  1)
+ 	L4BL := $(L4ROOT)/../L4Alpha-bl/smp_l4bl.nh
+ else
+ 	L4BL := $(L4ROOT)/../L4Alpha-bl/l4bl.nh
+ endif
+ 
  # The path of the cross-compiler binaries, should be blank if you are using 
  # a native compiler.
***************
*** 33,42 ****
  #XCCPREFIX := alpha-dec-osf-
  #XCCFLAGS := -DCROSS_COMPILE_32_TO_64_BITS
- 
- #XCCPATH := /import/ganter/1/disy/alphacrossdev/bin/
- #XCCPREFIX := alphaev56-elf-linux-
  
! #XCCPATH := /home/danielp/new-alpha/bin/
! #XCCPREFIX := alpha-linux-
  
  # User level GDB debugging support
--- 35,40 ----
  #XCCPREFIX := alpha-dec-osf-
  #XCCFLAGS := -DCROSS_COMPILE_32_TO_64_BITS
  
! XCCPREFIX := alpha-linux-
  
  # User level GDB debugging support
***************
*** 59,63 ****
  
  # location for digital's tools such as sysgen, hfcomp and compression images
! EB_TOOLBOX=/home/sjw/bin
  
  
--- 57,61 ----
  
  # location for digital's tools such as sysgen, hfcomp and compression images
! EB_TOOLBOX=$(L4ROOT)/../L4Alpha-tools/bin
  
  
***************
*** 88,92 ****
  PVC	:= $(EB_TOOLBOX)/pvc
  MAPCVT	:= $(EB_TOOLBOX)/mapcvt
! DITE	:= /home/sjw/bin/dite
  CPP     := cpp
  CC      := $(XCCPATH)$(XCCPREFIX)gcc
--- 86,90 ----
  PVC	:= $(EB_TOOLBOX)/pvc
  MAPCVT	:= $(EB_TOOLBOX)/mapcvt
! DITE	:= dite
  CPP     := cpp
  CC      := $(XCCPATH)$(XCCPREFIX)gcc