From 0693778ceec84b973b125ca880bcac31c3ff09bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 8 Aug 2009 02:38:44 +0000 Subject: [PATCH] [ARM] Move uart.c to arch/arm/ where it belongs, it has nothing u-boot specific. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32203 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/arch/arm/Jamfile | 3 +++ src/system/boot/{platform/u-boot => arch/arm}/uart.c | 0 src/system/boot/platform/u-boot/Jamfile | 3 --- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/system/boot/{platform/u-boot => arch/arm}/uart.c (100%) diff --git a/src/system/boot/arch/arm/Jamfile b/src/system/boot/arch/arm/Jamfile index dc2c862c5d..c24ccde2be 100644 --- a/src/system/boot/arch/arm/Jamfile +++ b/src/system/boot/arch/arm/Jamfile @@ -2,6 +2,8 @@ SubDir HAIKU_TOP src system boot arch arm ; DEFINES += _BOOT_MODE ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ; + # TODO: Is there any reason to recompile arch_string.S here? local librootArchObjects = # arch_string.o @@ -14,6 +16,7 @@ local kernelLibArchObjects = ; KernelMergeObject boot_arch_$(TARGET_ARCH).o : + uart.c arch_elf.cpp $(librootArchObjects) : -fno-pic diff --git a/src/system/boot/platform/u-boot/uart.c b/src/system/boot/arch/arm/uart.c similarity index 100% rename from src/system/boot/platform/u-boot/uart.c rename to src/system/boot/arch/arm/uart.c diff --git a/src/system/boot/platform/u-boot/Jamfile b/src/system/boot/platform/u-boot/Jamfile index ecb68b9e59..435fe20bd9 100644 --- a/src/system/boot/platform/u-boot/Jamfile +++ b/src/system/boot/platform/u-boot/Jamfile @@ -2,8 +2,6 @@ SubDir HAIKU_TOP src system boot platform u-boot ; SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ; -#XXX:move to arch/arm -UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics vesa ] ; @@ -31,7 +29,6 @@ KernelMergeObject boot_platform_u-boot.o : cpu.cpp video.cpp mmu.cpp - uart.c # generic text_menu.cpp