p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This pull request fixes graphics in bcm2835_defconfig by enabling CMA, 

and starts building the new SDHOST MMC driver on multi_v7_defconfig,
 so that we can switch to it by default in the following release.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE/JuuFDWp9/ZkuCBXtdYpNtH8nugFAljRfm0ACgkQtdYpNtH8
 nuhYPA//dPiynAoyS6+Rc4bbTDBFcbAL1Ta18bw4XyzffD7odyQuXvmAT++70ONE
 OXva+2lVCb5N/VXT02NsVZnQdRzFKB2z2QUYnuUnSYLnJDbPND8sSNKK9tEGuFMC
 LF7CprMXwuUpgfDELZQbS8Kz2nLdg5PjkSYHLM6TslsJQ8PerLX7rrdMeXLSHCyl
 +p7lBXz6QHmmYZPuaXR7k9jBdcxyFyl5ly58Aqd9jDbLAok+z6M7VOe2NSb7Af56
 xNFkumHt0t9KlvdJr0uYKM6g83mQHfrQH7h8GnDk2EztnpOdFkMsVVJsgTJkBX9b
 d9sVV2r5Iua+1hnvww+Luh1B1WXTJGfpiHwHvVt20xCRVj5NUUFEs5ctTz9acLae
 1OMgu4kb5aTRv0Xc5n9zX7p/Dj0Vj7HKk0dX4gPPBm3t7HuiFUTtsYPaWltLfPIJ
 Xg5gnxdp6MCaV303IRpcRwXSfroiiu9A9CmppI+at9IkobH2YHs7D+Ow3tDHth29
 4vJCLaNkrABQ1sRmE77NEHwG7kuLQ77iAOYR+Mex8OTzlLAXk0E4jNLl/q1ZqVQ3
 lOlxaufHjC+pSUnNIz6t/2uoHyPQ9maLOBTQZ235f4vaA+Mt2ZppH3ALVWePPGZU
 k9ywjXHKimn1UX57djMKbL7HS7azcSnUrF/sSI+KFsvm0IsEggc=
 =BgLm
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJY1VO/AAoJEIfQlpxEBwcElfkP/1onb9IF5Rt8iIhf6C6yHAsR
 HAvPMRZnFtoI9F203NMHk4m0JBBiRnQHWvIQoD5gVV2scJZYvaLDesvXHlNt+CDE
 WKMPbLrT0BPAnCwCA8GJPotygZi2Lc4O0NKlkuu/mwUyTpNBYnOdS5NV4I8xPSK5
 mifaQlwLXHIEAmElSj5FxvGnNXKrGDlVBbJhWWVVdPgN83uXDB2jglu6rrsPE9r9
 XPLXR6jI1mS6NTKQujPnxvtb0eKbBRzdVQfzOtpw1qWfgqJrkS2YPS2n8Y9zAgqD
 ZEWJeCvrF4G5YOFX84EUvRSFmGBhOugiYjHxaCDnOyjCq8EJHrk4cgx2K6xJ98dn
 wzpLBMEvwHQiBVbhVaLa+3OH8A/9/VMgIv0oopJgqsFpl6XitL4BxZ+5q16Dba90
 EadMt5T+Q731Xxvt8UK0s0xLIu+p8ekSRKlv/rcyvltgHjhaxJCGceks+lqsz5Qf
 LW4vhdP2khfotR5DQ0MQ2Rl3EmmGEg7qXhlA8nrgLRl+E99NYXFxQlk+OAEB565M
 XHzcHG/UklpUA7wBzM8fIKBPbhgqlf4Fx6x3ACQ4apS3KY0XnZhOj8gHSMAcpj6k
 5PWVaca5p72l6ByQ/SA05aIvnbOXqPrUcDv2eacDgXs0RNJtg92inYfVgif7rhOy
 UVHPAC08x/bX89Mgpr+x
 =SIyu
 -----END PGP SIGNATURE-----

Merge tag 'bcm2835-defconfig-next-2017-03-21' into defconfig/next

This pull request fixes graphics in bcm2835_defconfig by enabling CMA,
and starts building the new SDHOST MMC driver on multi_v7_defconfig,
so that we can switch to it by default in the following release.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2017-03-24 10:13:25 -07:00
parent c1ae3cfa0e 51a08de0fd
commit f880c8fd8c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/configs/bcm2835_defconfig
View File

@ -1,6 +1,5 @@
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
CONFIG_FHANDLE=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_BSD_PROCESS_ACCT=y
@ -32,6 +31,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_AEABI=y
CONFIG_KSM=y
CONFIG_CLEANCACHE=y
CONFIG_CMA=y
CONFIG_SECCOMP=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
@ -52,6 +52,7 @@ CONFIG_MAC80211=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
CONFIG_DMA_CMA=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_CONSTANTS=y
@ -62,7 +63,6 @@ CONFIG_USB_NET_SMSC95XX=y
CONFIG_ZD1211RW=y
CONFIG_INPUT_EVDEV=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_TTY_PRINTK=y
@ -92,6 +92,7 @@ CONFIG_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_IPROC=y
CONFIG_MMC_BCM2835=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y

1
arch/arm/configs/multi_v7_defconfig
View File

@ -730,6 +730,7 @@ CONFIG_MMC_DW_EXYNOS=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SH_MMCIF=y
CONFIG_MMC_SUNXI=y
CONFIG_MMC_BCM2835=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_CLASS_FLASH=m