From b96c27bba0b242fc860fc9a2fcb63f121312fa7e Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 20 Mar 2021 19:52:56 +0100
Subject: LGTM!

---
 apps/Makefile |  2 +-
 apps/init.c   |  3 +--
 apps/link.ld  | 29 -----------------------------
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 apps/link.ld

(limited to 'apps')

diff --git a/apps/Makefile b/apps/Makefile
index 66f8e42..d43104a 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -13,7 +13,7 @@ all: $(COBJS)
 %.o: %.c
 	@mkdir -p ../build/apps/
 	@$(CC) -c $(CFLAGS) $< -o $@
-	@$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ -static $@ -lgui -ltxt -lc
+	@$(LD) -o $(@:.o=.elf) --section-start=.text=0x42000000 -L../build/ -static $@ -lgui -ltxt -lc
 	@cp $(@:.o=.elf) ../build/apps/$(@:.o=)
 #@$(ST) --strip-all ../build/apps/$(@:.o=)
 
diff --git a/apps/init.c b/apps/init.c
index 221708e..35d296b 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -8,9 +8,8 @@ int main(int argc, char **argv)
 {
 	UNUSED(argc);
 	UNUSED(argv);
-	log("Arrived!\n");
 
-	/* assert(exec("/bin/wm", "wm", NULL) == 0); */
+	assert(exec("/bin/wm", "wm", NULL) == 0);
 	/* assert(exec("/bin/window", "test", NULL) == 0); */
 
 	return 0;
diff --git a/apps/link.ld b/apps/link.ld
deleted file mode 100644
index e28bb34..0000000
--- a/apps/link.ld
+++ /dev/null
@@ -1,29 +0,0 @@
-OUTPUT_FORMAT("elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(_start)
-
-SECTIONS
-{
-	. = 0x40000000;
-
-	.text : {
-		code = .;
-		*(.text)
-		*(.rodata)
-		. = ALIGN(4096);
-	}
-
-	.data : {
-		data = .;
-		*(.data)
-		. = ALIGN(4096);
-	}
-
-	.bss : {
-		bss = .;
-		*(.bss)
-		. = ALIGN(4096);
-	}
-
-	. = ALIGN(4096);
-}
-- 
cgit v1.2.3