From 867be3b13e31c3b8d0aaa4a505bb35db0a403740 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 5 Jul 2014 19:02:41 +0000
Subject: [PATCH] [FREELDR] Add ARM files to build, avoid a redefinition in
 osloader.h, use new autogenerated ksarm.h in arm/boot.s

svn path=/trunk/; revision=63688
---
 reactos/boot/armllb/inc/osloader.h           |  4 +---
 reactos/boot/freeldr/freeldr/CMakeLists.txt  |  9 ++++++++-
 reactos/boot/freeldr/freeldr/arch/arm/boot.s | 14 ++++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/reactos/boot/armllb/inc/osloader.h b/reactos/boot/armllb/inc/osloader.h
index 6251bb1fa56..771c7cbfe09 100644
--- a/reactos/boot/armllb/inc/osloader.h
+++ b/reactos/boot/armllb/inc/osloader.h
@@ -8,13 +8,12 @@
 
 //
 // OS Loader Main Routine
-// 
+//
 typedef
 VOID (*POSLOADER_INIT)(
     IN PVOID BoardInit
 );
 
-#ifndef __REGISTRY_H
 //
 // Type of memory detected by LLB
 //
@@ -36,7 +35,6 @@ typedef struct
     ULONG Type;
     ULONG Reserved;
 } BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP;
-#endif
 
 //
 // Information sent from LLB to OS Loader
diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt
index 80e235b82db..4551eb95360 100644
--- a/reactos/boot/freeldr/freeldr/CMakeLists.txt
+++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt
@@ -53,7 +53,6 @@ list(APPEND FREELDR_COMMON_SOURCE
     fs/fs.c
     fs/iso.c
     fs/ntfs.c
-    fs/pxe.c
     inifile/ini_init.c
     inifile/inifile.c
     inifile/parse.c
@@ -87,6 +86,7 @@ if(ARCH STREQUAL "i386")
         arch/i386/linux.S
         arch/i386/mb.S)
     list(APPEND FREELDR_COMMON_SOURCE
+        fs/pxe.c
         arch/i386/archmach.c
         arch/i386/custom.c
         arch/i386/drivemap.c
@@ -130,6 +130,7 @@ elseif(ARCH STREQUAL "amd64")
         arch/amd64/int386.S
         arch/amd64/pnpbios.S)
     list(APPEND FREELDR_COMMON_SOURCE
+        fs/pxe.c
         arch/i386/custom.c
         arch/i386/drivemap.c
         arch/i386/hardware.c
@@ -149,6 +150,12 @@ elseif(ARCH STREQUAL "amd64")
         arch/i386/pcrtc.c
         arch/i386/pcvideo.c
         arch/amd64/winldr.c)
+elseif(ARCH STREQUAL "arm")
+    list(APPEND FREELDR_COMMON_ASM_SOURCE
+        arch/arm/boot.S)
+    list(APPEND FREELDR_COMMON_SOURCE
+        arch/arm/macharm.c
+        arch/arm/winldr.c)
 else()
 #TBD
 endif()
diff --git a/reactos/boot/freeldr/freeldr/arch/arm/boot.s b/reactos/boot/freeldr/freeldr/arch/arm/boot.s
index 0114bb7fdd7..8a116164f8e 100644
--- a/reactos/boot/freeldr/freeldr/arch/arm/boot.s
+++ b/reactos/boot/freeldr/freeldr/arch/arm/boot.s
@@ -6,16 +6,18 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
-    .title "ARM FreeLDR Entry Point"
-    .include "ntoskrnl/include/internal/arm/kxarm.h"
-    .include "ntoskrnl/include/internal/arm/ksarm.h"
-    .section .init
+#include "ksarm.h"
+
+    //.title "ARM FreeLDR Entry Point"
+    //.include "ntoskrnl/include/internal/arm/kxarm.h"
+    //.include "ntoskrnl/include/internal/arm/ksarm.h"
+    //.section .init
 
     NESTED_ENTRY _start
     PROLOG_END _start
-    
+
     b ArmInit
-    
+
     ENTRY_END _start
 
 L_ArmInit: