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

Kyle Evans kevans at FreeBSD.org
Wed Dec 18 02:29:28 UTC 2019


Author: kevans
Date: Wed Dec 18 02:29:27 2019
New Revision: 355875
URL: https://svnweb.freebsd.org/changeset/base/355875

Log:
  bcm2835_vcbus: add legacy compat mappings
  
  I've opted for just duplicating the two entries needed for this, rather than
  writing any other mechanism for maintaining two root compat entries to map
  to one config, for simplicity. We'll eventually declare these legacy DTB
  unsupported, but let's not do that yet while there's no real burden.

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c	Wed Dec 18 01:56:38 2019	(r355874)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c	Wed Dec 18 02:29:27 2019	(r355875)
@@ -152,13 +152,27 @@ static struct bcm283x_memory_soc_cfg {
 	bus_addr_t			 busdma_lowaddr;
 } bcm283x_memory_configs[] = {
 #ifdef SOC_BCM2835
+	/* Legacy */
 	{
 		.memmap = bcm2835_memmap,
+		.soc_compat = "raspberrypi,model-b",
+		.busdma_lowaddr = BUS_SPACE_MAXADDR_32BIT,
+	},
+	/* Modern */
+	{
+		.memmap = bcm2835_memmap,
 		.soc_compat = "brcm,bcm2835",
 		.busdma_lowaddr = BUS_SPACE_MAXADDR_32BIT,
 	},
 #endif
 #ifdef SOC_BCM2836
+	/* Legacy */
+	{
+		.memmap = bcm2836_memmap,
+		.soc_compat = "brcm,bcm2709",
+		.busdma_lowaddr = BUS_SPACE_MAXADDR_32BIT,
+	},
+	/* Modern */
 	{
 		.memmap = bcm2836_memmap,
 		.soc_compat = "brcm,bcm2836",


More information about the svn-src-head mailing list