Skip to content

Commit 641a6e6

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig
Renesas ARM defconfig updates for v6.9 - Disable obsolete board staging support in the Renesas ARM and ARM V7 multi-platform defconfigs, - Enable support for the Renesas R-Car V4M (R8A779H0) SoC in the ARM64 defconfig. * tag 'renesas-arm-defconfig-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: arm64: defconfig: Enable R8A779H0 SoC ARM: multi_v7_defconfig: Disable board staging ARM: shmobile: defconfig: Disable staging Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9dcb9e5 + 93189f3 commit 641a6e6

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,6 @@ CONFIG_KEYBOARD_NVEC=y
10561056
CONFIG_SERIO_NVEC_PS2=y
10571057
CONFIG_NVEC_POWER=y
10581058
CONFIG_NVEC_PAZ00=y
1059-
CONFIG_STAGING_BOARD=y
10601059
CONFIG_CHROME_PLATFORMS=y
10611060
CONFIG_CROS_EC=m
10621061
CONFIG_CROS_EC_I2C=m

arch/arm/configs/shmobile_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@ CONFIG_DW_DMAC=y
191191
CONFIG_RZN1_DMAMUX=y
192192
CONFIG_RCAR_DMAC=y
193193
CONFIG_RENESAS_USB_DMAC=y
194-
CONFIG_STAGING=y
195-
CONFIG_STAGING_BOARD=y
196194
# CONFIG_IOMMU_SUPPORT is not set
197195
CONFIG_ARCH_EMEV2=y
198196
CONFIG_ARCH_R8A7794=y

arch/arm64/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,6 +1377,7 @@ CONFIG_ARCH_R8A77980=y
13771377
CONFIG_ARCH_R8A77970=y
13781378
CONFIG_ARCH_R8A779A0=y
13791379
CONFIG_ARCH_R8A779G0=y
1380+
CONFIG_ARCH_R8A779H0=y
13801381
CONFIG_ARCH_R8A774C0=y
13811382
CONFIG_ARCH_R8A774E1=y
13821383
CONFIG_ARCH_R8A774A1=y

0 commit comments

Comments
 (0)