csky: remove unused $(dtb-y) from arch/csky/boot/Makefile
PATCH 1/4 csky: remove unused $(dtb-y) from arch/csky/boot/Makefile
arch/csky/boot/Makefile does not build DTB.arch/csky/boot/dts/Makefile does.
---
arch/csky/boot/Makefile | 1 - 1 file changed, 1 deletion(-)
arch/csky/boot/Makefile +0 -1
@@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only targets := Image zImage uImage -targets += $(dtb-y) $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy)
Signature · 1 line
2.32.0
PATCH 2/4 csky: do not add dts/ to core-y
This line was used for embedding a DT into vmlinux.
Since commit c4c14c3bd177 ("csky: remove builtin-dtb Kbuild"), DT for csky is just a separate blob.
It is covered by the generic rule in the top Makefile:
ifdef CONFIG_OF_EARLY_FLATTREE
all: dtbs
endif
---
arch/csky/Makefile | 1 - 1 file changed, 1 deletion(-)
arch/csky/Makefile +0 -1
@@ -69,7 +69,6 @@ libs-y += arch/csky/lib/ \ $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name) boot := arch/csky/boot -core-y += $(boot)/dts/ all: zImage
Signature · 1 line
2.32.0
Guo Ren
maintainerRe: [PATCH 2/4] csky: do not add dts/ to core-y
Thx, approved.
Quoted 31 lines · Masahiro Yamada
This line was used for embedding a DT into vmlinux.
Since commit
c4c14c3bd177("csky: remove builtin-dtbKbuild"), DT for csky is just a separate blob.It is covered by the generic rule in the top
Makefile:ifdef
CONFIG_OF_EARLY_FLATTREE
all: dtbs
endifSigned-off-by Masahiro Yamada <[email protected]>---
arch/csky/Makefile | 1 - 1 file changed, 1 deletion(-)arch/csky/Makefile +0
-2@@ -69,7 +69,6 @@ libs-y += arch/csky/lib/ \ $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name) boot := arch/csky/boot -core-y += $(boot)/dts/ all: zImage --
Quoted 2 lines
2.32.0
--
Best Regards
Guo Ren
PATCH 3/4 csky: introduce CONFIG_CSKY_ABI_V1/2
In reply to Masahiro YamadaThis is useful to clean up Makefile.
---
arch/csky/Kconfig | 11 +++++++++++ arch/csky/Makefile | 14 ++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-)
arch/csky/Kconfig +11 -0
@@ -161,6 +161,12 @@ config ARCH_MMAP_RND_BITS_MIN config ARCH_MMAP_RND_BITS_MAX default 17 +config CSKY_ABI_V1 + bool + +config CSKY_ABI_V2 + bool + menu "Processor type and features" choice
@@ -172,15 +178,18 @@ config CPU_CK610 select CPU_NEED_TLBSYNC select CPU_NEED_SOFTALIGN select CPU_NO_USER_BKPT + select CSKY_ABI_V1 config CPU_CK810 bool "CSKY CPU ck810" select CPU_HAS_HILO select CPU_NEED_TLBSYNC + select CSKY_ABI_V2 config CPU_CK807 bool "CSKY CPU ck807" select CPU_HAS_HILO + select CSKY_ABI_V2 config CPU_CK860 bool "CSKY CPU ck860"
@@ -188,6 +197,8 @@ config CPU_CK860 select CPU_HAS_CACHEV2 select CPU_HAS_LDSTEX select CPU_HAS_FPUV2 + select CSKY_ABI_V2 + endchoice choice
arch/csky/Makefile +8 -6
@@ -16,34 +16,36 @@ endif ifdef CONFIG_CPU_CK610 CPUTYPE = ck610 -CSKYABI = abiv1 endif ifdef CONFIG_CPU_CK810 CPUTYPE = ck810 -CSKYABI = abiv2 endif ifdef CONFIG_CPU_CK807 CPUTYPE = ck807 -CSKYABI = abiv2 endif ifdef CONFIG_CPU_CK860 CPUTYPE = ck860 +endif + +ifdef CONFIG_CSKY_ABI_V1 +CSKYABI = abiv1 +endif + +ifdef CONFIG_CSKY_ABI_V2 CSKYABI = abiv2 endif -ifneq ($(CSKYABI),) MCPU_STR = $(CPUTYPE)$(FPUEXT)$(VDSPEXT)$(TEEEXT) KBUILD_CFLAGS += -mcpu=$(CPUTYPE) -Wa,-mcpu=$(MCPU_STR) KBUILD_CFLAGS += -DCSKYCPU_DEF_NAME=\"$(MCPU_STR)\" KBUILD_CFLAGS += -msoft-float -mdiv KBUILD_CFLAGS += -fno-tree-vectorize -endif KBUILD_CFLAGS += -pipe -ifeq ($(CSKYABI),abiv2) +ifdef CONFIG_CSKY_ABI_V2 KBUILD_CFLAGS += -mno-stack-size endif
Signature · 1 line
2.32.0
Guo Ren
maintainerRe: [PATCH 3/4] csky: introduce CONFIG_CSKY_ABI_V1/2
Quoted 76 lines · Masahiro Yamada
This is useful to clean up
Makefile.Signed-off-by Masahiro Yamada <[email protected]>---
arch/csky/Kconfig | 11 +++++++++++ arch/csky/Makefile | 14 ++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-)arch/csky/Kconfig +11
-0@@ -161,6 +161,12 @@ config ARCH_MMAP_RND_BITS_MIN config ARCH_MMAP_RND_BITS_MAX default 17 +config CSKY_ABI_V1 + bool + +config CSKY_ABI_V2 + bool + menu "Processor type and features" choice@@ -172,15 +178,18 @@ config CPU_CK610 select CPU_NEED_TLBSYNC select CPU_NEED_SOFTALIGN select CPU_NO_USER_BKPT + select CSKY_ABI_V1 config CPU_CK810 bool "CSKY CPU ck810" select CPU_HAS_HILO select CPU_NEED_TLBSYNC + select CSKY_ABI_V2 config CPU_CK807 bool "CSKY CPU ck807" select CPU_HAS_HILO + select CSKY_ABI_V2 config CPU_CK860 bool "CSKY CPU ck860"@@ -188,6 +197,8 @@ config CPU_CK860 select CPU_HAS_CACHEV2 select CPU_HAS_LDSTEX select CPU_HAS_FPUV2 + select CSKY_ABI_V2 + endchoice choicearch/csky/Makefile +0
-3@@ -16,34 +16,36 @@ endif ifdef CONFIG_CPU_CK610 CPUTYPE = ck610 -CSKYABI = abiv1 endif ifdef CONFIG_CPU_CK810 CPUTYPE = ck810 -CSKYABI = abiv2 endif ifdef CONFIG_CPU_CK807 CPUTYPE = ck807 -CSKYABI = abiv2 endif
arch/csky/Makefile endif · line 38
Quoted 10 lines
arch/csky/Makefile +7
-0ifdef CONFIG_CPU_CK860 CPUTYPE = ck860 +endif + +ifdef CONFIG_CSKY_ABI_V1 +CSKYABI = abiv1 +endif + +ifdef CONFIG_CSKY_ABI_V2 CSKYABI = abiv2
We still need CSKYABI, so I don't think adding CONFIG_CSKY_ABI_V2 is necessary. And ck807 & ck860 have different ABI.
Quoted 19 lines
arch/csky/Makefile +1
-4endif -ifneq ($(CSKYABI),) MCPU_STR = $(CPUTYPE)$(FPUEXT)$(VDSPEXT)$(TEEEXT) KBUILD_CFLAGS += -mcpu=$(CPUTYPE) -Wa,-mcpu=$(MCPU_STR) KBUILD_CFLAGS += -DCSKYCPU_DEF_NAME=\"$(MCPU_STR)\" KBUILD_CFLAGS += -msoft-float -mdiv KBUILD_CFLAGS += -fno-tree-vectorize -endif KBUILD_CFLAGS += -pipe -ifeq ($(CSKYABI),abiv2) +ifdef CONFIG_CSKY_ABI_V2 KBUILD_CFLAGS += -mno-stack-size endif --2.32.0
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Re: [PATCH 3/4] csky: introduce CONFIG_CSKY_ABI_V1/2
Quoted 78 lines · Guo Ren
Quoted 76 lines · Masahiro Yamada
This is useful to clean up
Makefile.Signed-off-by Masahiro Yamada <[email protected]>---
arch/csky/Kconfig | 11 +++++++++++ arch/csky/Makefile | 14 ++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-)arch/csky/Kconfig +11
-0@@ -161,6 +161,12 @@ config ARCH_MMAP_RND_BITS_MIN config ARCH_MMAP_RND_BITS_MAX default 17 +config CSKY_ABI_V1 + bool + +config CSKY_ABI_V2 + bool + menu "Processor type and features" choice@@ -172,15 +178,18 @@ config CPU_CK610 select CPU_NEED_TLBSYNC select CPU_NEED_SOFTALIGN select CPU_NO_USER_BKPT + select CSKY_ABI_V1 config CPU_CK810 bool "CSKY CPU ck810" select CPU_HAS_HILO select CPU_NEED_TLBSYNC + select CSKY_ABI_V2 config CPU_CK807 bool "CSKY CPU ck807" select CPU_HAS_HILO + select CSKY_ABI_V2 config CPU_CK860 bool "CSKY CPU ck860"@@ -188,6 +197,8 @@ config CPU_CK860 select CPU_HAS_CACHEV2 select CPU_HAS_LDSTEX select CPU_HAS_FPUV2 + select CSKY_ABI_V2 + endchoice choicearch/csky/Makefile +0
-3@@ -16,34 +16,36 @@ endif ifdef CONFIG_CPU_CK610 CPUTYPE = ck610 -CSKYABI = abiv1 endif ifdef CONFIG_CPU_CK810 CPUTYPE = ck810 -CSKYABI = abiv2 endif ifdef CONFIG_CPU_CK807 CPUTYPE = ck807 -CSKYABI = abiv2 endif
Quoted 12 lines
arch/csky/Makefile endif · line 38
Quoted 10 lines
arch/csky/Makefile +7
-0ifdef CONFIG_CPU_CK860 CPUTYPE = ck860 +endif + +ifdef CONFIG_CSKY_ABI_V1 +CSKYABI = abiv1 +endif + +ifdef CONFIG_CSKY_ABI_V2 CSKYABI = abiv2We still need CSKYABI, so I don't think adding
CONFIG_CSKY_ABI_V2is necessary. And ck807 & ck860 have different ABI.
My main motivation is 4/4.
I want to use the standard Kbuild syntax in arch/csky/Kbuild.
obj-$(CONFIG_ ...) += abiv1/
obj-$(CONFIG_ ...) += abiv2/
Quoted 27 lines
Quoted 18 lines
arch/csky/Makefile +1
-4endif -ifneq ($(CSKYABI),) MCPU_STR = $(CPUTYPE)$(FPUEXT)$(VDSPEXT)$(TEEEXT) KBUILD_CFLAGS += -mcpu=$(CPUTYPE) -Wa,-mcpu=$(MCPU_STR) KBUILD_CFLAGS += -DCSKYCPU_DEF_NAME=\"$(MCPU_STR)\" KBUILD_CFLAGS += -msoft-float -mdiv KBUILD_CFLAGS += -fno-tree-vectorize -endif KBUILD_CFLAGS += -pipe -ifeq ($(CSKYABI),abiv2) +ifdef CONFIG_CSKY_ABI_V2 KBUILD_CFLAGS += -mno-stack-size endif --Quoted 2 lines
2.32.0
--
Best Regards
Guo Ren
Signature · 2 lines
Best Regards Masahiro Yamada
Guo Ren
maintainerRe: [PATCH 3/4] csky: introduce CONFIG_CSKY_ABI_V1/2
commit 64d83f06774668081258bd7f3241267239bb9ab2 (HEAD -> linux-next, origin/linux-next)
Author: Masahiro Yamada <[email protected]> Date: Thu May 12 12:59:02 2022 +0900
csky: Move $(core-y) into arch/csky/Kbuild
Use the standard obj-y form to specify the sub-directories under arch/csky/. Only leave core-y += arch/csky/$(CSKYABI)/ there.
arch/csky/Kbuild +2 -0
@@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += kernel/ mm/ + # for cleaning subdir- += boot
arch/csky/Makefile +0 -2
@@ -61,8 +61,6 @@ KBUILD_AFLAGS += $(KBUILD_CFLAGS) head-y := arch/csky/kernel/head.o -core-y += arch/csky/kernel/ -core-y += arch/csky/mm/ core-y += arch/csky/$(CSKYABI)/ libs-y += arch/csky/lib/ \
Quoted 136 lines · Masahiro Yamada
Quoted 78 lines · Guo Ren
Quoted 76 lines · Masahiro Yamada
This is useful to clean up
Makefile.Signed-off-by Masahiro Yamada <[email protected]>---
arch/csky/Kconfig | 11 +++++++++++ arch/csky/Makefile | 14 ++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-)arch/csky/Kconfig +11
-0@@ -161,6 +161,12 @@ config ARCH_MMAP_RND_BITS_MIN config ARCH_MMAP_RND_BITS_MAX default 17 +config CSKY_ABI_V1 + bool + +config CSKY_ABI_V2 + bool + menu "Processor type and features" choice@@ -172,15 +178,18 @@ config CPU_CK610 select CPU_NEED_TLBSYNC select CPU_NEED_SOFTALIGN select CPU_NO_USER_BKPT + select CSKY_ABI_V1 config CPU_CK810 bool "CSKY CPU ck810" select CPU_HAS_HILO select CPU_NEED_TLBSYNC + select CSKY_ABI_V2 config CPU_CK807 bool "CSKY CPU ck807" select CPU_HAS_HILO + select CSKY_ABI_V2 config CPU_CK860 bool "CSKY CPU ck860"@@ -188,6 +197,8 @@ config CPU_CK860 select CPU_HAS_CACHEV2 select CPU_HAS_LDSTEX select CPU_HAS_FPUV2 + select CSKY_ABI_V2 + endchoice choicearch/csky/Makefile +0
-3@@ -16,34 +16,36 @@ endif ifdef CONFIG_CPU_CK610 CPUTYPE = ck610 -CSKYABI = abiv1 endif ifdef CONFIG_CPU_CK810 CPUTYPE = ck810 -CSKYABI = abiv2 endif ifdef CONFIG_CPU_CK807 CPUTYPE = ck807 -CSKYABI = abiv2 endifQuoted 12 lines
arch/csky/Makefile endif · line 38
Quoted 10 lines
arch/csky/Makefile +7
-0ifdef CONFIG_CPU_CK860 CPUTYPE = ck860 +endif + +ifdef CONFIG_CSKY_ABI_V1 +CSKYABI = abiv1 +endif + +ifdef CONFIG_CSKY_ABI_V2 CSKYABI = abiv2We still need CSKYABI, so I don't think adding
CONFIG_CSKY_ABI_V2is necessary. And ck807 & ck860 have different ABI.My main motivation is 4/4.
I want to use the standard
Kbuildsyntax inarch/csky/Kbuild.obj-$(CONFIG_ ...) += abiv1/
obj-$(CONFIG_ ...) += abiv2/Quoted 26 lines
Quoted 18 lines
arch/csky/Makefile +1
-4endif -ifneq ($(CSKYABI),) MCPU_STR = $(CPUTYPE)$(FPUEXT)$(VDSPEXT)$(TEEEXT) KBUILD_CFLAGS += -mcpu=$(CPUTYPE) -Wa,-mcpu=$(MCPU_STR) KBUILD_CFLAGS += -DCSKYCPU_DEF_NAME=\"$(MCPU_STR)\" KBUILD_CFLAGS += -msoft-float -mdiv KBUILD_CFLAGS += -fno-tree-vectorize -endif KBUILD_CFLAGS += -pipe -ifeq ($(CSKYABI),abiv2) +ifdef CONFIG_CSKY_ABI_V2 KBUILD_CFLAGS += -mno-stack-size endif --Quoted 2 lines
2.32.0
--
Best Regards
Guo RenQuoted 1 line
--
Best Regards
Masahiro Yamada
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
PATCH 4/4 cskly: move $(core-y) into arch/csky/Kbuild
In reply to Masahiro YamadaUse the standard obj-y form to specify the sub-directories under arch/csky/. No functional change intended.
---
arch/csky/Kbuild | 4 ++++ arch/csky/Makefile | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/csky/Kbuild +4 -0
@@ -1,4 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += kernel/ mm/ +obj-$(CONFIG_CPU_ABI_V1) += abiv1/ +obj-$(CONFIG_CPU_ABI_V2) += abiv2/ + # for cleaning subdir- += boot
arch/csky/Makefile +0 -4
@@ -63,10 +63,6 @@ KBUILD_AFLAGS += $(KBUILD_CFLAGS) head-y := arch/csky/kernel/head.o -core-y += arch/csky/kernel/ -core-y += arch/csky/mm/ -core-y += arch/csky/$(CSKYABI)/ - libs-y += arch/csky/lib/ \ $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)
Signature · 1 line
2.32.0
Re: [PATCH 4/4] cskly: move $(core-y) into arch/csky/Kbuild
Quoted 6 lines · Masahiro Yamada
Use the standard obj-y form to specify the sub-directories under
arch/csky/. No functional change intended.Signed-off-by Masahiro Yamada <[email protected]>---
I am not sending v2 just for typo "cskly:"
I hope the maintainer can fix it.
Quoted 35 lines
arch/csky/Kbuild | 4 ++++ arch/csky/Makefile | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)arch/csky/Kbuild +4
-0@@ -1,4 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += kernel/ mm/ +obj-$(CONFIG_CPU_ABI_V1) += abiv1/ +obj-$(CONFIG_CPU_ABI_V2) += abiv2/ + # for cleaning subdir- += bootarch/csky/Makefile +0
-5@@ -63,10 +63,6 @@ KBUILD_AFLAGS += $(KBUILD_CFLAGS) head-y := arch/csky/kernel/head.o -core-y += arch/csky/kernel/ -core-y += arch/csky/mm/ -core-y += arch/csky/$(CSKYABI)/ - libs-y += arch/csky/lib/ \ $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name) --2.32.0
Signature · 2 lines
Best Regards Masahiro Yamada
Guo Ren
maintainerRe: [PATCH 4/4] cskly: move $(core-y) into arch/csky/Kbuild
Quoted 6 lines · Masahiro Yamada
Quoted 4 lines · Masahiro Yamada
Use the standard obj-y form to specify the sub-directories under
arch/csky/. No functional change intended.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Masahiro Yamada <[email protected]>---
I am not sending v2 just for typo "cskly:"
I hope the maintainer can fix it.
Okay.
Quoted 44 lines
Quoted 37 lines
arch/csky/Kbuild | 4 ++++ arch/csky/Makefile | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)arch/csky/Kbuild +4
-0@@ -1,4 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += kernel/ mm/ +obj-$(CONFIG_CPU_ABI_V1) += abiv1/ +obj-$(CONFIG_CPU_ABI_V2) += abiv2/ + # for cleaning subdir- += bootarch/csky/Makefile +0
-5@@ -63,10 +63,6 @@ KBUILD_AFLAGS += $(KBUILD_CFLAGS) head-y := arch/csky/kernel/head.o -core-y += arch/csky/kernel/ -core-y += arch/csky/mm/ -core-y += arch/csky/$(CSKYABI)/ - libs-y += arch/csky/lib/ \ $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name) --Quoted 2 lines
2.32.0
--
Best Regards
Masahiro Yamada
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Guo Ren
maintainerThx, approved.
Quoted 24 lines · Masahiro Yamada
arch/csky/boot/Makefiledoes not build DTB.arch/csky/boot/dts/Makefiledoes.Signed-off-by Masahiro Yamada <[email protected]>---
arch/csky/boot/Makefile | 1 - 1 file changed, 1 deletion(-)arch/csky/boot/Makefile +0
-2@@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only targets := Image zImage uImage -targets += $(dtb-y) $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) --2.32.0
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/