git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Networking - Reworked route table management
[tpg/acess2.git]
/
Kernel
/
arch
/
armv7
/
main.c
diff --git
a/Kernel/arch/armv7/main.c
b/Kernel/arch/armv7/main.c
index
b182e51
..
248c17c
100644
(file)
--- a/
Kernel/arch/armv7/main.c
+++ b/
Kernel/arch/armv7/main.c
@@
-4,7
+4,7
@@
* ARM7 Entrypoint
* arch/arm7/main.c
*/
* ARM7 Entrypoint
* arch/arm7/main.c
*/
-#define DEBUG
1
+#define DEBUG
0
#include <acess.h>
#include <modules.h>
#include <acess.h>
#include <modules.h>
@@
-24,8
+24,8
@@
Uint32 ARMv7_int_HandleSyscalls(Uint32 Num, Uint32 *Args);
int kmain(void)
{
LogF("Acess2 ARMv7 v"EXPAND_STR(KERNEL_VERSION)"\n");
int kmain(void)
{
LogF("Acess2 ARMv7 v"EXPAND_STR(KERNEL_VERSION)"\n");
+ LogF(" Git Hash %s\n", gsGitHash);
LogF(" Build %i\n", BUILD_NUM);
LogF(" Build %i\n", BUILD_NUM);
-// Interrupts_Setup();
MM_SetupPhys();
MM_SetupPhys();
@@
-43,8
+43,12
@@
int kmain(void)
//
LogF("Moving to arch-independent init\n");
//
LogF("Moving to arch-independent init\n");
- System_Init("/Acess=initrd: -VTerm:Video=PL110");
-// System_Init("/Acess=initrd:");
+ #if PLATFORM_is_tegra2
+ System_Init("Acess2.armv7.bin /Acess=initrd: -VTerm:Video=Tegra2Vid");
+ #else
+ System_Init("Acess2.armv7.bin /Acess=initrd: -VTerm:Video=PL110");
+ #endif
+// System_Init("Acess2.armv7.bin /Acess=initrd:");
//TODO:
LogF("End of kmain(), for(;;) Threads_Sleep();\n");
for(;;)
//TODO:
LogF("End of kmain(), for(;;) Threads_Sleep();\n");
for(;;)
@@
-65,7
+69,7
@@
Uint32 ARMv7_int_HandleSyscalls(Uint32 Num, Uint32 *Args)
switch(Num)
{
case 1:
switch(Num)
{
case 1:
-
Log_Debug("ARMv7", "__clear_cache(%p, %p)", Args[0], Args[1]);
+
//
Log_Debug("ARMv7", "__clear_cache(%p, %p)", Args[0], Args[1]);
// Align
Args[0] &= ~0xFFF;
Args[1] += 0xFFF; Args[1] &= ~0xFFF;
// Align
Args[0] &= ~0xFFF;
Args[1] += 0xFFF; Args[1] &= ~0xFFF;
UCC
git Repository :: git.ucc.asn.au