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

2 files changed, 3 insertions, 3 deletions

diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index b943b8cd2c..7fb8608c79 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 ab8e5199e2..d982b91608 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 */ \