BCM changes for 3.13/soc. A number of cleanup related changes.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJScKOTAAoJEPYb7NoJr+nL+fwP/1bZKlbqYURXdrjLxHTZGKp3 WBpo8KUYp80nAZpw1SLoOk/78ciulQ0VLifWMebzMd/1qXXnek71jfYusbSb7MeM e70y9TRtXrfkDPxL12XTXIf6F7JieGtVx0S2jJsGsofmM0w6b723KwZAYZgxACYB Ec7TSzwaTlBBCI+ZyouS8e4CkS0x/0Mpkj8Ym8FDhKnwTs/mtD9kOcgVBzfz0Bt8 ExtiAsASeDvxUq5zskOiGiEhaNlhbQHd8etLIHEBTRreYQRg8nWTI+fdKKqwHKi0 qHm7p/ZcVQUgqf/2EjEfbEa0sQrQKrH82oaJirY3A6QrIEVQ5OVZCThkcvVV5Bxo w1jDJcxYl2PEM/awR1YkRT3KQKb13J2PxbLFTYnKyhKgZz4mvB/NnjI1AuskTiS8 ddYfJ5apOqtZBqIYQvM6fv69mSWNinhmOqze14ulxGn+U6CVEYsGcQY1QvgA7T+c 0JAAUJwgRsJ+jIDjzx4EJFYCEpdRY8NAKNnZmPr8maP7DIttsbZd0KjWTTqg1Y1N RHJkxJtnSxJYxfXkgpADJJNjcPdYxqfoYSpcRrGpFM3XLyCPKu2FiahpACyjua3W JPzRGuYr4I51D16uHiYLxkDSwBKLYBlzyi5bzb+hed9nhoeynvOYtZZkuVgqVRKT QJwnbUpxU1m870cNpAm/ =fAes -----END PGP SIGNATURE----- Merge tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351 into next/soc From Christian Daudt, BCM changes for 3.13/soc. Mostly cleanups and renaming of kernel config options, pushing down the mobile platforms one level in the naming scheme, keeping ARCH_BCM as a wider family config option. * tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351: ARM: bcm_defconfig: Run "make savedefconfig" ARM: bcm281xx: Add ARCH Timers to config rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm) ARM: bcm281xx: more descriptive machine string ARM: bcm281xx: Enable GPIO driver Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
6216650a7a
|
@ -1,4 +1,3 @@
|
||||||
CONFIG_EXPERIMENTAL=y
|
|
||||||
# CONFIG_LOCALVERSION_AUTO is not set
|
# CONFIG_LOCALVERSION_AUTO is not set
|
||||||
# CONFIG_SWAP is not set
|
# CONFIG_SWAP is not set
|
||||||
CONFIG_SYSVIPC=y
|
CONFIG_SYSVIPC=y
|
||||||
|
@ -25,10 +24,8 @@ CONFIG_MODULES=y
|
||||||
CONFIG_MODULE_UNLOAD=y
|
CONFIG_MODULE_UNLOAD=y
|
||||||
# CONFIG_BLK_DEV_BSG is not set
|
# CONFIG_BLK_DEV_BSG is not set
|
||||||
CONFIG_PARTITION_ADVANCED=y
|
CONFIG_PARTITION_ADVANCED=y
|
||||||
CONFIG_EFI_PARTITION=y
|
|
||||||
CONFIG_ARCH_BCM=y
|
CONFIG_ARCH_BCM=y
|
||||||
CONFIG_ARM_THUMBEE=y
|
CONFIG_ARM_THUMBEE=y
|
||||||
CONFIG_ARM_ERRATA_743622=y
|
|
||||||
CONFIG_PREEMPT=y
|
CONFIG_PREEMPT=y
|
||||||
CONFIG_AEABI=y
|
CONFIG_AEABI=y
|
||||||
# CONFIG_OABI_COMPAT is not set
|
# CONFIG_OABI_COMPAT is not set
|
||||||
|
@ -50,7 +47,6 @@ CONFIG_UNIX_DIAG=y
|
||||||
CONFIG_NET_KEY=y
|
CONFIG_NET_KEY=y
|
||||||
CONFIG_INET=y
|
CONFIG_INET=y
|
||||||
CONFIG_IP_MULTICAST=y
|
CONFIG_IP_MULTICAST=y
|
||||||
CONFIG_ARPD=y
|
|
||||||
CONFIG_SYN_COOKIES=y
|
CONFIG_SYN_COOKIES=y
|
||||||
CONFIG_TCP_MD5SIG=y
|
CONFIG_TCP_MD5SIG=y
|
||||||
CONFIG_IPV6=y
|
CONFIG_IPV6=y
|
||||||
|
@ -95,7 +91,6 @@ CONFIG_MMC_UNSAFE_RESUME=y
|
||||||
CONFIG_MMC_BLOCK_MINORS=32
|
CONFIG_MMC_BLOCK_MINORS=32
|
||||||
CONFIG_MMC_TEST=y
|
CONFIG_MMC_TEST=y
|
||||||
CONFIG_MMC_SDHCI=y
|
CONFIG_MMC_SDHCI=y
|
||||||
CONFIG_MMC_SDHCI_PLTFM=y
|
|
||||||
CONFIG_MMC_SDHCI_BCM_KONA=y
|
CONFIG_MMC_SDHCI_BCM_KONA=y
|
||||||
CONFIG_NEW_LEDS=y
|
CONFIG_NEW_LEDS=y
|
||||||
CONFIG_LEDS_CLASS=y
|
CONFIG_LEDS_CLASS=y
|
||||||
|
@ -117,12 +112,12 @@ CONFIG_CONFIGFS_FS=y
|
||||||
CONFIG_NLS_CODEPAGE_437=y
|
CONFIG_NLS_CODEPAGE_437=y
|
||||||
CONFIG_NLS_ISO8859_1=y
|
CONFIG_NLS_ISO8859_1=y
|
||||||
CONFIG_PRINTK_TIME=y
|
CONFIG_PRINTK_TIME=y
|
||||||
CONFIG_MAGIC_SYSRQ=y
|
CONFIG_DEBUG_INFO=y
|
||||||
CONFIG_DEBUG_FS=y
|
CONFIG_DEBUG_FS=y
|
||||||
|
CONFIG_MAGIC_SYSRQ=y
|
||||||
CONFIG_DETECT_HUNG_TASK=y
|
CONFIG_DETECT_HUNG_TASK=y
|
||||||
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110
|
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110
|
||||||
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
|
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
|
||||||
CONFIG_DEBUG_INFO=y
|
|
||||||
# CONFIG_FTRACE is not set
|
# CONFIG_FTRACE is not set
|
||||||
CONFIG_CRC_CCITT=y
|
CONFIG_CRC_CCITT=y
|
||||||
CONFIG_CRC_T10DIF=y
|
CONFIG_CRC_T10DIF=y
|
||||||
|
|
|
@ -6,6 +6,7 @@ CONFIG_ARCH_MVEBU=y
|
||||||
CONFIG_MACH_ARMADA_370=y
|
CONFIG_MACH_ARMADA_370=y
|
||||||
CONFIG_MACH_ARMADA_XP=y
|
CONFIG_MACH_ARMADA_XP=y
|
||||||
CONFIG_ARCH_BCM=y
|
CONFIG_ARCH_BCM=y
|
||||||
|
CONFIG_ARCH_BCM_MOBILE=y
|
||||||
CONFIG_GPIO_PCA953X=y
|
CONFIG_GPIO_PCA953X=y
|
||||||
CONFIG_ARCH_HIGHBANK=y
|
CONFIG_ARCH_HIGHBANK=y
|
||||||
CONFIG_ARCH_KEYSTONE=y
|
CONFIG_ARCH_KEYSTONE=y
|
||||||
|
|
|
@ -1,5 +1,16 @@
|
||||||
config ARCH_BCM
|
config ARCH_BCM
|
||||||
bool "Broadcom SoC" if ARCH_MULTI_V7
|
bool "Broadcom SoC Support"
|
||||||
|
depends on ARCH_MULTIPLATFORM
|
||||||
|
help
|
||||||
|
This enables support for Broadcom ARM based SoC
|
||||||
|
chips
|
||||||
|
|
||||||
|
if ARCH_BCM
|
||||||
|
|
||||||
|
menu "Broadcom SoC Selection"
|
||||||
|
|
||||||
|
config ARCH_BCM_MOBILE
|
||||||
|
bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
|
||||||
depends on MMU
|
depends on MMU
|
||||||
select ARCH_REQUIRE_GPIOLIB
|
select ARCH_REQUIRE_GPIOLIB
|
||||||
select ARM_ERRATA_754322
|
select ARM_ERRATA_754322
|
||||||
|
@ -9,12 +20,17 @@ config ARCH_BCM
|
||||||
select CLKSRC_OF
|
select CLKSRC_OF
|
||||||
select GENERIC_CLOCKEVENTS
|
select GENERIC_CLOCKEVENTS
|
||||||
select GENERIC_TIME
|
select GENERIC_TIME
|
||||||
select GPIO_BCM
|
select GPIO_BCM_KONA
|
||||||
select SPARSE_IRQ
|
select SPARSE_IRQ
|
||||||
select TICK_ONESHOT
|
select TICK_ONESHOT
|
||||||
select CACHE_L2X0
|
select CACHE_L2X0
|
||||||
|
select HAVE_ARM_ARCH_TIMER
|
||||||
help
|
help
|
||||||
This enables support for system based on Broadcom SoCs.
|
This enables support for systems based on Broadcom mobile SoCs.
|
||||||
It currently supports the 'BCM281XX' family, which includes
|
It currently supports the 'BCM281XX' family, which includes
|
||||||
BCM11130, BCM11140, BCM11351, BCM28145 and
|
BCM11130, BCM11140, BCM11351, BCM28145 and
|
||||||
BCM28155 variants.
|
BCM28155 variants.
|
||||||
|
|
||||||
|
endmenu
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
|
@ -10,6 +10,6 @@
|
||||||
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
obj-$(CONFIG_ARCH_BCM) := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
|
obj-$(CONFIG_ARCH_BCM_MOBILE) := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
|
||||||
plus_sec := $(call as-instr,.arch_extension sec,+sec)
|
plus_sec := $(call as-instr,.arch_extension sec,+sec)
|
||||||
AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec)
|
AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec)
|
||||||
|
|
|
@ -67,7 +67,7 @@ static void __init board_init(void)
|
||||||
|
|
||||||
static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, };
|
static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, };
|
||||||
|
|
||||||
DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
|
DT_MACHINE_START(BCM11351_DT, "BCM281xx Broadcom Application Processor")
|
||||||
.init_machine = board_init,
|
.init_machine = board_init,
|
||||||
.restart = bcm_kona_restart,
|
.restart = bcm_kona_restart,
|
||||||
.dt_compat = bcm11351_dt_compat,
|
.dt_compat = bcm11351_dt_compat,
|
||||||
|
|
Loading…
Reference in a new issue