From: 黄涛 <huangtao@rock-chips.com>
Date: Fri, 10 Aug 2012 06:22:32 +0000 (+0800)
Subject: rk: move loader.h from mach-rk30 to plat-rk
X-Git-Tag: firefly_0821_release~8912^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c0652393eb928fd0003f86a5dd13598858032ec8;p=firefly-linux-kernel-4.4.55.git

rk: move loader.h from mach-rk30 to plat-rk
---

diff --git a/arch/arm/mach-rk2928/include/mach/loader.h b/arch/arm/mach-rk2928/include/mach/loader.h
new file mode 100644
index 000000000000..6549ed217341
--- /dev/null
+++ b/arch/arm/mach-rk2928/include/mach/loader.h
@@ -0,0 +1 @@
+#include <plat/loader.h>
diff --git a/arch/arm/mach-rk30/include/mach/loader.h b/arch/arm/mach-rk30/include/mach/loader.h
index f0006b94a684..6549ed217341 100644
--- a/arch/arm/mach-rk30/include/mach/loader.h
+++ b/arch/arm/mach-rk30/include/mach/loader.h
@@ -1,35 +1 @@
-/* arch/arm/mach-rk29/include/mach/loader.h
- *
- * Copyright (C) 2011 ROCKCHIP, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-#ifndef __ASM_ARCH_RK30_LOADER_H
-#define __ASM_ARCH_RK30_LOADER_H
-
-#define SYS_LOADER_REBOOT_FLAG   0x5242C300  //high 24 bits is tag, low 8 bits is type
-#define SYS_KERNRL_REBOOT_FLAG   0xC3524200  //high 24 bits is tag, low 8 bits is type
-
-enum {
-    BOOT_NORMAL = 0, /* normal boot */
-    BOOT_LOADER,     /* enter loader rockusb mode */
-    BOOT_MASKROM,    /* enter maskrom rockusb mode (not support now) */
-    BOOT_RECOVER,    /* enter recover */
-    BOOT_NORECOVER,  /* do not enter recover */
-    BOOT_SECONDOS,   /* boot second OS (not support now)*/
-    BOOT_WIPEDATA,   /* enter recover and wipe data. */
-    BOOT_WIPEALL,    /* enter recover and wipe all data. */
-    BOOT_CHECKIMG,   /* check firmware img with backup part(in loader mode)*/
-    BOOT_FASTBOOT,   /* enter fast boot mode (not support now) */
-    BOOT_MAX         /* MAX VALID BOOT TYPE.*/
-};
-
-#endif
+#include <plat/loader.h>
diff --git a/arch/arm/plat-rk/include/plat/loader.h b/arch/arm/plat-rk/include/plat/loader.h
new file mode 100644
index 000000000000..bb83a86b4452
--- /dev/null
+++ b/arch/arm/plat-rk/include/plat/loader.h
@@ -0,0 +1,21 @@
+#ifndef __PLAT_LOADER_H
+#define __PLAT_LOADER_H
+
+#define SYS_LOADER_REBOOT_FLAG   0x5242C300  //high 24 bits is tag, low 8 bits is type
+#define SYS_KERNRL_REBOOT_FLAG   0xC3524200  //high 24 bits is tag, low 8 bits is type
+
+enum {
+    BOOT_NORMAL = 0, /* normal boot */
+    BOOT_LOADER,     /* enter loader rockusb mode */
+    BOOT_MASKROM,    /* enter maskrom rockusb mode (not support now) */
+    BOOT_RECOVER,    /* enter recover */
+    BOOT_NORECOVER,  /* do not enter recover */
+    BOOT_SECONDOS,   /* boot second OS (not support now)*/
+    BOOT_WIPEDATA,   /* enter recover and wipe data. */
+    BOOT_WIPEALL,    /* enter recover and wipe all data. */
+    BOOT_CHECKIMG,   /* check firmware img with backup part(in loader mode)*/
+    BOOT_FASTBOOT,   /* enter fast boot mode (not support now) */
+    BOOT_MAX         /* MAX VALID BOOT TYPE.*/
+};
+
+#endif