[haiku-commits] BRANCH mmu_man-github.sam460ex - in src/system/boot/platform/u-boot: . src/system/boot
- From: mmu_man-github.sam460ex <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 24 Aug 2012 16:49:23 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/mmu_man-github/sam460ex'
old head: 48c009eb87f21941cd55b3c9bf5bee9205ad997c
new head: 78ea39c7d27cfcc1bf30ee25f54046192d3ff8f5
----------------------------------------------------------------------------
6955cba: haiku_loader: add memchr to the list of imported libroot objects
* libfdt uses memchr, so add this function from the libroot objects
78ea39c: U-Boot: compile and link to libfdt
* For the sam460ex and likely some ARM boards we will try to boot
using the passed FDT, as it's the recommended method now.
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 16 insertions(+)
src/system/boot/Jamfile | 1 +
src/system/boot/platform/u-boot/Jamfile | 15 +++++++++++++++
############################################################################
Commit: 6955cba65be7cbcfc1a81701f4e8571fba47c5cb
Author: François Revol <revol@xxxxxxx>
Date: Fri Aug 24 13:32:44 2012 UTC
haiku_loader: add memchr to the list of imported libroot objects
* libfdt uses memchr, so add this function from the libroot objects
----------------------------------------------------------------------------
diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile
index ad8d151..0260857 100644
--- a/src/system/boot/Jamfile
+++ b/src/system/boot/Jamfile
@@ -6,6 +6,7 @@ local librootFunctions =
LocaleData.o
qsort.o
kernel_vsprintf.o
+ memchr.o
memcmp.o
memmove.o
strdup.o
############################################################################
Commit: 78ea39c7d27cfcc1bf30ee25f54046192d3ff8f5
Author: François Revol <revol@xxxxxxx>
Date: Fri Aug 24 13:48:02 2012 UTC
U-Boot: compile and link to libfdt
* For the sam460ex and likely some ARM boards we will try to boot
using the passed FDT, as it's the recommended method now.
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/u-boot/Jamfile
b/src/system/boot/platform/u-boot/Jamfile
index dea0d99..68a7546 100644
--- a/src/system/boot/platform/u-boot/Jamfile
+++ b/src/system/boot/platform/u-boot/Jamfile
@@ -22,6 +22,17 @@ UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH)
board $(TARGET_BOOT_BOAR
SubDirC++Flags $(defines) -fno-rtti -g3 -O0 ;
}
+UseLibraryHeaders [ FDirName libfdt ] ;
+
+local libFDTSources =
+ fdt.c
+ fdt_ro.c
+ fdt_rw.c
+ fdt_strerror.c
+ fdt_sw.c
+ fdt_wip.c
+;
+
# we fake NetBSD since we don't have an OS ID yet for uimage,
# and we also fake a netbsd loader anyway.
local uImageFakeOS = "netbsd" ;
@@ -42,6 +53,7 @@ KernelMergeObject boot_platform_u-boot_common.o :
video.cpp
mmu.cpp
$(genericPlatformSources)
+ $(libFDTSources)
: -fno-pic
@@ -235,6 +247,9 @@ Depends haiku-mmc-image : haiku-$(HAIKU_BOOT_BOARD).mmc ;
SEARCH on [ FGristFiles $(genericPlatformSources) ]
= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;
+SEARCH on [ FGristFiles $(libFDTSources) ]
+ = [ FDirName $(HAIKU_TOP) src libs libfdt ] ;
+
# Tell the build system to where stage1.bin can be found, so it can be used
# elsewhere.
SEARCH on stage1.bin = $(SUBDIR) ;
Other related posts:
