Unverified Commit e6949527 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.15/soc-late-signed' of... 

Merge tag 'omap-for-v5.15/soc-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

Two missed SoC changes for omaps for v5.15

I managed to miss applying two out of three Kconfig changes earlier
to drop unused entries, here are the missed changes.

* tag 'omap-for-v5.15/soc-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm: omap2: Drop the unused OMAP_PACKAGE_* KConfig entries
  arm: omap2: Drop obsolete MACH_OMAP3_PANDORA entry

Link: https://lore.kernel.org/r/pull-1628751694-126144@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4108b6cc 4297d1c0

arch/arm/mach-omap2/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -181,18 +181,6 @@ config SOC_TI81XX 
	depends on ARCH_OMAP3

	default y



config OMAP_PACKAGE_CBC

       bool



config OMAP_PACKAGE_CBB

       bool



config OMAP_PACKAGE_CUS

       bool



config OMAP_PACKAGE_CBP

       bool



comment "OMAP Legacy Platform Data Board Type"

	depends on ARCH_OMAP2PLUS
@@ -204,12 +192,6 @@ config MACH_OMAP2_TUSB6010 
	depends on ARCH_OMAP2 && SOC_OMAP2420

	default y if MACH_NOKIA_N8X0



config MACH_OMAP3_PANDORA

	bool "OMAP3 Pandora"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB



config MACH_NOKIA_N810

       bool