main: Drop PAYLOAD_SIZE, use compile time kernel size

Signed-off-by: Markuss Broks <[email protected]>
ivoszbg · Jun 14, 2022 · 7c6386e · 7c6386e
1 parent 4d1a5f8
commit 7c6386e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/include/main.h b/include/main.h
@@ -6,6 +6,7 @@
 #ifndef MAIN_H_   /* Include guard */
 #define MAIN_H_
 
+extern unsigned long kernel_size;
 extern void load_kernel(void* dtb, void* x1, void* x2, void* x3, void* kernel);
 extern void soc_init(void);
 extern void board_init(void);

diff --git a/main/linker.lds.S b/main/linker.lds.S
@@ -25,4 +25,6 @@ SECTIONS
 		kernel = .;
 		KERNEL_PATH
 	}
+
+	kernel_size = SIZEOF(.kernel);
 }
diff --git a/main/main.c b/main/main.c
@@ -23,6 +23,6 @@ void main(void* dt, void* kernel) {
 	#ifdef CONFIG_SIMPLE_FB
 	debug_printfb((char*)CONFIG_FRAMEBUFFER_BASE, "Booting linux...", 0, CONFIG_FRAMEBUFFER_WIDTH, CONFIG_FRAMEBUFFER_STRIDE);
 	#endif
-	memcpy((void*)CONFIG_PAYLOAD_ENTRY, kernel, CONFIG_PAYLOAD_SIZE);
+	memcpy((void*)CONFIG_PAYLOAD_ENTRY, kernel, (unsigned long) &kernel_size);
 	load_kernel(dt, 0, 0, 0, (void*)CONFIG_PAYLOAD_ENTRY);	
 }