* [U-Boot] [PATCH 0/2] @ 2015-05-26 6:32 Masahiro Yamada 2015-05-26 6:32 ` [U-Boot] [PATCH 1/2] nds32: include <asm/arch-*/*.h> instead of <asm/arch/*.h> Masahiro Yamada 2015-05-26 6:32 ` [U-Boot] [PATCH 2/2] kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86 Masahiro Yamada 0 siblings, 2 replies; 5+ messages in thread From: Masahiro Yamada @ 2015-05-26 6:32 UTC (permalink / raw) To: u-boot 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(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 1/2] nds32: include <asm/arch-*/*.h> instead of <asm/arch/*.h> 2015-05-26 6:32 [U-Boot] [PATCH 0/2] Masahiro Yamada @ 2015-05-26 6:32 ` Masahiro Yamada 2015-05-26 6:32 ` [U-Boot] [PATCH 2/2] kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86 Masahiro Yamada 1 sibling, 0 replies; 5+ messages in thread From: Masahiro Yamada @ 2015-05-26 6:32 UTC (permalink / raw) To: u-boot 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 <yamada.masahiro@socionext.com> --- 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(-) diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h index e318c75..f70ee10 100644 --- a/include/configs/adp-ag101.h +++ b/include/configs/adp-ag101.h @@ -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 diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 24904b0..60a5038 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -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 diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h index 39f7a3c..ffd5d33 100644 --- a/include/configs/adp-ag102.h +++ b/include/configs/adp-ag102.h @@ -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 -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 2/2] kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86 2015-05-26 6:32 [U-Boot] [PATCH 0/2] Masahiro Yamada 2015-05-26 6:32 ` [U-Boot] [PATCH 1/2] nds32: include <asm/arch-*/*.h> instead of <asm/arch/*.h> Masahiro Yamada @ 2015-05-26 6:32 ` Masahiro Yamada 2015-05-26 7:14 ` Michal Marek 1 sibling, 1 reply; 5+ messages in thread From: Masahiro Yamada @ 2015-05-26 6:32 UTC (permalink / raw) To: u-boot 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 <yamada.masahiro@socionext.com> --- arch/Kconfig | 6 ++++++ arch/powerpc/Kconfig | 3 +++ scripts/Makefile.autoconf | 2 ++ 3 files changed, 11 insertions(+) diff --git a/arch/Kconfig b/arch/Kconfig index 200588a..c495267 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -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 diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 3b3f446..18451d3 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -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 diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index f054081..a17e374 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -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: -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 2/2] kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86 2015-05-26 6:32 ` [U-Boot] [PATCH 2/2] kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86 Masahiro Yamada @ 2015-05-26 7:14 ` Michal Marek 2015-05-26 9:14 ` Masahiro Yamada 0 siblings, 1 reply; 5+ messages in thread From: Michal Marek @ 2015-05-26 7:14 UTC (permalink / raw) To: u-boot Dne 26.5.2015 v 14:32 Masahiro Yamada napsal(a): > 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 <yamada.masahiro@socionext.com> > --- > > arch/Kconfig | 6 ++++++ > arch/powerpc/Kconfig | 3 +++ > scripts/Makefile.autoconf | 2 ++ > 3 files changed, 11 insertions(+) [...] > diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf > index f054081..a17e374 100644 > --- a/scripts/Makefile.autoconf > +++ b/scripts/Makefile.autoconf > @@ -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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 2/2] kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86 2015-05-26 7:14 ` Michal Marek @ 2015-05-26 9:14 ` Masahiro Yamada 0 siblings, 0 replies; 5+ messages in thread From: Masahiro Yamada @ 2015-05-26 9:14 UTC (permalink / raw) To: u-boot Hi Michal (Marek), 2015-05-26 16:14 GMT+09:00 Michal Marek <mmarek@suse.cz>: > Dne 26.5.2015 v 14:32 Masahiro Yamada napsal(a): >> 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 <yamada.masahiro@socionext.com> >> --- >> >> arch/Kconfig | 6 ++++++ >> arch/powerpc/Kconfig | 3 +++ >> scripts/Makefile.autoconf | 2 ++ >> 3 files changed, 11 insertions(+) > [...] >> diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf >> index f054081..a17e374 100644 >> --- a/scripts/Makefile.autoconf >> +++ b/scripts/Makefile.autoconf >> @@ -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. > 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... -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-26 9:14 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-05-26 6:32 [U-Boot] [PATCH 0/2] Masahiro Yamada 2015-05-26 6:32 ` [U-Boot] [PATCH 1/2] nds32: include <asm/arch-*/*.h> instead of <asm/arch/*.h> Masahiro Yamada 2015-05-26 6:32 ` [U-Boot] [PATCH 2/2] kbuild: create symbolic link only for ARM, SPARC, PowerPC, x86 Masahiro Yamada 2015-05-26 7:14 ` Michal Marek 2015-05-26 9:14 ` Masahiro Yamada
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox