Browse Source

Fixup for latest Arch ARM toolchain

Aaron Lindsay 5 years ago
parent
commit
884913b350
2 changed files with 3 additions and 3 deletions
  1. 1 1
      Makefile
  2. 2 2
      arch/arm/kernel.mk

+ 1 - 1
Makefile

@@ -20,7 +20,7 @@ OBJDUMP = $(CROSS_COMPILE)objdump
20 20
 # Define the flags we'll need for our tools
21 21
 INCLUDES = -I include -I arch/$(ARCH)/include
22 22
 KCFLAGS = -g -Wall -Wextra -Werror -nostdlib -nostartfiles -fno-builtin -std=gnu99 $(ARCH_KCFLAGS) -include config.h $(INCLUDES)
23
-KLDFLAGS = -T arch/$(ARCH)/kernel.ld -L /usr/lib/gcc/arm-elf/4.7.0/ $(ARCH_KLDFLAGS)
23
+KLDFLAGS = -T arch/$(ARCH)/kernel.ld $(ARCH_KLDFLAGS)
24 24
 EXTRA_LIBS = $(ARCH_EXTRA_LIBS)
25 25
 
26 26
 # Include the config file so we don't compile/link unnecessary objects

+ 2 - 2
arch/arm/kernel.mk

@@ -4,8 +4,8 @@ SUBDIRS := kernel
4 4
 include $(BASEDIR)/header.mk
5 5
 
6 6
 # Architecture-specific definitions
7
-CROSS_COMPILE ?= arm-elf-
8
-ARCH_KCFLAGS =
7
+CROSS_COMPILE ?= arm-none-eabi-
8
+ARCH_KLDFLAGS = -L /usr/lib/gcc/arm-none-eabi/4.9.1
9 9
 ARCH_EXTRA_LIBS = -lgcc
10 10
 
11 11
 OBJS_$(d) := $(d)/start.o