svn commit: r280285 - head/sys/arm/broadcom/bcm2835

[Andrew Turner]

Author: andrew
Date: Fri Mar 20 14:25:51 2015
New Revision: 280285
URL: https://svnweb.freebsd.org/changeset/base/280285

Log:
  Split out the common bcm283x fixes from the bcm2835 specific files.

Added:
  head/sys/arm/broadcom/bcm2835/files.bcm283x
     - copied, changed from r280125, head/sys/arm/broadcom/bcm2835/files.bcm2835
Modified:
  head/sys/arm/broadcom/bcm2835/files.bcm2835
  head/sys/arm/broadcom/bcm2835/std.bcm2835

Modified: head/sys/arm/broadcom/bcm2835/files.bcm2835
==============================================================================
--- head/sys/arm/broadcom/bcm2835/files.bcm2835	Fri Mar 20 14:23:40 2015	(r280284)
+++ head/sys/arm/broadcom/bcm2835/files.bcm2835	Fri Mar 20 14:25:51 2015	(r280285)
@@ -1,54 +1,5 @@
 # $FreeBSD$
 
-arm/broadcom/bcm2835/bcm2835_bsc.c		optional bcm2835_bsc
-arm/broadcom/bcm2835/bcm2835_common.c		optional fdt
-arm/broadcom/bcm2835/bcm2835_cpufreq.c		standard
-arm/broadcom/bcm2835/bcm2835_dma.c		standard
-arm/broadcom/bcm2835/bcm2835_fb.c		optional sc
-arm/broadcom/bcm2835/bcm2835_fbd.c		optional vt
-arm/broadcom/bcm2835/bcm2835_gpio.c		optional gpio
-arm/broadcom/bcm2835/bcm2835_intr.c		standard
-arm/broadcom/bcm2835/bcm2835_machdep.c		standard
-arm/broadcom/bcm2835/bcm2835_mbox.c		standard
-arm/broadcom/bcm2835/bcm2835_sdhci.c		optional sdhci
-arm/broadcom/bcm2835/bcm2835_spi.c		optional bcm2835_spi
 arm/broadcom/bcm2835/bcm2835_systimer.c		standard
-arm/broadcom/bcm2835/bcm2835_wdog.c		standard
 
-arm/broadcom/bcm2835/bcm283x_dwc_fdt.c		optional dwcotg fdt
-
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c                     standard
-arm/arm/bus_space_asm_generic.S                 standard
-arm/arm/cpufunc_asm_arm11.S                     standard
 arm/arm/cpufunc_asm_arm11x6.S                   standard
-arm/arm/cpufunc_asm_armv5.S                     standard
-arm/arm/cpufunc_asm_armv6.S                     standard
-
-kern/kern_clocksource.c                         standard
-
-dev/mbox/mbox_if.m				standard
-dev/ofw/ofw_cpu.c				standard
-
-arm/broadcom/bcm2835/bcm2835_audio.c		optional sound vchiq \
-	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-
-# VideoCore driver
-contrib/vchiq/interface/compat/vchi_bsd.c	optional vchiq \
-	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c	optional vchiq \
-	compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_arm.c	optional vchiq \
-	compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_connected.c	optional vchiq \
-	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_core.c	optional vchiq \
-	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c	optional vchiq \
-	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c	optional vchiq \
-	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_shim.c	optional vchiq \
-	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_util.c	optional vchiq \
-	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"

Copied and modified: head/sys/arm/broadcom/bcm2835/files.bcm283x (from r280125, head/sys/arm/broadcom/bcm2835/files.bcm2835)
==============================================================================
--- head/sys/arm/broadcom/bcm2835/files.bcm2835	Sun Mar 15 21:57:44 2015	(r280125, copy source)
+++ head/sys/arm/broadcom/bcm2835/files.bcm283x	Fri Mar 20 14:25:51 2015	(r280285)
@@ -12,16 +12,13 @@ arm/broadcom/bcm2835/bcm2835_machdep.c		
 arm/broadcom/bcm2835/bcm2835_mbox.c		standard
 arm/broadcom/bcm2835/bcm2835_sdhci.c		optional sdhci
 arm/broadcom/bcm2835/bcm2835_spi.c		optional bcm2835_spi
-arm/broadcom/bcm2835/bcm2835_systimer.c		standard
 arm/broadcom/bcm2835/bcm2835_wdog.c		standard
-
 arm/broadcom/bcm2835/bcm283x_dwc_fdt.c		optional dwcotg fdt
 
 arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c                     standard
 arm/arm/bus_space_asm_generic.S                 standard
 arm/arm/cpufunc_asm_arm11.S                     standard
-arm/arm/cpufunc_asm_arm11x6.S                   standard
 arm/arm/cpufunc_asm_armv5.S                     standard
 arm/arm/cpufunc_asm_armv6.S                     standard
 

Modified: head/sys/arm/broadcom/bcm2835/std.bcm2835
==============================================================================
--- head/sys/arm/broadcom/bcm2835/std.bcm2835	Fri Mar 20 14:23:40 2015	(r280284)
+++ head/sys/arm/broadcom/bcm2835/std.bcm2835	Fri Mar 20 14:25:51 2015	(r280285)
@@ -5,4 +5,5 @@ cpu	CPU_ARM1176
 makeoptions	CONF_CFLAGS="-mcpu=arm1176jzf-s"
 
 files	"../broadcom/bcm2835/files.bcm2835"
+files	"../broadcom/bcm2835/files.bcm283x"