Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot...

Unify upstream build system updates and PSCI support.

Conflicts:
	Makefile

Signed-off-by: Mark Rutland <mark.rutland@arm.com>

diff --cc Makefile
index 18bc9101b5c4446cc05300f9469149523ff9a907,128bebf6787c309d95a4dc46ddfa251a1d70abef..b7fb61d95f7efadd8772d8c8a1ae22b959a267a8
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -68,16 -59,16 +68,16 @@@ DTC                := $(if $(wildcard ./dtc), ./dtc, 
  all: $(IMAGE)
  
  clean:
 -      rm -f $(IMAGE) boot.o model.lds fdt.dtb
 +      rm -f $(IMAGE) boot.o cache.o gic.o mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb
  
 -$(IMAGE): boot.o model.lds fdt.dtb $(KERNEL) $(FILESYSTEM)
 +$(IMAGE): boot.o cache.o gic.o mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL) $(FILESYSTEM)
        $(LD) -o $@ --script=model.lds
  
 -boot.o: $(BOOTLOADER) Makefile
 -      $(CC) $(CPPFLAGS) $(CFLAGS) -DCNTFRQ=$(CNTFRQ) -DUART_BASE=$(UART_BASE) -DSYSREGS_BASE=$(SYSREGS_BASE) -DGIC_DIST_BASE=$(GIC_DIST_BASE) -DGIC_CPU_BASE=$(GIC_CPU_BASE) -c -o $@ $(BOOTLOADER)
 +%.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) -E -P -C -o $@ $<
 +      $(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 $@ $<
  
  ifeq ($(DTC),)
        $(error No dtc found! You can git clone from git://git.jdl.com/software/dtc.git)