[haiku-commits] haiku: hrev44143 - src/system/boot/platform/u-boot/arch/ppc

  • From: revol@xxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 11 May 2012 02:52:31 +0200 (CEST)

hrev44143 adds 1 changeset to branch 'master'
old head: 0fa5c3d11512e966045bea0e129da6679e8da7b0
new head: 6fe5c2f1940873b1bc06a9acd3794496e76c9522

----------------------------------------------------------------------------

6fe5c2f: Fix u-boot ppc jamfile
  
  * fix leftover openfirmware stuff from copy-paste.
  * shell.S is still missing.

                                          [ François Revol <revol@xxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44143
Commit:      6fe5c2f1940873b1bc06a9acd3794496e76c9522
URL:         http://cgit.haiku-os.org/haiku/commit/?id=6fe5c2f
Author:      François Revol <revol@xxxxxxx>
Date:        Fri May 11 00:49:47 2012 UTC

----------------------------------------------------------------------------

1 file changed, 11 insertions(+), 6 deletions(-)
src/system/boot/platform/u-boot/arch/ppc/Jamfile |   17 +++++++++++------

----------------------------------------------------------------------------

diff --git a/src/system/boot/platform/u-boot/arch/ppc/Jamfile 
b/src/system/boot/platform/u-boot/arch/ppc/Jamfile
index 651d61c..ad93d59 100644
--- a/src/system/boot/platform/u-boot/arch/ppc/Jamfile
+++ b/src/system/boot/platform/u-boot/arch/ppc/Jamfile
@@ -1,18 +1,23 @@
-SubDir HAIKU_TOP src system boot platform openfirmware arch ppc ;
+SubDir HAIKU_TOP src system boot platform u-boot arch ppc ;
 
 SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ;
 UsePrivateSystemHeaders ;
 UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] 
        [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ;
+UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board 
$(TARGET_BOOT_BOARD) ] ;
 
 SubDirC++Flags -fno-rtti ;
 
-KernelStaticLibrary boot_platform_openfirmware_ppc :
-       arch_mmu.cpp
-       arch_cpu_asm.S
+KernelMergeObject boot_platform_u-boot_ppc.o :
+       # must come first to have _start_* at correct locations
+       shell.S
+
+       #arch_mmu.cpp
+       #arch_cpu_asm.S
        arch_start_kernel.S
-       cpu.cpp
-       mmu.cpp
+       #cpu.cpp
+       #mmu.cpp
+       : -fno-pic
 ;
 
 SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ]


Other related posts:

  • » [haiku-commits] haiku: hrev44143 - src/system/boot/platform/u-boot/arch/ppc - revol