Commit 8b9ad9f6 authored by Shawn Guo's avatar Shawn Guo
Browse files

Merge remote-tracking branch 'swarren/for-3.10/dtc-cpp-chroot-std-headers' into imx/dt

parents 30dd1877 4be505d4

arch/arm/boot/dts/include/dt-bindings

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../../../../include/dt-bindings
 
 No newline at end of file

include/dt-bindings/gpio/gpio.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/*

 * This header provides constants for most GPIO bindings.

 *

 * Most GPIO bindings include a flags cell as part of the GPIO specifier.

 * In most cases, the format of the flags cell uses the standard values

 * defined in this header.

 */



#ifndef _DT_BINDINGS_GPIO_GPIO_H

#define _DT_BINDINGS_GPIO_GPIO_H



#define GPIO_ACTIVE_HIGH 0

#define GPIO_ACTIVE_LOW 1



#endif

include/dt-bindings/interrupt-controller/arm-gic.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * This header provides constants for the ARM GIC.

 */



#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_ARM_GIC_H

#define _DT_BINDINGS_INTERRUPT_CONTROLLER_ARM_GIC_H



#include <dt-bindings/interrupt-controller/irq.h>



/* interrupt specific cell 0 */



#define GIC_SPI 0

#define GIC_PPI 1



/*

 * Interrupt specifier cell 2.

 * The flaggs in irq.h are valid, plus those below.

 */

#define GIC_CPU_MASK_RAW(x) ((x) << 8)

#define GIC_CPU_MASK_SIMPLE(num) GIC_CPU_MASK_RAW((1 << (num)) - 1)



#endif

include/dt-bindings/interrupt-controller/irq.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * This header provides constants for most IRQ bindings.

 *

 * Most IRQ bindings include a flags cell as part of the IRQ specifier.

 * In most cases, the format of the flags cell uses the standard values

 * defined in this header.

 */



#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_IRQ_H

#define _DT_BINDINGS_INTERRUPT_CONTROLLER_IRQ_H



#define IRQ_TYPE_NONE		0

#define IRQ_TYPE_EDGE_RISING	1

#define IRQ_TYPE_EDGE_FALLING	2

#define IRQ_TYPE_EDGE_BOTH	(IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING)

#define IRQ_TYPE_LEVEL_HIGH	4

#define IRQ_TYPE_LEVEL_LOW	8



#endif

scripts/Makefile.lib

+7 −10
Original line number Diff line number Diff line
@@ -156,9 +156,9 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ 


ld_flags       = $(LDFLAGS) $(ldflags-y)



dtc_cpp_flags  = -Wp,-MD,$(depfile) -nostdinc                            \

dtc_cpp_flags  = -Wp,-MD,$(depfile).pre -nostdinc                        \

		 -I$(srctree)/arch/$(SRCARCH)/boot/dts                   \

		 -I$(srctree)/arch/$(SRCARCH)/include/dts                \

		 -I$(srctree)/arch/$(SRCARCH)/boot/dts/include           \

		 -undef -D__DTS__



# Finds the multi-part object the current object will be linked into
@@ -269,20 +269,17 @@ $(obj)/%.dtb.S: $(obj)/%.dtb 
	$(call cmd,dt_S_dtb)



quiet_cmd_dtc = DTC     $@

cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $<

cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \

	$(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \

		-i $(srctree)/arch/$(SRCARCH)/boot/dts $(DTC_FLAGS) \

		-d $(depfile).dtc $(dtc-tmp) ; \

	cat $(depfile).pre $(depfile).dtc > $(depfile)



$(obj)/%.dtb: $(src)/%.dts FORCE

	$(call if_changed_dep,dtc)



dtc-tmp = $(subst $(comma),_,$(dot-target).dts)



quiet_cmd_dtc_cpp = DTC+CPP $@

cmd_dtc_cpp = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \

	$(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $(dtc-tmp)



$(obj)/%.dtb: $(src)/%.dtsp FORCE

	$(call if_changed_dep,dtc_cpp)



# Bzip2

# ---------------------------------------------------------------------------