summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bootloader/creativezvm.c3
-rw-r--r--bootloader/gigabeat-s.c2
-rw-r--r--bootloader/gigabeat.c3
-rw-r--r--bootloader/iaudio_coldfire.c3
-rw-r--r--bootloader/imx233.c1
-rw-r--r--bootloader/ipod.c3
-rw-r--r--bootloader/ipodnano2g.c3
-rw-r--r--bootloader/iriver_h1x0.c3
-rw-r--r--bootloader/iriver_h300.c3
-rw-r--r--bootloader/lyre_proto1.c2
-rw-r--r--bootloader/main-e200r-installer.c2
-rw-r--r--bootloader/main-pp.c2
-rw-r--r--bootloader/main-ppsansawipe.c2
-rw-r--r--bootloader/meizu_m3.c3
-rw-r--r--bootloader/mini2440.c3
-rw-r--r--bootloader/mpio_hd200_hd300.c3
-rw-r--r--bootloader/mrobe500.c3
-rw-r--r--bootloader/ondavx747.c1
-rw-r--r--bootloader/rk27xx.c2
-rw-r--r--bootloader/samsung_yps3.c3
-rw-r--r--bootloader/sansa_as3525.c1
-rw-r--r--bootloader/sansaconnect.c3
-rw-r--r--bootloader/sansaview.c3
-rw-r--r--bootloader/telechips.c3
24 files changed, 24 insertions, 36 deletions
diff --git a/bootloader/creativezvm.c b/bootloader/creativezvm.c
index 76d72fe506..f3a3960552 100644
--- a/bootloader/creativezvm.c
+++ b/bootloader/creativezvm.c
@@ -19,8 +19,7 @@
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "ata-target.h"
#include "disk.h"
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 5bc6bab720..50ff12da72 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -21,7 +21,7 @@
#include "config.h"
#include "system.h"
#include <stdio.h>
-#include "kernel.h"
+#include "../kernel-internal.h"
#include "gcc_extensions.h"
#include "string.h"
#include "adc.h"
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c
index d77021571a..f995be078c 100644
--- a/bootloader/gigabeat.c
+++ b/bootloader/gigabeat.c
@@ -27,8 +27,7 @@
#include "cpu.h"
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "fat.h"
#include "disk.h"
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c
index 95060e458f..da7a7af208 100644
--- a/bootloader/iaudio_coldfire.c
+++ b/bootloader/iaudio_coldfire.c
@@ -28,8 +28,7 @@
#include "system.h"
#include "lcd.h"
#include "lcd-remote.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "usb.h"
#include "disk.h"
diff --git a/bootloader/imx233.c b/bootloader/imx233.c
index 1169b392aa..f0d6aa0fe1 100644
--- a/bootloader/imx233.c
+++ b/bootloader/imx233.c
@@ -26,6 +26,7 @@
#include <system.h>
#include <inttypes.h>
#include "config.h"
+#include "../kernel-internal.h"
#include "gcc_extensions.h"
#include "lcd.h"
#include "backlight.h"
diff --git a/bootloader/ipod.c b/bootloader/ipod.c
index 3f9604ae4b..cae2501485 100644
--- a/bootloader/ipod.c
+++ b/bootloader/ipod.c
@@ -30,8 +30,7 @@
#include "cpu.h"
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "ata.h"
#include "fat.h"
#include "disk.h"
diff --git a/bootloader/ipodnano2g.c b/bootloader/ipodnano2g.c
index c5fa6e2e65..f3be7aed01 100644
--- a/bootloader/ipodnano2g.c
+++ b/bootloader/ipodnano2g.c
@@ -31,8 +31,7 @@
#include "system.h"
#include "lcd.h"
#include "i2c-s5l8700.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "fat.h"
#include "disk.h"
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c
index 77624526e5..61077f3842 100644
--- a/bootloader/iriver_h1x0.c
+++ b/bootloader/iriver_h1x0.c
@@ -29,8 +29,7 @@
#include "lcd.h"
#include "lcd-remote.h"
#include "scroll_engine.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "usb.h"
#include "disk.h"
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index 4b36e40e61..2f53d03e2f 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -29,8 +29,7 @@
#include "lcd.h"
#include "lcd-remote.h"
#include "scroll_engine.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "usb.h"
#include "disk.h"
diff --git a/bootloader/lyre_proto1.c b/bootloader/lyre_proto1.c
index 8503b5cdb8..b76d0fb467 100644
--- a/bootloader/lyre_proto1.c
+++ b/bootloader/lyre_proto1.c
@@ -20,7 +20,7 @@
****************************************************************************/
/* Include Standard files */
-#include "kernel.h"
+#include "../kernel-internal.h"
#include "system.h"
/* Show the Rockbox logo - in show_logo.c */
diff --git a/bootloader/main-e200r-installer.c b/bootloader/main-e200r-installer.c
index dca34ec699..c24f5c068c 100644
--- a/bootloader/main-e200r-installer.c
+++ b/bootloader/main-e200r-installer.c
@@ -28,7 +28,7 @@
#include "cpu.h"
#include "file.h"
#include "system.h"
-#include "kernel.h"
+#include "../kernel-internal.h"
#include "lcd.h"
#include "font.h"
#include "storage.h"
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index cb629a76b2..9f7b88cdc8 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -29,7 +29,7 @@
#include "cpu.h"
#include "file.h"
#include "system.h"
-#include "kernel.h"
+#include "../kernel-internal.h"
#include "lcd.h"
#include "font.h"
#include "storage.h"
diff --git a/bootloader/main-ppsansawipe.c b/bootloader/main-ppsansawipe.c
index e54ad8d867..88f722938e 100644
--- a/bootloader/main-ppsansawipe.c
+++ b/bootloader/main-ppsansawipe.c
@@ -23,7 +23,7 @@
#include "cpu.h"
#include "file.h"
#include "system.h"
-#include "kernel.h"
+#include "../kernel-internal.h"
#include "lcd.h"
#include "font.h"
#include "storage.h"
diff --git a/bootloader/meizu_m3.c b/bootloader/meizu_m3.c
index 5ecc92f369..936d3aca46 100644
--- a/bootloader/meizu_m3.c
+++ b/bootloader/meizu_m3.c
@@ -30,8 +30,7 @@
#include "cpu.h"
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "fat.h"
#include "disk.h"
diff --git a/bootloader/mini2440.c b/bootloader/mini2440.c
index 7750d07559..4976318e9a 100644
--- a/bootloader/mini2440.c
+++ b/bootloader/mini2440.c
@@ -27,8 +27,7 @@
#include "cpu.h"
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "fat.h"
#include "disk.h"
diff --git a/bootloader/mpio_hd200_hd300.c b/bootloader/mpio_hd200_hd300.c
index 1828907ea7..963e65f22b 100644
--- a/bootloader/mpio_hd200_hd300.c
+++ b/bootloader/mpio_hd200_hd300.c
@@ -27,8 +27,7 @@
#include "cpu.h"
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "usb.h"
#include "disk.h"
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c
index 642945487d..1b00e12b92 100644
--- a/bootloader/mrobe500.c
+++ b/bootloader/mrobe500.c
@@ -24,8 +24,7 @@
#include "cpu.h"
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "fat.h"
#include "disk.h"
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c
index 4d0bf4221c..0c189eaca1 100644
--- a/bootloader/ondavx747.c
+++ b/bootloader/ondavx747.c
@@ -21,6 +21,7 @@
#include "config.h"
#include "jz4740.h"
+#include "../kernel-internal.h"
#include "backlight.h"
#include "font.h"
#include "lcd.h"
diff --git a/bootloader/rk27xx.c b/bootloader/rk27xx.c
index c623a971aa..dae738ec08 100644
--- a/bootloader/rk27xx.c
+++ b/bootloader/rk27xx.c
@@ -2,7 +2,7 @@
#include <inttypes.h>
#include "config.h"
#include "system.h"
-#include "kernel.h"
+#include "../kernel-internal.h"
#include "gcc_extensions.h"
#include "lcd.h"
#include "font.h"
diff --git a/bootloader/samsung_yps3.c b/bootloader/samsung_yps3.c
index b80fbf5421..927cd6e43a 100644
--- a/bootloader/samsung_yps3.c
+++ b/bootloader/samsung_yps3.c
@@ -30,8 +30,7 @@
#include "cpu.h"
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "backlight.h"
#include "backlight-target.h"
#include "button.h"
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index b28ccf43e7..8592f2450f 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -27,6 +27,7 @@
#include <inttypes.h>
#include "config.h"
#include "gcc_extensions.h"
+#include "../kernel-internal.h"
#include "lcd.h"
#ifdef USE_ROCKBOX_USB
#include "usb.h"
diff --git a/bootloader/sansaconnect.c b/bootloader/sansaconnect.c
index 9b637c829b..280c386968 100644
--- a/bootloader/sansaconnect.c
+++ b/bootloader/sansaconnect.c
@@ -19,8 +19,7 @@
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "disk.h"
#include "font.h"
diff --git a/bootloader/sansaview.c b/bootloader/sansaview.c
index b1f0dbdfee..03e24b8c8e 100644
--- a/bootloader/sansaview.c
+++ b/bootloader/sansaview.c
@@ -33,8 +33,7 @@ SANSA VIEW: TESTING CODE
#include "cpu.h"
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "fat.h"
#include "disk.h"
diff --git a/bootloader/telechips.c b/bootloader/telechips.c
index af4ec72bc4..77aa398487 100644
--- a/bootloader/telechips.c
+++ b/bootloader/telechips.c
@@ -28,8 +28,7 @@
#include "cpu.h"
#include "system.h"
#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
+#include "../kernel-internal.h"
#include "storage.h"
#include "fat.h"
#include "disk.h"