Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 11:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR]

Browse source 
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
This commit is contained in:
Timo Kreuzer 2014-07-05 19:02:41 +00:00
parent 9dc1dcc32b
commit 867be3b13e
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/boot/armllb/inc/osloader.h
View file

@ -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

9
reactos/boot/freeldr/freeldr/CMakeLists.txt
View file

@ -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()

14
reactos/boot/freeldr/freeldr/arch/arm/boot.s
View file

@ -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: