diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2014-02-04 10:33:46 +0000 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2014-02-04 10:33:46 +0000 |
| commit | 20db29f89a11c023634ccaab152941a6afdf2d52 (patch) | |
| tree | fc378d92d39cdcdb39a8f067455259083d341f10 | |
| parent | 79de899b5a235fb8a2aacd0147ac83a2a86cfd47 (diff) | |
| parent | 47cdf0391af24f6d9b8eb82324f28b2086198290 (diff) | |
| download | boot-wrapper-aarch64-20db29f89a11c023634ccaab152941a6afdf2d52.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
Unify upstream build system updates and PSCI support.
Conflicts:
Makefile
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -74,7 +74,7 @@ $(IMAGE): boot.o cache.o gic.o mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERN $(LD) -o $@ --script=model.lds %.o: %.S Makefile - $(CC) $(CPPFLAGS) $(DEFINES) -c -o $@ $< + $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $< model.lds: $(LD_SCRIPT) Makefile $(CC) $(CPPFLAGS) -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL) -DFILESYSTEM=$(FILESYSTEM) -DBOOTMETHOD=$(BOOTMETHOD) -E -P -C -o $@ $< |