[U-Boot] [PATCH 0/2]

PATCH Superseded Masahiro Yamada 2 participants 5 messages May 26, 2015

Subsystems (2)

PowerPC Kbuild

lore

Share & tools

lore

Masahiro Yamada

author

2015-05-26 06:32 UTC #0 lore raw

cover [U-Boot] [PATCH 0/2]

1/2: refactors a little because NDS32 actually need not the symbolic link 2/2: introduce a new config to avoid broken symbolic links.

Masahiro Yamada (2):
nds32: include <asm/arch-*/*.h> instead of <asm/arch/*.h>
kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86

 arch/Kconfig                 | 6 ++++++
 arch/powerpc/Kconfig         | 3 +++
 include/configs/adp-ag101.h  | 2 +-
 include/configs/adp-ag101p.h | 2 +-
 include/configs/adp-ag102.h  | 2 +-
 scripts/Makefile.autoconf    | 2 ++
 6 files changed, 14 insertions(+), 3 deletions(-)

Signature · 1 line

1.9.1

Masahiro Yamada

author

2015-05-26 06:32 UTC #1 lore raw

PATCH 1/2 nds32: include <asm/arch-*/*.h> instead of <asm/arch/*.h>

There are only two SoC-specific headers for this architecture:
- arch/nds32/include/asm/arch-ag101/ag101.h
- arch/nds32/include/asm/arch-ag102/ag102.h

Those two have different file names, so there is no advantage to include them via symbolic linked directory.

Signed-off-by Masahiro Yamada <[email protected]>

---

 include/configs/adp-ag101.h  | 2 +-
 include/configs/adp-ag101p.h | 2 +-
 include/configs/adp-ag102.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

include/configs/adp-ag101.h +1 -1

index e318c75..f70ee10 100644
@@ -9,7 +9,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/ag101.h>
+#include <asm/arch-ag101/ag101.h>
 
 /*
  * CPU and Board Configuration Options

include/configs/adp-ag101p.h +1 -1

index 24904b0..60a5038 100644
@@ -9,7 +9,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/ag101.h>
+#include <asm/arch-ag101/ag101.h>
 
 /*
  * CPU and Board Configuration Options

include/configs/adp-ag102.h +1 -1

index 39f7a3c..ffd5d33 100644
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/ag102.h>
+#include <asm/arch-ag102/ag102.h>
 
 /*
  * CPU and Board Configuration Options

Signature · 1 line

1.9.1

Masahiro Yamada

author

2015-05-26 06:32 UTC #2 lore raw

PATCH 2/2 kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86

In reply to Masahiro Yamada

The symbolic link to SoC/CPU specific header directory is created during the build, while it is only necessary for ARM, SPARC, x86, and some CPUs of PowerPC. For the other architectures, it just results in a broken symbolic link.

Introduce CONFIG_CREATE_ARCH_SYMLINK to not create unneeded symbolic links.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/Kconfig              | 6 ++++++
 arch/powerpc/Kconfig      | 3 +++
 scripts/Makefile.autoconf | 2 ++
 3 files changed, 11 insertions(+)

arch/Kconfig +6 -0

index 200588a..c495267 100644
@@ -1,3 +1,6 @@
+config CREATE_ARCH_SYMLINK
+	bool
+
 config HAVE_GENERIC_BOARD
 	bool

@@ -18,6 +21,7 @@ config ARC
 
 config ARM
 	bool "ARM architecture"
+	select CREATE_ARCH_SYMLINK
 	select HAVE_PRIVATE_LIBGCC
 	select HAVE_GENERIC_BOARD
 	select SUPPORT_OF_CONTROL

@@ -83,9 +87,11 @@ config SH
 
 config SPARC
 	bool "SPARC architecture"
+	select CREATE_ARCH_SYMLINK
 
 config X86
 	bool "x86 architecture"
+	select CREATE_ARCH_SYMLINK
 	select HAVE_PRIVATE_LIBGCC
 	select HAVE_GENERIC_BOARD
 	select SYS_GENERIC_BOARD

arch/powerpc/Kconfig +3 -0

index 3b3f446..18451d3 100644
@@ -22,9 +22,11 @@ config MPC8260
 
 config MPC83xx
 	bool "MPC83xx"
+	select CREATE_ARCH_SYMLINK
 
 config MPC85xx
 	bool "MPC85xx"
+	select CREATE_ARCH_SYMLINK
 
 config MPC86xx
 	bool "MPC86xx"

@@ -34,6 +36,7 @@ config 8xx
 
 config 4xx
 	bool "PPC4xx"
+	select CREATE_ARCH_SYMLINK
 
 endchoice

scripts/Makefile.autoconf +2 -0

index f054081..a17e374 100644
@@ -106,6 +106,7 @@ include/config.h: scripts/Makefile.autoconf create_symlink FORCE
 # Otherwise, create a symbolic link to arch/$(ARCH)/include/asm/arch-$(SOC).
 PHONY += create_symlink
 create_symlink:
+ifeq ($(CONFIG_CREATE_ARCH_SYMLINK),y)
 ifneq ($(KBUILD_SRC),)
 	$(Q)mkdir -p include/asm
 	$(Q)if [ -d $(KBUILD_SRC)/arch/$(ARCH)/mach-$(SOC)/include/mach ]; then	\

@@ -122,6 +123,7 @@ else
 	fi;								\
 	ln -fsn $$dest arch/$(ARCH)/include/asm/arch
 endif
+endif
 
 PHONY += FORCE
 FORCE:

Signature · 1 line

1.9.1

Michal Marek

2015-05-26 07:14 UTC #3 lore raw

PATCH 2/2 kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86

Dne 26.5.2015 v 14:32 Masahiro Yamada napsal(a):

Quoted 15 lines

The symbolic link to SoC/CPU specific header directory is created during the build, while it is only necessary for ARM, SPARC, x86, and some CPUs of PowerPC. For the other architectures, it just results in a broken symbolic link.
Introduce CONFIG_CREATE_ARCH_SYMLINK to not create unneeded symbolic links.
Signed-off-by Masahiro Yamada <[email protected]>
---
 arch/Kconfig              | 6 ++++++
 arch/powerpc/Kconfig      | 3 +++
 scripts/Makefile.autoconf | 2 ++
 3 files changed, 11 insertions(+)

[...]

scripts/Makefile.autoconf include/config.h: scripts/Makefile.autoconf create_symlink FORCE · line 109

Quoted 9 lines

scripts/Makefile.autoconf +1 -0

index f054081..a17e374 100644
@@ -106,6 +106,7 @@ include/config.h: scripts/Makefile.autoconf create_symlink FORCE
 # Otherwise, create a symbolic link to arch/$(ARCH)/include/asm/arch-$(SOC).
 PHONY += create_symlink
 create_symlink:
+ifeq ($(CONFIG_CREATE_ARCH_SYMLINK),y)

'ifdef CONFIG_CREATE_ARCH_SYMLINK' is shorter and maybe easier to read.

But you confused me, I thought this was a kernel patch at first :).

Michal

Masahiro Yamada

author

2015-05-26 09:14 UTC #4 lore raw

PATCH 2/2 kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86

Hi Michal (Marek),

2015-05-26 16:14 GMT+09:00 Michal Marek <[email protected]>:

Quoted 17 lines

Dne 26.5.2015 v 14:32 Masahiro Yamada napsal(a):
Quoted 15 lines
The symbolic link to SoC/CPU specific header directory is created during the build, while it is only necessary for ARM, SPARC, x86, and some CPUs of PowerPC. For the other architectures, it just results in a broken symbolic link.
Introduce CONFIG_CREATE_ARCH_SYMLINK to not create unneeded symbolic links.
Signed-off-by Masahiro Yamada <[email protected]>
---
 arch/Kconfig              | 6 ++++++
 arch/powerpc/Kconfig      | 3 +++
 scripts/Makefile.autoconf | 2 ++
 3 files changed, 11 insertions(+)
[...]

Quoted 11 lines

scripts/Makefile.autoconf include/config.h: scripts/Makefile.autoconf create_symlink FORCE · line 109
Quoted 9 lines
scripts/Makefile.autoconf +1 -0
index f054081..a17e374 100644
@@ -106,6 +106,7 @@ include/config.h: scripts/Makefile.autoconf create_symlink FORCE
 # Otherwise, create a symbolic link to arch/$(ARCH)/include/asm/arch-$(SOC).
 PHONY += create_symlink
 create_symlink:
+ifeq ($(CONFIG_CREATE_ARCH_SYMLINK),y)
'ifdef CONFIG_CREATE_ARCH_SYMLINK' is shorter and maybe easier to read.

OK.

Quoted 1 line

But you confused me, I thought this was a kernel patch at first :).

Sorry, it was not intentional.

U-Boot uses Kbuild and often cherry-picks kbuild-updates from Linux. Some of your credits exists in U-boot's git history.

U-Boot also uses scripts/get_maintainer.pl,
this is why you were automatically listed in CC.

I wish I could omit a particular address from the get_maintainer.pl output...

Signature · 2 lines

Best Regards
Masahiro Yamada