From f87b0105a0ac411b0d64d89a9ea92e9b07087aa2 Mon Sep 17 00:00:00 2001 From: vetch Date: Tue, 10 Dec 2019 15:47:05 +0100 Subject: Revert "Merge branch 'bob' of https://repo.or.cz/RPi-MMU-example into alice" This reverts commit 5662aacc5688bba4873367ed9ab51fb83fbd1feb, reversing changes made to b0a6351d52af8bdf6fa9cca0d313df323249a520. --- Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f07bced..ce29a19 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,6 @@ ELFFLAGS=-ffreestanding -O2 -nostdlib -lgcc -I. ARM_OBJECTS=kernel.o paging.o demo_functionality.o PL0_test.o uart.o loader_stage1.o loader_stage2.o -EMBEDDABLE_OBJECTS=PL_0_test_embeddable.o loader_stage2_embeddable.o - -RENAME_FLAGS=--rename-section .data=.renamed_data --rename-section .rodata=.renamed_rodata --rename-section .text=.renamed_text --rename-section .bss=.renamed_bss - all : kernel7.img %.o : %.c @@ -21,16 +17,10 @@ all : kernel7.img %_embeddable.o : %.img arm-none-eabi-objcopy -I binary -O elf32-littlearm -B arm --rename-section .data=.rodata $^ $@ -libkernel.o : libkernel.c - arm-none-eabi-gcc $(CFLAGS) -fPIC -c $^ -o $@ - -libkernel_renamed.o : libkernel.o - arm-none-eabi-objcopy $(RENAME_FLAGS) $^ $@ - PL_0_test.elf : PL0_test.o uart.o arm-none-eabi-gcc -T PL0_test.ld -o $@ $(ELFFLAGS) $^ -kernel.elf : boot.o kernel.o uart.o PL_0_test_embeddable.o demo_functionality.o paging.o libkernel_renamed.o +kernel.elf : boot.o kernel.o uart.o PL_0_test_embeddable.o demo_functionality.o paging.o arm-none-eabi-gcc -T linker.ld -o $@ $(ELFFLAGS) $^ loader_stage2.elf : loader_stage2.o uart.o -- cgit v1.2.3