From 7663f51c66b14c68620572e942c8bb5a880660fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 17 May 2012 19:41:19 +0200
Subject: [PATCH] U-Boot: Fix ppc build

* we have an uimage for the Sam460 \o/
---
 src/system/boot/arch/ppc/Jamfile              | 17 +++++++++++++++--
 src/system/kernel/arch/ppc/arch_uart_8250.cpp |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/system/boot/arch/ppc/Jamfile b/src/system/boot/arch/ppc/Jamfile
index 0a064782d1..c2b817b54c 100644
--- a/src/system/boot/arch/ppc/Jamfile
+++ b/src/system/boot/arch/ppc/Jamfile
@@ -1,6 +1,13 @@
 SubDir HAIKU_TOP src system boot arch ppc ;
 
-DEFINES += _BOOT_MODE ;
+{
+	local defines = _BOOT_MODE ;
+
+	defines = [ FDefines $(defines) ] ;
+	SubDirCcFlags $(defines) ;
+	SubDirC++Flags $(defines) -fno-rtti ;
+}
+
 
 local kernelLibArchObjects =
 	<src!system!kernel!lib!arch!$(TARGET_ARCH)>byteorder.o
@@ -9,6 +16,8 @@ local kernelLibArchObjects =
 ;
 
 KernelMergeObject boot_arch_$(TARGET_ARCH).o :
+	debug_uart_8250.cpp
+	arch_uart_8250.cpp
 	arch_elf.cpp
 	: # additional flags
 	:
@@ -16,5 +25,9 @@ KernelMergeObject boot_arch_$(TARGET_ARCH).o :
 	$(kernelLibArchObjects)
 ;
 
-SEARCH on [ FGristFiles arch_elf.cpp ]
+SEARCH on [ FGristFiles arch_elf.cpp arch_uart_8250.cpp ]
     = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ;
+
+SEARCH on [ FGristFiles debug_uart_8250.cpp ]
+	= [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ;
+
diff --git a/src/system/kernel/arch/ppc/arch_uart_8250.cpp b/src/system/kernel/arch/ppc/arch_uart_8250.cpp
index ee990fbbc6..5a10f50636 100644
--- a/src/system/kernel/arch/ppc/arch_uart_8250.cpp
+++ b/src/system/kernel/arch/ppc/arch_uart_8250.cpp
@@ -5,7 +5,7 @@
 
 #include <debug.h>
 #include <arch/generic/debug_uart_8250.h>
-//#include <board_config.h>
+#include <new>
 
 
 // we shouldn't need special setup, we use plain MMIO.