From d1c5ced559805c769b70a6c90f985810a52b09e0 Mon Sep 17 00:00:00 2001 From: halal-beef <78730004+halal-beef@users.noreply.github.com> Date: Tue, 12 Mar 2024 20:54:39 +0000 Subject: [PATCH] fix some stuff from previous commit --- arch/arm/linker.lds | 22 ---------------------- main/main.c | 1 - 2 files changed, 23 deletions(-) delete mode 100644 arch/arm/linker.lds diff --git a/arch/arm/linker.lds b/arch/arm/linker.lds deleted file mode 100644 index 3606a91..0000000 --- a/arch/arm/linker.lds +++ /dev/null @@ -1,22 +0,0 @@ -ENTRY(_start); -OUTPUT_FORMAT("elf32-littlearm") -OUTPUT_ARCH(arm) -TARGET(binary) -INPUT(blob/Image) -INPUT(blob/dtb) -SECTIONS -{ - . = 0x80208000; - .boot : { - arch/arm/Start.o - } - .dtb ALIGN(0x1000) : { - dtb = .; - blob/dtb - } - .kernel ALIGN(0x1000) : { - kernel = .; - blob/Image - } - kernel_size = SIZEOF(.kernel); -} diff --git a/main/main.c b/main/main.c index f3c4f7f..bd9428a 100644 --- a/main/main.c +++ b/main/main.c @@ -13,7 +13,6 @@ void main(void* dt, void* kernel) { #ifdef CONFIG_SIMPLE_FB clean_fb((char*)CONFIG_FRAMEBUFFER_BASE, CONFIG_FRAMEBUFFER_WIDTH, CONFIG_FRAMEBUFFER_HEIGHT, CONFIG_FRAMEBUFFER_STRIDE); #endif - soc_init(); printk("soc_init() passed!");