Merge pull request #989 from notro/vcmem

BCM270x: Move vc_mem
raspberrypi · Jun 2, 2015 · 75b4e19 · 75b4e19
2 parents a7aa1bf + 68491e9
commit 75b4e19
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 497 deletions.
diff --git a/arch/arm/mach-bcm2708/Kconfig b/arch/arm/mach-bcm2708/Kconfig
@@ -28,13 +28,6 @@ config BCM2708_GPIO
 	help
 	  Include support for the Broadcom(R) BCM2708 gpio.
 
-config BCM2708_VCMEM
-	bool "Videocore Memory"
-	depends on MACH_BCM2708
-        default y
-        help
-          Helper for videocore memory access and total size allocation.
-
 config BCM2708_NOL2CACHE
 	bool "Videocore L2 cache disable"
 	depends on MACH_BCM2708

diff --git a/arch/arm/mach-bcm2708/Makefile b/arch/arm/mach-bcm2708/Makefile
@@ -4,4 +4,3 @@
 
 obj-$(CONFIG_MACH_BCM2708) 	+= bcm2708.o armctrl.o
 obj-$(CONFIG_BCM2708_GPIO)	+= bcm2708_gpio.o
-obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
diff --git a/arch/arm/mach-bcm2709/Kconfig b/arch/arm/mach-bcm2709/Kconfig
@@ -25,13 +25,6 @@ config BCM2708_GPIO
 	help
 	  Include support for the Broadcom(R) BCM2709 gpio.
 
-config BCM2708_VCMEM
-	bool "Videocore Memory"
-	depends on MACH_BCM2709
-        default y
-        help
-          Helper for videocore memory access and total size allocation.
-
 config BCM2708_NOL2CACHE
 	bool "Videocore L2 cache disable"
 	depends on MACH_BCM2709

diff --git a/arch/arm/mach-bcm2709/Makefile b/arch/arm/mach-bcm2709/Makefile
@@ -4,4 +4,3 @@
 
 obj-$(CONFIG_MACH_BCM2709) 	+= bcm2709.o armctrl.o
 obj-$(CONFIG_BCM2708_GPIO)	+= bcm2708_gpio.o
-obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
diff --git a/arch/arm/mach-bcm2709/include/mach/vc_mem.h b/arch/arm/mach-bcm2709/include/mach/vc_mem.h