lk2nd: lk2nd-device.h -> lk2nd.h

VerdandiTeam · Feb 7, 2021 · d88c3a8 · d88c3a8
1 parent 3f93af1
commit d88c3a8
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
@@ -67,7 +67,7 @@
 #if DEVICE_TREE
 #include <libfdt.h>
 #include <dev_tree.h>
-#include <lk2nd-device.h>
+#include <lk2nd.h>
 #endif
 
 #include <reboot.h>

diff --git a/app/aboot/fastboot-lk2nd.c b/app/aboot/fastboot-lk2nd.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <debug.h>
 #include <libfdt.h>
-#include <lk2nd-device.h>
+#include <lk2nd.h>
 #include "fastboot.h"
 
 #if WITH_DEBUG_LOG_BUF

diff --git a/include/lk2nd-device.h → include/lk2nd.h b/include/lk2nd-device.h → include/lk2nd.h
diff --git a/lk2nd/lk2nd-device.c b/lk2nd/lk2nd-device.c
@@ -3,10 +3,11 @@
 #include <arch/arm.h>
 #include <board.h>
 #include <debug.h>
+#include <libfdt.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libfdt.h>
-#include "lk2nd-device.h"
+
+#include <lk2nd.h>
 
 struct lk2nd_device lk2nd_dev = {0};
 extern struct board_data board;

diff --git a/lk2nd/lk2nd-motorola.c b/lk2nd/lk2nd-motorola.c
@@ -3,12 +3,13 @@
 #include <debug.h>
 #include <libfdt.h>
 #include <malloc.h>
-#include <string.h>
+#include <smem.h>
 #include <stdlib.h>
+#include <string.h>
 
-#include "lk2nd-device.h"
+#include <lk2nd.h>
 #include "lk2nd-motorola.h"
-#include "smem.h"
+
 
 #define SMEM_ID_VENDOR0          0x86
 #define SMEM_KERNEL_RESERVE      SMEM_ID_VENDOR0

diff --git a/lk2nd/lk2nd-samsung.c b/lk2nd/lk2nd-samsung.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include <debug.h>
-#include <libfdt.h>
 #include <dev/gpio_i2c.h>
+#include <libfdt.h>
 #include <platform/timer.h>
 
 /*

diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
@@ -37,7 +37,7 @@
 #include <board.h>
 #include <list.h>
 #include <kernel/thread.h>
-#include <lk2nd-device.h>
+#include <lk2nd.h>
 
 struct dt_entry_v1
 {

diff --git a/platform/msm_shared/display_menu.c b/platform/msm_shared/display_menu.c
@@ -40,7 +40,7 @@
 #include <target.h>
 #include <sys/types.h>
 #include <../../../app/aboot/devinfo.h>
-#include <lk2nd-device.h>
+#include <lk2nd.h>
 
 static const char *unlock_menu_common_msg = "If you unlock the bootloader, "\
 				"you will be able to install "\

diff --git a/target/msm8916/init.c b/target/msm8916/init.c
@@ -52,7 +52,7 @@
 #include <secapp_loader.h>
 #include <rpmb.h>
 #include <smem.h>
-#include <lk2nd-device.h>
+#include <lk2nd.h>
 
 #if LONG_PRESS_POWER_ON
 #include <shutdown_detect.h>