svn commit: r294511 - in head/sys: conf dev/fdt dev/ofw

[Andrew Turner]

Author: andrew
Date: Thu Jan 21 16:48:01 2016
New Revision: 294511
URL: https://svnweb.freebsd.org/changeset/base/294511

Log:
  Remove fdt_fixup_table from architectures where it's unneeded. We only make
  use of fdt_fixup_table on PowerPC and ARM. As such we can remove it from
  other architectures as it's unneeded.
  
  Reviewed by:	nwhitehorn
  Sponsored by:	ABT Systems Ltd
  Differential Revision:	https://reviews.freebsd.org/D5013

Deleted:
  head/sys/dev/fdt/fdt_arm64.c
  head/sys/dev/fdt/fdt_mips.c
  head/sys/dev/fdt/fdt_x86.c
Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.arm64
  head/sys/conf/files.i386
  head/sys/conf/files.mips
  head/sys/dev/fdt/fdt_common.h
  head/sys/dev/ofw/ofw_fdt.c

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Thu Jan 21 16:42:52 2016	(r294510)
+++ head/sys/conf/files.amd64	Thu Jan 21 16:48:01 2016	(r294511)
@@ -240,7 +240,6 @@ dev/fdc/fdc.c			optional	fdc
 dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
 dev/fdc/fdc_pccard.c		optional	fdc pccard
-dev/fdt/fdt_x86.c		optional	fdt
 dev/hpt27xx/hpt27xx_os_bsd.c	optional	hpt27xx
 dev/hpt27xx/hpt27xx_osm_bsd.c	optional	hpt27xx
 dev/hpt27xx/hpt27xx_config.c	optional	hpt27xx

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Thu Jan 21 16:42:52 2016	(r294510)
+++ head/sys/conf/files.arm64	Thu Jan 21 16:48:01 2016	(r294511)
@@ -59,7 +59,6 @@ crypto/blowfish/bf_enc.c	optional	crypto
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/acpica/acpi_if.m		optional	acpi
 dev/ahci/ahci_generic.c		optional ahci fdt
-dev/fdt/fdt_arm64.c		optional	fdt
 dev/hwpmc/hwpmc_arm64.c		optional	hwpmc
 dev/hwpmc/hwpmc_arm64_md.c	optional	hwpmc
 dev/mmc/host/dwmmc.c		optional	dwmmc

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Thu Jan 21 16:42:52 2016	(r294510)
+++ head/sys/conf/files.i386	Thu Jan 21 16:48:01 2016	(r294511)
@@ -208,7 +208,6 @@ dev/fdc/fdc.c			optional fdc
 dev/fdc/fdc_acpi.c		optional fdc
 dev/fdc/fdc_isa.c		optional fdc isa
 dev/fdc/fdc_pccard.c		optional fdc pccard
-dev/fdt/fdt_x86.c		optional fdt
 dev/fe/if_fe_isa.c		optional fe isa
 dev/glxiic/glxiic.c		optional glxiic
 dev/glxsb/glxsb.c		optional glxsb

Modified: head/sys/conf/files.mips
==============================================================================
--- head/sys/conf/files.mips	Thu Jan 21 16:42:52 2016	(r294510)
+++ head/sys/conf/files.mips	Thu Jan 21 16:48:01 2016	(r294511)
@@ -80,7 +80,6 @@ dev/syscons/scvtb.c			optional	sc
 mips/mips/sc_machdep.c			optional	sc
 
 # FDT support
-dev/fdt/fdt_mips.c			optional	fdt
 dev/uart/uart_cpu_fdt.c			optional	uart fdt
 
 # crypto support -- use generic

Modified: head/sys/dev/fdt/fdt_common.h
==============================================================================
--- head/sys/dev/fdt/fdt_common.h	Thu Jan 21 16:42:52 2016	(r294510)
+++ head/sys/dev/fdt/fdt_common.h	Thu Jan 21 16:48:01 2016	(r294511)
@@ -48,12 +48,14 @@ struct fdt_sense_level {
 typedef int (*fdt_pic_decode_t)(phandle_t, pcell_t *, int *, int *, int *);
 extern fdt_pic_decode_t fdt_pic_table[];
 
+#if defined(__arm__) || defined(__powerpc__)
 typedef void (*fdt_fixup_t)(phandle_t);
 struct fdt_fixup_entry {
 	char		*model;
 	fdt_fixup_t	handler;
 };
 extern struct fdt_fixup_entry fdt_fixup_table[];
+#endif
 
 extern SLIST_HEAD(fdt_ic_list, fdt_ic) fdt_ic_list_head;
 struct fdt_ic {

Modified: head/sys/dev/ofw/ofw_fdt.c
==============================================================================
--- head/sys/dev/ofw/ofw_fdt.c	Thu Jan 21 16:42:52 2016	(r294510)
+++ head/sys/dev/ofw/ofw_fdt.c	Thu Jan 21 16:48:01 2016	(r294511)
@@ -394,6 +394,7 @@ ofw_fdt_package_to_path(ofw_t ofw, phand
 	return (-1);
 }
 
+#if defined(__arm__) || defined(__powerpc__)
 static int
 ofw_fdt_fixup(ofw_t ofw)
 {
@@ -427,10 +428,12 @@ ofw_fdt_fixup(ofw_t ofw)
 
 	return (0);
 }
+#endif
 
 static int
 ofw_fdt_interpret(ofw_t ofw, const char *cmd, int nret, cell_t *retvals)
 {
+#if defined(__arm__) || defined(__powerpc__)
 	int rv;
 
 	/*
@@ -449,4 +452,7 @@ ofw_fdt_interpret(ofw_t ofw, const char 
 		retvals[0] = rv;
 
 	return (rv);
+#else
+	return (0);
+#endif
 }