Author: tkreuzer
Date: Sat Jul 5 19:02:41 2014
New Revision: 63688
URL: http://svn.reactos.org/svn/reactos?rev=63688&view=rev
Log:
[FREELDR]
Add ARM files to build, avoid a redefinition in osloader.h, use new
autogenerated ksarm.h in arm/boot.s
Modified:
trunk/reactos/boot/armllb/inc/osloader.h
trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s
Modified: trunk/reactos/boot/armllb/inc/osloader.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/osloader.h?rev=63688&r1=63687&r2=63688&view=diff
==============================================================================
--- trunk/reactos/boot/armllb/inc/osloader.h [iso-8859-1] (original)
+++ trunk/reactos/boot/armllb/inc/osloader.h [iso-8859-1] Sat Jul 5
19:02:41 2014
@@ -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 @@
ULONG Type;
ULONG Reserved;
} BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP;
-#endif
//
// Information sent from LLB to OS Loader
Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt?rev=63688&r1=63687&r2=63688&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Jul 5
19:02:41 2014
@@ -53,7 +53,6 @@
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 @@
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 @@
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 @@
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()
Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s?rev=63688&r1=63687&r2=63688&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] Sat Jul 5
19:02:41 2014
@@ -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:
