Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 702e9762 authored Aug 28, 2017 by Linus Torvalds

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull c6x tweaks from Mark Salter.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: Convert to using %pOF instead of full_name
  c6x: defconfig: Cleanup from old Kconfig options

parents cc4a41fe 636d4211

arch/c6x/configs/dsk6455_defconfig

+0 −2

Original line number	Diff line number	Diff line
		CONFIG_SOC_TMS320C6455=y
		CONFIG_EXPERIMENTAL=y
		# CONFIG_LOCALVERSION_AUTO is not set
		CONFIG_SYSVIPC=y
		CONFIG_SPARSE_IRQ=y
		@@ -25,7 +24,6 @@ CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_COUNT=2
		CONFIG_BLK_DEV_RAM_SIZE=17000
		CONFIG_MISC_DEVICES=y
		# CONFIG_INPUT is not set
		# CONFIG_SERIO is not set
		# CONFIG_VT is not set

arch/c6x/configs/evmc6457_defconfig

+0 −2

Original line number	Diff line number	Diff line
		CONFIG_SOC_TMS320C6457=y
		CONFIG_EXPERIMENTAL=y
		# CONFIG_LOCALVERSION_AUTO is not set
		CONFIG_SYSVIPC=y
		CONFIG_SPARSE_IRQ=y
		@@ -26,7 +25,6 @@ CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_COUNT=2
		CONFIG_BLK_DEV_RAM_SIZE=17000
		CONFIG_MISC_DEVICES=y
		# CONFIG_INPUT is not set
		# CONFIG_SERIO is not set
		# CONFIG_VT is not set

arch/c6x/configs/evmc6472_defconfig

+0 −2

Original line number	Diff line number	Diff line
		CONFIG_SOC_TMS320C6472=y
		CONFIG_EXPERIMENTAL=y
		# CONFIG_LOCALVERSION_AUTO is not set
		CONFIG_SYSVIPC=y
		CONFIG_SPARSE_IRQ=y
		@@ -27,7 +26,6 @@ CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_COUNT=2
		CONFIG_BLK_DEV_RAM_SIZE=17000
		CONFIG_MISC_DEVICES=y
		# CONFIG_INPUT is not set
		# CONFIG_SERIO is not set
		# CONFIG_VT is not set

arch/c6x/configs/evmc6474_defconfig

+0 −2

Original line number	Diff line number	Diff line
		CONFIG_SOC_TMS320C6474=y
		CONFIG_EXPERIMENTAL=y
		# CONFIG_LOCALVERSION_AUTO is not set
		CONFIG_SYSVIPC=y
		CONFIG_SPARSE_IRQ=y
		@@ -27,7 +26,6 @@ CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_COUNT=2
		CONFIG_BLK_DEV_RAM_SIZE=17000
		CONFIG_MISC_DEVICES=y
		# CONFIG_INPUT is not set
		# CONFIG_SERIO is not set
		# CONFIG_VT is not set

arch/c6x/configs/evmc6678_defconfig

+0 −2

Original line number	Diff line number	Diff line
		CONFIG_SOC_TMS320C6678=y
		CONFIG_EXPERIMENTAL=y
		# CONFIG_LOCALVERSION_AUTO is not set
		CONFIG_SYSVIPC=y
		CONFIG_SPARSE_IRQ=y
		@@ -27,7 +26,6 @@ CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_COUNT=2
		CONFIG_BLK_DEV_RAM_SIZE=17000
		CONFIG_MISC_DEVICES=y
		# CONFIG_INPUT is not set
		# CONFIG_SERIO is not set
		# CONFIG_VT is not set