Skip to contentSkip to conversation

ARM: shmobile: Add temporary include workaround

PATCH Superseded Magnus Damm 2 participants 3 messages Feb 24, 2014 – Mar 10, 2014

Subsystems (4)
Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH v2 1/1 ARM: shmobile: Add temporary include workaround

From: Magnus Damm <[email protected]>

Add temporary include path in the mach-shmobile Makefile to aid coversion from using <mach/something.h> to "something.h" in the source files.

Signed-off-by Magnus Damm <[email protected]>

---

Changes since V1:
- Use += instead of := to avoid breaking MULTIPLATFORM

 arch/arm/mach-shmobile/Makefile |    2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-shmobile/Makefile +2 -0
@@ -4,6 +4,8 @@
 
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
 
+ccflags-y += -I$(srctree)/arch/arm/mach-shmobile/include/mach
+
 # Common objects
 obj-y				:= timer.o console.o
#1 lore raw

PATCH v2 1/1 ARM: shmobile: Add temporary include workaround

Quoted 19 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Add temporary include path in the mach-shmobile Makefile to aid coversion from using <mach/something.h> to "something.h" in the source files.

Signed-off-by Magnus Damm <[email protected]>

---

Changes since V1:
- Use += instead of := to avoid breaking MULTIPLATFORM

 arch/arm/mach-shmobile/Makefile |    2 ++
 1 file changed, 2 insertions(+)

arch/arm/mach-shmobile/Makefile line 11

Quoted 8 lines
arch/arm/mach-shmobile/Makefile +2 -0
@@ -4,6 +4,8 @@
 
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
 
+ccflags-y += -I$(srctree)/arch/arm/mach-shmobile/include/mach
+
 # Common objects
 obj-y				:= timer.o console.o

Hmm. Not a fan of doing this. Let's just do the include file move with the include string changes instead on each instance.

author maintainer
#2 lore raw

PATCH v2 1/1 ARM: shmobile: Add temporary include workaround

Quoted 23 lines · Olof Johansson
Quoted 22 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Add temporary include path in the mach-shmobile Makefile to aid coversion from using <mach/something.h> to "something.h" in the source files.

Signed-off-by Magnus Damm <[email protected]>

---

Changes since V1:
- Use += instead of := to avoid breaking MULTIPLATFORM

 arch/arm/mach-shmobile/Makefile |    2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-shmobile/Makefile 2014-02-25 07:41:56.000000000 +0900 renamed from arch/arm/mach-shmobile/Makefile +0 -0
@@ -4,6 +4,8 @@
 
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
Quoted 8 lines

arch/arm/mach-shmobile/Makefile 2014-02-25 07:41:56.000000000 +0900 line 11

Quoted 5 lines
arch/arm/mach-shmobile/Makefile 2014-02-25 07:41:56.000000000 +0900 renamed from arch/arm/mach-shmobile/Makefile +2 -0
+ccflags-y += -I$(srctree)/arch/arm/mach-shmobile/include/mach
+
 # Common objects
 obj-y                                := timer.o console.o

Hmm. Not a fan of doing this. Let's just do the include file move with the include string changes instead on each instance.

Sure, I'm open to anything here. How would you like me to write the code to make it easy for Simon and you to merge it?

I'm asking because most header files are used by both SoC code and board code, and because of that I went with different changes for different topic branches. So to cope with the topic branch split my current patches do this:

1) Introduce workaround to allow new header location
2) Convert SoC files to using new header location
3) Convert Board files to using new header location
4) Move header files
5) Remove recently introduced workaround
6) Remove existing multiplatform include path workaround

I'm happy to change things around, but please let me know how you guys would like to consume this change so I can decide what to write against.

Thanks,

/ magnus