Merge branch 'msm8953-mainline:main' into main

.github/workflows/build.yml

@@ -9,3 +9,10 @@ jobs:
       platform: msm8953-secondary
       artifacts: |
         build-*/lk2nd.img
+  lk2nd-motorola-ali:
+    name: lk2nd
+    uses: ./.github/workflows/lk2nd.yml
+    with:
+      platform: motorola-ali-secondary
+      artifacts: |
+        build-*/lk2nd.img

README.md

@@ -18,6 +18,7 @@ and then loaded by lk2nd.
 - 10or G (G)
 - Motorola Moto G4 Play (harpia)
 - Motorola Moto G5 Plus (potter)
+- Motorola Moto G6 (ali) NOTE: Build with motorola-ali-secondary
 - Samsung Galaxy A3 (2015) - SM-A300FU
 - Samsung Galaxy A5 (2015) - SM-A500FU
 - Samsung Galaxy J5 (2016) - SM-J510FN

arch/arm/mmu.c

@@ -26,6 +26,7 @@
 #include <arch.h>
 #include <arch/arm.h>
 #include <arch/defines.h>
+#include <arch/ops.h>
 #include <arch/arm/mmu.h>
 #include <platform.h>
 

dts/rules.mk

@@ -5,6 +5,10 @@ DTBS += \
 	$(LOCAL_DIR)/msm8916-longcheer-l8150.dtb \
 	$(LOCAL_DIR)/msm8916-samsung.dtb
 endif
+ifeq ($(PROJECT), motorola-ali-secondary)
+DTBS += \
+	$(LOCAL_DIR)/sdm450-motorola-ali.dtb
+endif
 ifeq ($(PROJECT), msm8953-secondary)
 DTBS += \
 	$(LOCAL_DIR)/msm8953-10or-g.dtb \

dts/sdm450-motorola-ali.dts

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/dts-v1/;
+
+/include/ "msm8953.dtsi"
+
+/ {
+	model = "Motorola Moto G6 (ali)";
+	compatible = "motorola,ali", "qcom,sdm450", "lk2nd,device";
+	qcom,msm-id = <0x152 0x00>;
+	qcom,board-id = <0x41 0xb1a0>,
+		<0x42 0xb1a0>,
+		<0x42 0xb1b0>,
+		<0x42 0xb200>,
+		<0x43 0xb200>,
+		<0x43 0xc100>,
+		<0x43 0xc200>,
+		<0x44 0xc200>;
+	lk2nd,pstore = <0xef000000 0xC0000>;
+
+	panel {
+		compatible = "motorola,ali-panel";
+
+		qcom,mdss_dsi_mot_auo_565_1080p_vid_v0 {
+			compatible = "motorola,ali-panel-auo";
+		};
+
+		qcom,mdss_dsi_mot_boe_565_1080p_vid_v0 {
+			compatible = "motorola,ali-panel-boe";
+		};
+
+		qcom,mdss_dsi_mot_tianma_565_1080p_vid_v0 {
+			compatible = "motorola,ali-panel-tianma";
+		};
+	};
+};

kernel/main.c

@@ -29,6 +29,8 @@
 #include <arch.h>
 #include <platform.h>
 #include <target.h>
+#include <lib/bio.h>
+#include <lib/fs.h>
 #include <lib/heap.h>
 #include <kernel/thread.h>
 #include <kernel/timer.h>

lib/debug/debug.c

@@ -32,6 +32,7 @@
 #include <arch/ops.h>
 #include <platform.h>
 #include <platform/debug.h>
+#include <platform/timer.h>
 #include <kernel/thread.h>
 #include <kernel/timer.h>
 #include <rand.h>

lib/fs/ext2/dir.c

@@ -198,7 +198,7 @@ int ext2_lookup(ext2_t *ext2, const char *_path, inodenum_t *inum)
 // © 2019 Mis012 - SPDX-License-Identifier: GPL-3.0
 // from here till the end of file
 
-status_t ext2_open_directory(fscookie *cookie, const char *path, dircookie **dircookie) {
+status_t ext2_open_directory(fscookie *cookie, const char *path, dircookie **dcookie) {
 	off_t entry_len = 0;
 	ext2_dir_t *dir = malloc(sizeof(ext2_dir_t));
 	memset(dir, 0, sizeof(ext2_dir_t));
@@ -225,7 +225,7 @@ status_t ext2_open_directory(fscookie *cookie, const char *path, dircookie **dir
 	dir->offset = 0;
 	dir->length = entry_len;
 
-	*dircookie = dir;
+	*dcookie = (dircookie *) dir;
 
 	return 0;
 }
@@ -254,7 +254,7 @@ status_t ext2_read_directory(dircookie *dircookie, struct dirent *ent) {
 status_t ext2_close_directory(dircookie *dircookie) {
 	ext2_dir_t *dir = (ext2_dir_t *)dircookie;
 
-	ext2_close_file(dir->file);
+	ext2_close_file((filecookie *)dir->file);
 	free(dir);
 	return 0;
 }

platform/msm8953/platform.c

@@ -35,6 +35,7 @@
 #include <qtimer.h>
 #include <mmu.h>
 #include <arch/arm/mmu.h>
+#include <arch/defines.h>
 #include <smem.h>
 #include <board.h>
 #include <boot_stats.h>

project/motorola-ali-secondary.mk

@@ -0,0 +1,2 @@
+LOCAL_DIR := $(GET_LOCAL_DIR)
+include $(LOCAL_DIR)/msm8953-secondary.mk