From owner-svn-src-all@freebsd.org Thu Jan 21 16:48:02 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E54F2A8C80B; Thu, 21 Jan 2016 16:48:02 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C12CD1834; Thu, 21 Jan 2016 16:48:02 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LGm1A1097900; Thu, 21 Jan 2016 16:48:01 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LGm1Eq097893; Thu, 21 Jan 2016 16:48:01 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201601211648.u0LGm1Eq097893@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Thu, 21 Jan 2016 16:48:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r294511 - in head/sys: conf dev/fdt dev/ofw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2016 16:48:03 -0000 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 }