Permalink
Browse files

Merge branch 'master' into KaKaRoTo-master2

Conflicts:
	config.h
	default_payload.S
  • Loading branch information...
Philipp Hug
Philipp Hug committed Oct 1, 2010
2 parents ef3f1da + ded082e commit fabed785833da28838e70084dc353bbb38b476be
Showing with 40 additions and 3 deletions.
  1. +1 −0 config.h
  2. +2 −2 default_payload.S
  3. +37 −1 macros.h.S
View
@@ -17,6 +17,7 @@
/* The firmware version supported gets defined in the Makefile */
//#define FIRMWARE_3_41
+//#define FIRMWARE_3_15
//#define FIRMWARE_3_01
#endif /* PL3_CONFIG_H */
View
@@ -108,7 +108,7 @@ patch_table:
PATCH_INST(patch_func4 + patch_func4_offset + 8, blr)
PATCH_INST(patch_func5 + patch_func5_offset, li %r3, 1) //irrelevant
PATCH_INST(patch_func5 + patch_func5_offset + 4, blr)
- PATCH_DATA(patch_data1, 0x01000000)
+// PATCH_DATA(patch_data1, 0x01000000)
.long 0
@@ -380,4 +380,4 @@ payload_end:
.org RESIDENT_PAYLOAD_OFFSET + RESIDENT_PAYLOAD_MAXSIZE
// fill out to 3840 bytes
-.org 3840
+.org 3840
View
@@ -67,6 +67,42 @@
#define elf3_data 0x0022b888
#define elf4_data 0x000d68b8
+#elif defined(FIRMWARE_3_15)
+
+/* Common Symbols */
+#define memcpy 0x7be9c
+#define memset 0x4cc00
+#define strcpy 0x4cdac
+#define strncmp 0x4ce00
+#define strlen 0x4cdd4
+#define strdup 0x1b3d08 // FIXME: unsure of the name!
+#define alloc 0x61cf0
+#define free 0x62138
+#define add_kernel_module // TODO not found
+#define syscall_table 0x2ea820
+#define get_device_descriptor // FIXME: unsure of the name! not found
+#define unknown_func1 // FIXME not found
+#define unknown_func2 // FIXME not found
+#define memory_patch_func 0x4e310
+#define patch_func1 0x048a64
+#define patch_func1_offset 0x34
+#define patch_func2 0x04eb48
+#define patch_func2_offset 0x2C
+#define patch_func3 0x2aabec
+#define patch_func3_offset 0x0
+#define patch_func4 0x04e7e4
+#define patch_func4_offset 0x0
+#define patch_func5 0x05009c
+#define patch_func5_offset 0x0
+#define patch_data1 0x
+#define rtoc_entry_1 -0x1b80
+#define rtoc_entry_2 -0x6b08
+
+// Payload bases
+#define MEM_BASE2 (0x50608)
+
+#define RESIDENT_PAYLOAD_MAXSIZE (1296)
+
#elif defined(FIRMWARE_3_01)
#define memcpy 0x77E84
@@ -211,4 +247,4 @@ got_current_page: \
li %r11, 255; \
sc 1;
-#endif /* __MACRO_H_S */
+#endif /* __MACRO_H_S */

0 comments on commit fabed78

Please sign in to comment.