hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable CMA and MTD command line partitioning support. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZ4MM7AAoJEGFBu2jqvgRN7UgQAIBBkeKiv72kcpnwN2pGvcoC
 A71JeKhkoLp+es7HZG5bwoBPdT2Ih666v0FjHmcDkITxBmT4DJX1ZsFbevpRQ6HG
 fLG5jmmOCu91Ur1X+vEG1FWNXjaFefvexAvyo0V80JdGrVYuUr0rJU/TM7PdATOJ
 0prWuXkMFrSjMK3tqSXIjYQLzsjhYcJ7QOm8C6MsGTyDVqowhH3ojNzG6KIUeVBA
 Q0su61cL4DRb5b6JVRL48OKICHpnZAIZc/jP4lJDHRC7yQqhWwCKyCy7i6/7bwO6
 0HnsCHExjWbB05lNssAg4wJZPX82FhqE0krUWgPCpT1PQrRhat1fDGHolwVyht9a
 C5u0V0b1m29yHHZbm5tFSc7T3Op/b89rfMjh0JkMRM1guggu0kpg4n2EetIDOjzY
 jtdxEES4Um83YUxEM68kNffY/D1D+h4wl8OU4VuyYAlokTdiOe+G0orLAFOJSeyj
 yL5YtMa06m0DC6hL0jHVNzIjt7g1/LZKGpyLl1mGa3nsvUNEbD3NVxM3FBAXvXc1
 EZYpg8KIuNccVN48BlyJSU3JTgzPcTIzBTl/3Ewpv8vSrmyYiVG3OmD8ZvI/QRY9
 GuWSFpWWKHUQiGShujAItkTZ0AQUDDMiJjrBIfi+6FoYsS0Jvs70QRUjVP696Pyi
 KvegfrE9vLVTtBzg+U96
 =vV+s
 -----END PGP SIGNATURE-----

Merge tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Pull "DaVinci defconfig updates for v4.15" from Sekhar Nori:

Enable CMA and MTD command line partitioning support.

* tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: enable CMA options
  ARM: davinci_all_defconfig: enable MTD_CMDLINE_PARTS
This commit is contained in:
Arnd Bergmann 2017-10-19 22:43:31 +02:00
parent 06743cbfc5 5627453efa
commit 82e3c83e23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/configs/davinci_all_defconfig
View File

@ -34,6 +34,7 @@ CONFIG_DAVINCI_MUX_WARNINGS=y
CONFIG_DAVINCI_RESET_CLOCKS=y CONFIG_DAVINCI_RESET_CLOCKS=y
CONFIG_PREEMPT=y CONFIG_PREEMPT=y
CONFIG_AEABI=y CONFIG_AEABI=y
CONFIG_CMA=y
CONFIG_SECCOMP=y CONFIG_SECCOMP=y
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
@ -56,9 +57,11 @@ CONFIG_NETFILTER=y
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
CONFIG_DMA_CMA=y
CONFIG_DA8XX_MSTPRI=y CONFIG_DA8XX_MSTPRI=y
CONFIG_MTD=m CONFIG_MTD=m
CONFIG_MTD_TESTS=m CONFIG_MTD_TESTS=m
CONFIG_MTD_CMDLINE_PARTS=m
CONFIG_MTD_BLOCK=m CONFIG_MTD_BLOCK=m
CONFIG_MTD_CFI=m CONFIG_MTD_CFI=m
CONFIG_MTD_CFI_INTELEXT=m CONFIG_MTD_CFI_INTELEXT=m
@ -195,7 +198,6 @@ CONFIG_USB_G_SERIAL=m
CONFIG_USB_G_PRINTER=m CONFIG_USB_G_PRINTER=m
CONFIG_USB_CDC_COMPOSITE=m CONFIG_USB_CDC_COMPOSITE=m
CONFIG_MMC=y CONFIG_MMC=y
# CONFIG_MMC_BLOCK_BOUNCE is not set
CONFIG_MMC_DAVINCI=y CONFIG_MMC_DAVINCI=y
CONFIG_NEW_LEDS=y CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=m CONFIG_LEDS_CLASS=m