diff options
-rw-r--r-- | firmware/SOURCES | 33 | ||||
-rw-r--r-- | firmware/asm/SOURCES | 8 | ||||
-rw-r--r-- | firmware/asm/arm/memcpy.S (renamed from firmware/target/arm/memcpy-arm.S) | 0 | ||||
-rw-r--r-- | firmware/asm/arm/memmove.S (renamed from firmware/target/arm/memmove-arm.S) | 0 | ||||
-rw-r--r-- | firmware/asm/arm/memset.S (renamed from firmware/target/arm/memset-arm.S) | 0 | ||||
-rw-r--r-- | firmware/asm/arm/memset16.S (renamed from firmware/target/arm/memset16-arm.S) | 0 | ||||
-rw-r--r-- | firmware/asm/m68k/memcpy.S (renamed from firmware/target/coldfire/memcpy-coldfire.S) | 0 | ||||
-rw-r--r-- | firmware/asm/m68k/memmove.S (renamed from firmware/target/coldfire/memmove-coldfire.S) | 0 | ||||
-rw-r--r-- | firmware/asm/m68k/memset.S (renamed from firmware/target/coldfire/memset-coldfire.S) | 0 | ||||
-rw-r--r-- | firmware/asm/m68k/memset16.S (renamed from firmware/target/coldfire/memset16-coldfire.S) | 0 | ||||
-rw-r--r-- | firmware/asm/m68k/strlen.S (renamed from firmware/target/coldfire/strlen-coldfire.S) | 0 | ||||
-rw-r--r-- | firmware/asm/memcpy.c (renamed from firmware/libc/memcpy.c) | 0 | ||||
-rw-r--r-- | firmware/asm/memmove.c (renamed from firmware/libc/memmove.c) | 0 | ||||
-rw-r--r-- | firmware/asm/memset.c (renamed from firmware/libc/memset.c) | 0 | ||||
-rw-r--r-- | firmware/asm/memset16.c (renamed from firmware/common/memset16.c) | 0 | ||||
-rw-r--r-- | firmware/asm/mips/memcpy.S (renamed from firmware/target/mips/memcpy-mips.S) | 0 | ||||
-rw-r--r-- | firmware/asm/mips/memset.S (renamed from firmware/target/mips/memset-mips.S) | 0 | ||||
-rw-r--r-- | firmware/asm/sh/memcpy.S (renamed from firmware/target/sh/memcpy-sh.S) | 0 | ||||
-rw-r--r-- | firmware/asm/sh/memmove.S (renamed from firmware/target/sh/memmove-sh.S) | 0 | ||||
-rw-r--r-- | firmware/asm/sh/memset.S (renamed from firmware/target/sh/memset-sh.S) | 0 | ||||
-rw-r--r-- | firmware/asm/sh/strlen.S (renamed from firmware/target/sh/strlen-sh.S) | 0 | ||||
-rw-r--r-- | firmware/asm/strlen.c (renamed from firmware/libc/strlen.c) | 0 |
22 files changed, 7 insertions, 34 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index f13eba618f..23b5baea3e 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -116,14 +116,6 @@ libc/ctype.c | |||
116 | libc/memchr.c | 116 | libc/memchr.c |
117 | libc/memcmp.c | 117 | libc/memcmp.c |
118 | 118 | ||
119 | #if !defined(CPU_SH) && !defined(CPU_COLDFIRE) && !defined(CPU_ARM) | ||
120 | #if !defined(CPU_MIPS) | ||
121 | libc/memcpy.c | ||
122 | libc/memset.c | ||
123 | #endif /* CPU_MIPS */ | ||
124 | libc/memmove.c | ||
125 | #endif /* CPU_* */ | ||
126 | |||
127 | libc/qsort.c | 119 | libc/qsort.c |
128 | libc/random.c | 120 | libc/random.c |
129 | libc/strcat.c | 121 | libc/strcat.c |
@@ -131,10 +123,6 @@ libc/strchr.c | |||
131 | libc/strcmp.c | 123 | libc/strcmp.c |
132 | libc/strcpy.c | 124 | libc/strcpy.c |
133 | 125 | ||
134 | #if !defined(CPU_SH) && !defined(CPU_COLDFIRE) | ||
135 | libc/strlen.c | ||
136 | #endif | ||
137 | |||
138 | libc/strncmp.c | 126 | libc/strncmp.c |
139 | libc/strrchr.c | 127 | libc/strrchr.c |
140 | libc/strstr.c | 128 | libc/strstr.c |
@@ -422,10 +410,6 @@ target/sh/adc-sh.c | |||
422 | target/sh/bitswap.S | 410 | target/sh/bitswap.S |
423 | target/sh/crt0.S | 411 | target/sh/crt0.S |
424 | target/sh/kernel-sh.c | 412 | target/sh/kernel-sh.c |
425 | target/sh/memcpy-sh.S | ||
426 | target/sh/memmove-sh.S | ||
427 | target/sh/memset-sh.S | ||
428 | target/sh/strlen-sh.S | ||
429 | target/sh/system-sh.c | 413 | target/sh/system-sh.c |
430 | target/sh/archos/descramble.S | 414 | target/sh/archos/descramble.S |
431 | target/sh/archos/i2c-archos.c | 415 | target/sh/archos/i2c-archos.c |
@@ -438,14 +422,6 @@ target/coldfire/crt0.S | |||
438 | common/ffs.c | 422 | common/ffs.c |
439 | target/coldfire/ffs-coldfire.S | 423 | target/coldfire/ffs-coldfire.S |
440 | #endif | 424 | #endif |
441 | target/coldfire/memcpy-coldfire.S | ||
442 | target/coldfire/memmove-coldfire.S | ||
443 | target/coldfire/memset-coldfire.S | ||
444 | target/coldfire/strlen-coldfire.S | ||
445 | #if defined(HAVE_LCD_COLOR) || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \ | ||
446 | || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_PIXELFORMAT == VERTICAL_INTERLEAVED) | ||
447 | target/coldfire/memset16-coldfire.S | ||
448 | #endif | ||
449 | target/coldfire/kernel-coldfire.c | 425 | target/coldfire/kernel-coldfire.c |
450 | target/coldfire/system-coldfire.c | 426 | target/coldfire/system-coldfire.c |
451 | target/coldfire/timer-coldfire.c | 427 | target/coldfire/timer-coldfire.c |
@@ -462,11 +438,6 @@ target/coldfire/ata-as-coldfire.S | |||
462 | 438 | ||
463 | #elif defined(CPU_PP) || defined(CPU_ARM) | 439 | #elif defined(CPU_PP) || defined(CPU_ARM) |
464 | /* CPU_PP => CPU_ARM, CPU_ARM !=> CPU_PP */ | 440 | /* CPU_PP => CPU_ARM, CPU_ARM !=> CPU_PP */ |
465 | target/arm/memcpy-arm.S | ||
466 | target/arm/memmove-arm.S | ||
467 | |||
468 | target/arm/memset-arm.S | ||
469 | target/arm/memset16-arm.S | ||
470 | 441 | ||
471 | # if ARM_ARCH < 6 | 442 | # if ARM_ARCH < 6 |
472 | target/arm/bits-armv4.S | 443 | target/arm/bits-armv4.S |
@@ -654,10 +625,7 @@ target/arm/crt0.S | |||
654 | #endif /* defined(CPU_*) */ | 625 | #endif /* defined(CPU_*) */ |
655 | 626 | ||
656 | #elif defined(CPU_MIPS) | 627 | #elif defined(CPU_MIPS) |
657 | common/memset16.c | ||
658 | target/mips/ffs-mips.S | 628 | target/mips/ffs-mips.S |
659 | target/mips/memcpy-mips.S | ||
660 | target/mips/memset-mips.S | ||
661 | target/mips/mmu-mips.c | 629 | target/mips/mmu-mips.c |
662 | #if CONFIG_CPU==JZ4732 | 630 | #if CONFIG_CPU==JZ4732 |
663 | target/mips/ingenic_jz47xx/crt0.S | 631 | target/mips/ingenic_jz47xx/crt0.S |
@@ -668,7 +636,6 @@ target/mips/ingenic_jz47xx/crt0.S | |||
668 | #ifdef HAVE_PRIORITY_SCHEDULING | 636 | #ifdef HAVE_PRIORITY_SCHEDULING |
669 | common/ffs.c | 637 | common/ffs.c |
670 | #endif | 638 | #endif |
671 | common/memset16.c | ||
672 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 639 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
673 | crt0.S | 640 | crt0.S |
674 | drivers/i2c.c | 641 | drivers/i2c.c |
diff --git a/firmware/asm/SOURCES b/firmware/asm/SOURCES index 8b13789179..805727ea93 100644 --- a/firmware/asm/SOURCES +++ b/firmware/asm/SOURCES | |||
@@ -1 +1,7 @@ | |||
1 | 1 | memset16.c | |
2 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(HAVE_ROCKBOX_C_LIBRARY) | ||
3 | memcpy.c | ||
4 | memmove.c | ||
5 | memset.c | ||
6 | strlen.c | ||
7 | #endif | ||
diff --git a/firmware/target/arm/memcpy-arm.S b/firmware/asm/arm/memcpy.S index 2a55fb5656..2a55fb5656 100644 --- a/firmware/target/arm/memcpy-arm.S +++ b/firmware/asm/arm/memcpy.S | |||
diff --git a/firmware/target/arm/memmove-arm.S b/firmware/asm/arm/memmove.S index d8cab048be..d8cab048be 100644 --- a/firmware/target/arm/memmove-arm.S +++ b/firmware/asm/arm/memmove.S | |||
diff --git a/firmware/target/arm/memset-arm.S b/firmware/asm/arm/memset.S index 682da874ce..682da874ce 100644 --- a/firmware/target/arm/memset-arm.S +++ b/firmware/asm/arm/memset.S | |||
diff --git a/firmware/target/arm/memset16-arm.S b/firmware/asm/arm/memset16.S index 5c787b1bed..5c787b1bed 100644 --- a/firmware/target/arm/memset16-arm.S +++ b/firmware/asm/arm/memset16.S | |||
diff --git a/firmware/target/coldfire/memcpy-coldfire.S b/firmware/asm/m68k/memcpy.S index 9762e31e02..9762e31e02 100644 --- a/firmware/target/coldfire/memcpy-coldfire.S +++ b/firmware/asm/m68k/memcpy.S | |||
diff --git a/firmware/target/coldfire/memmove-coldfire.S b/firmware/asm/m68k/memmove.S index 736cd619e1..736cd619e1 100644 --- a/firmware/target/coldfire/memmove-coldfire.S +++ b/firmware/asm/m68k/memmove.S | |||
diff --git a/firmware/target/coldfire/memset-coldfire.S b/firmware/asm/m68k/memset.S index 839b305a05..839b305a05 100644 --- a/firmware/target/coldfire/memset-coldfire.S +++ b/firmware/asm/m68k/memset.S | |||
diff --git a/firmware/target/coldfire/memset16-coldfire.S b/firmware/asm/m68k/memset16.S index 1673038d03..1673038d03 100644 --- a/firmware/target/coldfire/memset16-coldfire.S +++ b/firmware/asm/m68k/memset16.S | |||
diff --git a/firmware/target/coldfire/strlen-coldfire.S b/firmware/asm/m68k/strlen.S index 765969da04..765969da04 100644 --- a/firmware/target/coldfire/strlen-coldfire.S +++ b/firmware/asm/m68k/strlen.S | |||
diff --git a/firmware/libc/memcpy.c b/firmware/asm/memcpy.c index c5456ab41f..c5456ab41f 100644 --- a/firmware/libc/memcpy.c +++ b/firmware/asm/memcpy.c | |||
diff --git a/firmware/libc/memmove.c b/firmware/asm/memmove.c index 5f423964bb..5f423964bb 100644 --- a/firmware/libc/memmove.c +++ b/firmware/asm/memmove.c | |||
diff --git a/firmware/libc/memset.c b/firmware/asm/memset.c index 7b8d2137e8..7b8d2137e8 100644 --- a/firmware/libc/memset.c +++ b/firmware/asm/memset.c | |||
diff --git a/firmware/common/memset16.c b/firmware/asm/memset16.c index 7e31df0cdd..7e31df0cdd 100644 --- a/firmware/common/memset16.c +++ b/firmware/asm/memset16.c | |||
diff --git a/firmware/target/mips/memcpy-mips.S b/firmware/asm/mips/memcpy.S index 2e7f245c69..2e7f245c69 100644 --- a/firmware/target/mips/memcpy-mips.S +++ b/firmware/asm/mips/memcpy.S | |||
diff --git a/firmware/target/mips/memset-mips.S b/firmware/asm/mips/memset.S index 8db76d9123..8db76d9123 100644 --- a/firmware/target/mips/memset-mips.S +++ b/firmware/asm/mips/memset.S | |||
diff --git a/firmware/target/sh/memcpy-sh.S b/firmware/asm/sh/memcpy.S index e23a579b05..e23a579b05 100644 --- a/firmware/target/sh/memcpy-sh.S +++ b/firmware/asm/sh/memcpy.S | |||
diff --git a/firmware/target/sh/memmove-sh.S b/firmware/asm/sh/memmove.S index d5a7160043..d5a7160043 100644 --- a/firmware/target/sh/memmove-sh.S +++ b/firmware/asm/sh/memmove.S | |||
diff --git a/firmware/target/sh/memset-sh.S b/firmware/asm/sh/memset.S index 8cae1ea112..8cae1ea112 100644 --- a/firmware/target/sh/memset-sh.S +++ b/firmware/asm/sh/memset.S | |||
diff --git a/firmware/target/sh/strlen-sh.S b/firmware/asm/sh/strlen.S index e7169e25db..e7169e25db 100644 --- a/firmware/target/sh/strlen-sh.S +++ b/firmware/asm/sh/strlen.S | |||
diff --git a/firmware/libc/strlen.c b/firmware/asm/strlen.c index 649df6764b..649df6764b 100644 --- a/firmware/libc/strlen.c +++ b/firmware/asm/strlen.c | |||