tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sh: fix defconfigs for sh7751r boards

This patch fixes up the defconfig for various sh7751r based boards
by updating them to the single cpu subtype CONFIG_CPU_SUBTYPE_SH7751R.
The following sh4 boards are updated: hs7751rvoip, landisk, lboxre2,
systemh, titan.

The current defconfigs with two subtypes defined trigger a configuration
bug which result in kernel configurations with missing board support
code. We end up with kernels without board code and with generic machvec
only.

So we need this patch to make sure the board code gets compiled in.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

authored by Magnus Damm and committed by Paul Mundt cc6f33db 5ca95c48

+5 -5
unified split
+1 -1
arch/sh/configs/hs7751rvoip_defconfig
··· 145 # CONFIG_CPU_SUBTYPE_SH7091 is not set 146 # CONFIG_CPU_SUBTYPE_SH7750R is not set 147 # CONFIG_CPU_SUBTYPE_SH7750S is not set 148 - CONFIG_CPU_SUBTYPE_SH7751=y 149 CONFIG_CPU_SUBTYPE_SH7751R=y 150 # CONFIG_CPU_SUBTYPE_SH7760 is not set 151 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
··· 145 # CONFIG_CPU_SUBTYPE_SH7091 is not set 146 # CONFIG_CPU_SUBTYPE_SH7750R is not set 147 # CONFIG_CPU_SUBTYPE_SH7750S is not set 148 + # CONFIG_CPU_SUBTYPE_SH7751 is not set 149 CONFIG_CPU_SUBTYPE_SH7751R=y 150 # CONFIG_CPU_SUBTYPE_SH7760 is not set 151 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
+1 -1
arch/sh/configs/landisk_defconfig
··· 156 # CONFIG_CPU_SUBTYPE_SH7091 is not set 157 # CONFIG_CPU_SUBTYPE_SH7750R is not set 158 # CONFIG_CPU_SUBTYPE_SH7750S is not set 159 - CONFIG_CPU_SUBTYPE_SH7751=y 160 CONFIG_CPU_SUBTYPE_SH7751R=y 161 # CONFIG_CPU_SUBTYPE_SH7760 is not set 162 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
··· 156 # CONFIG_CPU_SUBTYPE_SH7091 is not set 157 # CONFIG_CPU_SUBTYPE_SH7750R is not set 158 # CONFIG_CPU_SUBTYPE_SH7750S is not set 159 + # CONFIG_CPU_SUBTYPE_SH7751 is not set 160 CONFIG_CPU_SUBTYPE_SH7751R=y 161 # CONFIG_CPU_SUBTYPE_SH7760 is not set 162 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
+1 -1
arch/sh/configs/lboxre2_defconfig
··· 159 # CONFIG_CPU_SUBTYPE_SH7091 is not set 160 # CONFIG_CPU_SUBTYPE_SH7750R is not set 161 # CONFIG_CPU_SUBTYPE_SH7750S is not set 162 - CONFIG_CPU_SUBTYPE_SH7751=y 163 CONFIG_CPU_SUBTYPE_SH7751R=y 164 # CONFIG_CPU_SUBTYPE_SH7760 is not set 165 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
··· 159 # CONFIG_CPU_SUBTYPE_SH7091 is not set 160 # CONFIG_CPU_SUBTYPE_SH7750R is not set 161 # CONFIG_CPU_SUBTYPE_SH7750S is not set 162 + # CONFIG_CPU_SUBTYPE_SH7751 is not set 163 CONFIG_CPU_SUBTYPE_SH7751R=y 164 # CONFIG_CPU_SUBTYPE_SH7760 is not set 165 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
+1 -1
arch/sh/configs/systemh_defconfig
··· 141 # CONFIG_CPU_SUBTYPE_SH7091 is not set 142 # CONFIG_CPU_SUBTYPE_SH7750R is not set 143 # CONFIG_CPU_SUBTYPE_SH7750S is not set 144 - CONFIG_CPU_SUBTYPE_SH7751=y 145 CONFIG_CPU_SUBTYPE_SH7751R=y 146 # CONFIG_CPU_SUBTYPE_SH7760 is not set 147 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
··· 141 # CONFIG_CPU_SUBTYPE_SH7091 is not set 142 # CONFIG_CPU_SUBTYPE_SH7750R is not set 143 # CONFIG_CPU_SUBTYPE_SH7750S is not set 144 + # CONFIG_CPU_SUBTYPE_SH7751 is not set 145 CONFIG_CPU_SUBTYPE_SH7751R=y 146 # CONFIG_CPU_SUBTYPE_SH7760 is not set 147 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
+1 -1
arch/sh/configs/titan_defconfig
··· 147 # CONFIG_CPU_SUBTYPE_SH7091 is not set 148 # CONFIG_CPU_SUBTYPE_SH7750R is not set 149 # CONFIG_CPU_SUBTYPE_SH7750S is not set 150 - CONFIG_CPU_SUBTYPE_SH7751=y 151 CONFIG_CPU_SUBTYPE_SH7751R=y 152 # CONFIG_CPU_SUBTYPE_SH7760 is not set 153 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
··· 147 # CONFIG_CPU_SUBTYPE_SH7091 is not set 148 # CONFIG_CPU_SUBTYPE_SH7750R is not set 149 # CONFIG_CPU_SUBTYPE_SH7750S is not set 150 + # CONFIG_CPU_SUBTYPE_SH7751 is not set 151 CONFIG_CPU_SUBTYPE_SH7751R=y 152 # CONFIG_CPU_SUBTYPE_SH7760 is not set 153 # CONFIG_CPU_SUBTYPE_SH4_202 is not set