[PATCH 1/2] MIPS: Kconfig: Set default MIPS system type as generic

[PATCH 1/2] MIPS: Kconfig: Set default MIPS system type as generic

[Matt Redfearn]

The generic MIPS system type allows building a board agnostic kernel and
should be the default starting point for users, so set it as the default
system type in Kconfig.
Since ip22 is no longer the default, update ip22_defconfig to select
CONFIG_SGI_IP22.

Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>

---

This patch "fixes" the build errors reported by kernelci.org for the
allnoconfig, generic_defconfig and tinyconfig targets.

There is another workaround for the actual build failure in patchwork
here https://patchwork.linux-mips.org/patch/14397/, but since that patch
just works around a toolchain bug it is not ideal either. Since
toolchains that produce failures here are out in the wild, banning
binutils 2.25 & 2.26 doesn't seem helpful as that will just trigger more
problems.

So perhaps the best thing to do is to update the default system to
something which does not suffer the issue and is additionally more modern
and actively maintained.

---
 arch/mips/Kconfig                | 2 +-
 arch/mips/configs/ip22_defconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b3c5bde43d34..005085e75a66 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -71,7 +71,7 @@ menu "Machine selection"
 
 choice
 	prompt "System type"
-	default SGI_IP22
+	default MIPS_GENERIC
 
 config MIPS_GENERIC
 	bool "Generic board-agnostic MIPS kernel"
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 5d83ff755547..4b9e759d8b87 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,3 +1,4 @@
+CONFIG_SGI_IP22=y
 CONFIG_ARC_CONSOLE=y
 CONFIG_CPU_R5000=y
 CONFIG_NO_HZ=y
-- 
2.7.4

[PATCH 2/2] MIPS: Set defconfig target to a generic system for 32r2el

[Matt Redfearn]

The default system type should be a MIPS generic kernel. In order to
include some level of board support, select a 32r2el generic defconfig
by default. The alternative would be to use "generic_defconfig" but
rather unintuitvely that is a bare bones configuration with no platform
support so is not usable in practice.

Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
---

 arch/mips/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 1a6bac7b076f..51b0e7479f99 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -15,7 +15,7 @@
 archscripts: scripts_basic
 	$(Q)$(MAKE) $(build)=arch/mips/boot/tools relocs
 
-KBUILD_DEFCONFIG := ip22_defconfig
+KBUILD_DEFCONFIG := 32r2el_defconfig
 
 #
 # Select the object file format to substitute into the linker script.
-- 
2.7.4

Re: [1/2] MIPS: Kconfig: Set default MIPS system type as generic

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 1994 bytes --]

On Wed, Dec 14, 2016 at 03:09:42PM +0000, Matt Redfearn wrote:
> The generic MIPS system type allows building a board agnostic kernel and
> should be the default starting point for users, so set it as the default
> system type in Kconfig.
> Since ip22 is no longer the default, update ip22_defconfig to select
> CONFIG_SGI_IP22.
> 
> Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>

Thanks, both patches applied for 4.15.

Cheers
James

> ---
> 
> This patch "fixes" the build errors reported by kernelci.org for the
> allnoconfig, generic_defconfig and tinyconfig targets.
> 
> There is another workaround for the actual build failure in patchwork
> here https://patchwork.linux-mips.org/patch/14397/, but since that patch
> just works around a toolchain bug it is not ideal either. Since
> toolchains that produce failures here are out in the wild, banning
> binutils 2.25 & 2.26 doesn't seem helpful as that will just trigger more
> problems.
> 
> So perhaps the best thing to do is to update the default system to
> something which does not suffer the issue and is additionally more modern
> and actively maintained.
> 
> ---
>  arch/mips/Kconfig                | 2 +-
>  arch/mips/configs/ip22_defconfig | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index b3c5bde43d34..005085e75a66 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -71,7 +71,7 @@ menu "Machine selection"
>  
>  choice
>  	prompt "System type"
> -	default SGI_IP22
> +	default MIPS_GENERIC
>  
>  config MIPS_GENERIC
>  	bool "Generic board-agnostic MIPS kernel"
> diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
> index 5d83ff755547..4b9e759d8b87 100644
> --- a/arch/mips/configs/ip22_defconfig
> +++ b/arch/mips/configs/ip22_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_SGI_IP22=y
>  CONFIG_ARC_CONSOLE=y
>  CONFIG_CPU_R5000=y
>  CONFIG_NO_HZ=y

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]