Skip to contentSkip to conversation

MIPS: Fix typos in arch/mips/Kbuild.platforms

PATCH Applied Huacai Chen 2 participants 5 messages May 13, 2020 – May 14, 2020 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 MIPS: Fix typos in arch/mips/Kbuild.platforms

Commit 26bff9eb49201aeb ("MIPS: Only include the platform file needed") misspelled "txx9" to "tx99", so fix it.

Fixes 26bff9eb49201aeb ("MIPS: Only include the platform file needed")
---
 arch/mips/Kbuild.platforms | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/Kbuild.platforms +2 -2
index 5e3f6ed..c7368a8 100644
@@ -36,8 +36,8 @@ platform-$(CONFIG_SIBYTE_SB1250)	+= sibyte/
 platform-$(CONFIG_SIBYTE_BCM1x55)	+= sibyte/
 platform-$(CONFIG_SIBYTE_BCM1x80)	+= sibyte/
 platform-$(CONFIG_SNI_RM)		+= sni/
-platform-$(CONFIG_MACH_TX39XX)		+= tx99/
-platform-$(CONFIG_MACH_TX49XX)		+= tx99/
+platform-$(CONFIG_MACH_TX39XX)		+= txx9/
+platform-$(CONFIG_MACH_TX49XX)		+= txx9/
 platform-$(CONFIG_MACH_VR41XX)		+= vr41xx/
 
 # include the platform specific files
Signature · 1 line
2.7.0
#1 lore raw

PATCH 2/2 MIPS: Fix "make clean" error due to recent changes

Commit 26bff9eb49201aeb ("MIPS: Only include the platformfile needed") moves platform-(CONFIG_XYZ) from arch/mips/xyz/Platform to arch/mips/ Kbuild.platforms. This change causes an error when "make clean":

./scripts/Makefile.clean:15: arch/mips/vr41xx/Makefile: No such file or directory make[3]: *** No rule to make target `arch/mips/vr41xx/Makefile'. Stop. make[2]: *** [arch/mips/vr41xx] Error 2
make[1]: *** [_clean_arch/mips] Error 2
make: *** [sub-make] Error 2

Clean-files are defined in arch/mips/Kbuild:

  obj- := $(platform-)

Due to the movement of platform-(CONFIG_XYZ), "make clean" will enter arch/mips/vr41xx/ whether CONFIG_MACH_VR41XX is defined or not. Because there is no Makefile in arch/mips/vr41xx/, "make clean" fails. I don't know what is the best way to fix it, but it seems like we can avoid this error by changing the obj- definition:

  obj- := $(platform-y)
Fixes 26bff9eb49201aeb ("MIPS: Only include the platformfile needed")
---
 arch/mips/Kbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/Kbuild +1 -1
index a8d5e4f..d5d6ef9 100644
@@ -12,7 +12,7 @@ obj-y := $(platform-y)
 
 # make clean traverses $(obj-) without having included .config, so
 # everything ends up here
-obj- := $(platform-)
+obj- := $(platform-y)
 
 # mips object files
 # The object files are linked as core-y files would be linked
Signature · 1 line
2.7.0
maintainer Applied
#2 lore raw
In reply to Huacai Chen
Quoted 8 lines · Huacai Chen

Commit 26bff9eb49201aeb ("MIPS: Only include the platform file needed") misspelled "txx9" to "tx99", so fix it.

Fixes 26bff9eb49201aeb ("MIPS: Only include the platform file needed")
---
 arch/mips/Kbuild.platforms | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

applied both patches to mips-next. Thank you for fixing.

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
#3 lore raw

Hi, Thomas,

Quoted 5 lines · Thomas Bogendoerfer
Quoted 3 lines · Huacai Chen

Commit 26bff9eb49201aeb ("MIPS: Only include the platform file needed") misspelled "txx9" to "tx99", so fix it.

Quoted 7 lines
Quoted 5 lines
Fixes 26bff9eb49201aeb ("MIPS: Only include the platform file needed")
---
 arch/mips/Kbuild.platforms | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

applied both patches to mips-next. Thank you for fixing.

It seems like there are more problems caused by your patch, due to the lack of arch/mips/vr41xx/Makefile, all VR41XX configs cannot be build now, including:
arch/mips/configs/workpad_defconfig arch/mips/configs/tb0219_defconfig arch/mips/configs/tb0287_defconfig arch/mips/configs/tb0226_defconfig arch/mips/configs/mpc30x_defconfig arch/mips/configs/capcella_defconfig arch/mips/configs/e55_defconfig

And I don't know how to fix...

Quoted 6 lines

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]

Huacai

#4 lore raw
Quoted 27 lines · Huacai Chen

Hi, Thomas,

Quoted 5 lines · Thomas Bogendoerfer
Quoted 3 lines · Huacai Chen

Commit 26bff9eb49201aeb ("MIPS: Only include the platform file needed") misspelled "txx9" to "tx99", so fix it.

Quoted 7 lines
Quoted 5 lines
Fixes 26bff9eb49201aeb ("MIPS: Only include the platform file needed")
---
 arch/mips/Kbuild.platforms | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

applied both patches to mips-next. Thank you for fixing.

It seems like there are more problems caused by your patch, due to the lack of arch/mips/vr41xx/Makefile, all VR41XX configs cannot be build now, including:
arch/mips/configs/workpad_defconfig arch/mips/configs/tb0219_defconfig arch/mips/configs/tb0287_defconfig arch/mips/configs/tb0226_defconfig arch/mips/configs/mpc30x_defconfig arch/mips/configs/capcella_defconfig arch/mips/configs/e55_defconfig

Quoted 1 line

And I don't know how to fix...

adding a Makefile solves it ;-) I've sent a patch for that.

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]