From owner-p4-projects@FreeBSD.ORG Thu Jan 28 11:48:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 076151065676; Thu, 28 Jan 2010 11:48:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C01481065670 for ; Thu, 28 Jan 2010 11:48:37 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 934D38FC13 for ; Thu, 28 Jan 2010 11:48:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SBmbwP034935 for ; Thu, 28 Jan 2010 11:48:37 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SBmb2x034933 for perforce@freebsd.org; Thu, 28 Jan 2010 11:48:37 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 11:48:37 GMT Message-Id: <201001281148.o0SBmb2x034933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 11:48:38 -0000 http://p4web.freebsd.org/chv.cgi?CH=173822 Change 173822 by raj@raj_fdt on 2010/01/28 11:48:06 Clean up PowerPC MPC85XX build. - Connect and disconnect files. - Eliminate unused #defines. Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#15 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/mpc85xx.h#3 edit Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#15 (text+ko) ==== @@ -32,6 +32,7 @@ dev/cfi/cfi_bus_fdt.c optional cfi fdt dev/fb/fb.c optional sc dev/fdt/fdt_common.c optional fdt +dev/fdt/fdt_powerpc.c optional fdt dev/fdt/fdtbus.c optional fdt dev/fdt/simplebus.c optional fdt dev/hwpmc/hwpmc_powerpc.c optional hwpmc @@ -127,7 +128,6 @@ powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx -powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/openpic_fdt.c optional fdt powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx powerpc/ofw/ofw_cpu.c optional aim ==== //depot/projects/fdt/sys/powerpc/mpc85xx/mpc85xx.h#3 (text+ko) ==== @@ -87,40 +87,6 @@ #define OCP85XX_RSTCR (CCSRBAR_VA + 0xe00b0) /* - * OCP Bus Definitions - */ -#define OCP85XX_I2C0_OFF 0x03000 -#define OCP85XX_I2C1_OFF 0x03100 -#define OCP85XX_I2C_SIZE 0x16 -#define OCP85XX_UART0_OFF 0x04500 -#define OCP85XX_UART1_OFF 0x04600 -#define OCP85XX_UART_SIZE 0x10 -#define OCP85XX_LBC_OFF 0x05000 -#define OCP85XX_LBC_SIZE 0x1000 - -#define OCP85XX_PCI0_OFF 0x0A000 -#define OCP85XX_PCI1_OFF 0x09000 -#define OCP85XX_PCI2_OFF 0x08000 -#if 0 -#define OCP85XX_PCI0_OFF 0x08000 -#define OCP85XX_PCI1_OFF 0x09000 -#define OCP85XX_PCI2_OFF 0x0A000 -#endif - -#define OCP85XX_PCI_SIZE 0x1000 -#define OCP85XX_TSEC0_OFF 0x24000 -#define OCP85XX_TSEC1_OFF 0x25000 -#define OCP85XX_TSEC2_OFF 0x26000 -#define OCP85XX_TSEC3_OFF 0x27000 -#define OCP85XX_TSEC_SIZE 0x1000 -#define OCP85XX_OPENPIC_OFF 0x40000 -#define OCP85XX_OPENPIC_SIZE 0x200B4 -#define OCP85XX_QUICC_OFF 0x80000 -#define OCP85XX_QUICC_SIZE 0x20000 -#define OCP85XX_SEC_OFF 0x30000 -#define OCP85XX_SEC_SIZE 0x10000 - -/* * PIC definitions */ #define ISA_IRQ_START 0