summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-04-21 21:45:58 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-04-21 21:45:58 +0000
commit8ec1dca0da5d4d2d4d81768ab31ccb2f0981aadc (patch)
treec2499d770aa402eb49da4366dca549265134a575
parent5818bc3c3102c64a39e4fb6bf878841255753225 (diff)
downloadrockbox-8ec1dca0da5d4d2d4d81768ab31ccb2f0981aadc.zip
rockbox-8ec1dca0da5d4d2d4d81768ab31ccb2f0981aadc.tar.gz
rockbox-8ec1dca0da5d4d2d4d81768ab31ccb2f0981aadc.tar.bz2
rockbox-8ec1dca0da5d4d2d4d81768ab31ccb2f0981aadc.tar.xz
Enable program flow prediction in the system control coprocessor setup in the bootloader.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17211 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--bootloader/gigabeat-s.c2
-rw-r--r--firmware/target/arm/imx31/crt0.S4
2 files changed, 3 insertions, 3 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index b943b8c..7fb8608 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -156,7 +156,7 @@ void main(void)
lcd_clear_display();
printf("Hello world!");
- printf("Gigabeat S Rockbox Bootloader v.00000009");
+ printf("Gigabeat S Rockbox Bootloader v.00000010");
system_init();
kernel_init();
printf("kernel init done");
diff --git a/firmware/target/arm/imx31/crt0.S b/firmware/target/arm/imx31/crt0.S
index ab8e519..d982b91 100644
--- a/firmware/target/arm/imx31/crt0.S
+++ b/firmware/target/arm/imx31/crt0.S
@@ -198,10 +198,10 @@ remap_start:
(1 << 22)) /* Unaligned access support disabled */
bic r0, r0, #((1 << 21) | /* All performance features enabled */ \
(1 << 15)) /* Loads to PC set T bit */
- bic r0, r0, #((1 << 13) | /* Low vectors */ \
- (1 << 11)) /* Program flow prediction disabled (for now) */
+ bic r0, r0, #((1 << 13)) /* Low vectors */
orr r0, r0, #((1 << 14) | /* Round-robin replacement for I/D caches */ \
(1 << 12) | /* L1 I-cache enabled */ \
+ (1 << 11) | /* Program flow prediction enabled */ \
(1 << 9) | /* ROM protection enabled */ \
(1 << 8)) /* MMU protection enabled */
orr r0, r0, #((1 << 2) | /* L1 D-cache enabled */ \