Date: Sat, 11 Nov 2006 23:20:55 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 109760 for review Message-ID: <200611112320.kABNKtHd086699@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109760 Change 109760 by rdivacky@rdivacky_witten on 2006/11/11 23:20:00 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#11 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#11 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/mci_device.h#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memcpy.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memset.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/sd-card.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strcmp.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strcpy.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strcvt.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#31 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#10 integrate .. //depot/projects/linuxolator/src/sys/conf/files#10 integrate .. //depot/projects/linuxolator/src/sys/conf/files.arm#2 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/linuxolator/src/sys/conf/options#7 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#11 integrate .. //depot/projects/linuxolator/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thr.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/ksched.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/linuxolator/src/sys/kern/p1003_1b.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/posix4_mib.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_lock.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/linuxolator/src/sys/modules/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#7 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_ppp.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_pppvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/pci/if_pcn.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/posix4/_semaphore.h#2 delete .. //depot/projects/linuxolator/src/sys/posix4/ksched.c#3 delete .. //depot/projects/linuxolator/src/sys/posix4/ksem.h#2 delete .. //depot/projects/linuxolator/src/sys/posix4/p1003_1b.c#3 delete .. //depot/projects/linuxolator/src/sys/posix4/posix4.h#2 delete .. //depot/projects/linuxolator/src/sys/posix4/posix4_mib.c#2 delete .. //depot/projects/linuxolator/src/sys/posix4/sched.h#2 delete .. //depot/projects/linuxolator/src/sys/posix4/semaphore.h#2 delete .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/cpufunc.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/linuxolator/src/sys/sys/_lock.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/_mutex.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/_semaphore.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/ksem.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/lock.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/lock_profile.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/lockmgr.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/mutex.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/posix4.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/sched.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/sem.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/semaphore.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/syscall.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.mk#7 integrate .. //depot/projects/linuxolator/src/sys/sys/sysproto.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/thr.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/umtx.h#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#5 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.38 2006/08/10 06:29:43 imp Exp $ +# $FreeBSD: src/sys/Makefile,v 1.39 2006/11/11 16:26:55 trhodes Exp $ .include <bsd.own.mk> @@ -11,7 +11,7 @@ CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.657 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.660 2006/11/07 21:57:18 ru Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -196,7 +196,7 @@ #ifdef PERFMON perfmon_init(); #endif - printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), + printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), ptoa((uintmax_t)physmem) / 1048576); realmem = Maxmem; /* @@ -220,7 +220,7 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %ju (%ju MB)\n", + printf("avail memory = %ju (%ju MB)\n", ptoa((uintmax_t)cnt.v_free_count), ptoa((uintmax_t)cnt.v_free_count) / 1048576); @@ -747,8 +747,6 @@ ip->gd_hioffset = ((uintptr_t)func)>>16 ; } -#define IDTVEC(name) __CONCAT(X,name) - extern inthand_t IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt), IDTVEC(ofl), IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(fpusegm), @@ -877,7 +875,7 @@ if (smap->base < physmap[i + 1]) { if (boothowto & RB_VERBOSE) printf( - "Overlapping or non-montonic memory region, ignoring second region\n"); + "Overlapping or non-monotonic memory region, ignoring second region\n"); continue; } } ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#9 (text+ko) ==== @@ -27,14 +27,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.7 2006/10/15 14:22:12 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.9 2006/11/07 18:53:49 jhb Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ #define _AMD64_LINUX_LINUX_H_ -#include <sys/signal.h> /* for sigval union */ - #include <amd64/linux32/linux32_syscall.h> /* @@ -379,6 +377,11 @@ #define LINUX_SI_MAX_SIZE 128 #define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) +union l_sigval { + l_int sival_int; + l_uintptr_t sival_ptr; +}; + typedef struct l_siginfo { l_int lsi_signo; l_int lsi_errno; @@ -399,7 +402,7 @@ struct { l_pid_t _pid; /* sender's pid */ l_uid16_t _uid; /* sender's uid */ - union sigval _sigval; + union l_sigval _sigval; } __packed _rt; struct { ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.26 2006/11/11 21:49:07 ru Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -11,7 +11,7 @@ #include <sys/signal.h> #include <sys/acl.h> -#include <posix4/_semaphore.h> +#include <sys/_semaphore.h> #include <sys/ucontext.h> #include <bsm/audit_kevents.h> ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.26 2006/11/11 21:49:07 ru Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.26 2006/11/11 21:49:07 ru Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp */ #include <bsm/audit_kevents.h> ==== //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.12 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,13 +73,17 @@ #include <arm/xscale/i80321/i80321var.h> #endif +#if defined(CPU_XSCALE_81342) +#include <arm/xscale/i8134x/i81342reg.h> +#endif + #ifdef CPU_XSCALE_IXP425 #include <arm/xscale/ixp425/ixp425reg.h> #include <arm/xscale/ixp425/ixp425var.h> #endif #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #include <arm/xscale/xscalereg.h> #endif @@ -570,6 +574,62 @@ /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 +struct cpu_functions xscalec3_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + xscale_cpwait, /* cpwait */ + + /* MMU functions */ + + xscale_control, /* control */ + cpufunc_domains, /* domain */ + xscalec3_setttb, /* setttb */ + cpufunc_faultstatus, /* faultstatus */ + cpufunc_faultaddress, /* faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + xscale_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + (void *)armv4_tlb_flushI, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + xscalec3_cache_syncI, /* icache_sync_all */ + xscale_cache_syncI_rng, /* icache_sync_range */ + + xscalec3_cache_purgeD, /* dcache_wbinv_all */ + xscalec3_cache_purgeD_rng, /* dcache_wbinv_range */ + xscale_cache_flushD_rng, /* dcache_inv_range */ + xscalec3_cache_cleanD_rng, /* dcache_wb_range */ + + xscalec3_cache_purgeID, /* idcache_wbinv_all */ + xscalec3_cache_purgeID_rng, /* idcache_wbinv_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + xscale_cpu_sleep, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + xscalec3_context_switch, /* context_switch */ + + xscale_setup /* cpu setup */ +}; +#endif /* CPU_XSCALE_81342 */ /* * Global constants also used by locore.s */ @@ -582,7 +642,7 @@ defined (CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) static void get_cachetype_cp15(void); @@ -895,7 +955,6 @@ if (cputype == CPU_ID_80321_400 || cputype == CPU_ID_80321_600 || cputype == CPU_ID_80321_400_B0 || cputype == CPU_ID_80321_600_B0 || cputype == CPU_ID_80219_400 || cputype == CPU_ID_80219_600) { - /* * Reset the Performance Monitoring Unit to a * pristine state: @@ -920,6 +979,19 @@ } #endif /* CPU_XSCALE_80321 */ +#if defined(CPU_XSCALE_81342) + if (cputype == CPU_ID_81342) { + cpufuncs = xscalec3_cpufuncs; +#if defined(PERFCTRS) + xscale_pmu_init(); +#endif + + cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ + get_cachetype_cp15(); + pmap_pte_init_xscale(); + return 0; + } +#endif /* CPU_XSCALE_81342 */ #ifdef CPU_XSCALE_PXA2X0 /* ignore core revision to test PXA2xx CPUs */ if ((cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA250 || @@ -1326,7 +1398,7 @@ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #define IGN 0 #define OR 1 @@ -1794,7 +1866,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) struct cpu_option xscale_options[] = { #ifdef COMPAT_12 { "branchpredict", BIC, OR, CPU_CONTROL_BPRD_ENABLE }, ==== //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.8 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $"); #include <sys/systm.h> #include <sys/param.h> #include <sys/malloc.h> @@ -126,6 +126,13 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +static const char * const i81342_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const pxa2x0_steppings[16] = { "step A-0", "step A-1", "step B-0", "step B-1", "step B-2", "step C-0", "rev 6", "rev 7", @@ -229,6 +236,9 @@ { CPU_ID_80321_600_B0, CPU_CLASS_XSCALE, "i80321 600MHz", i80321_steppings }, + { CPU_ID_81342, CPU_CLASS_XSCALE, "i81342", + i81342_steppings }, + { CPU_ID_80219_400, CPU_CLASS_XSCALE, "i80219 400MHz", xscale_steppings }, ==== //depot/projects/linuxolator/src/sys/arm/arm/intr.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.12 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/syslog.h> @@ -106,6 +106,7 @@ struct thread *td = curthread; int i, thread; + PCPU_LAZY_INC(cnt.v_intr); td->td_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { arm_mask_irq(i); ==== //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.69 2006/08/28 21:43:34 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.72 2006/11/11 20:57:51 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -218,7 +218,6 @@ static MALLOC_DEFINE(M_VMPMAP, "pmap", "PMAP L1"); -vm_offset_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ vm_offset_t pmap_curmaxkvaddr; @@ -278,6 +277,8 @@ extern void bcopy_page(vm_offset_t, vm_offset_t); extern void bzero_page(vm_offset_t); +extern vm_offset_t alloc_firstaddr; + char *_tmppt; /* @@ -1960,7 +1961,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2784,6 +2785,11 @@ KASSERT(l2b != NULL, ("No L2 bucket in pmap_remove_pages")); pt = &l2b->l2b_kva[l2pte_index(pv->pv_va)]; m = PHYS_TO_VM_PAGE(*pt & L2_ADDR_MASK); +#ifdef ARM_USE_SMALL_ALLOC + KASSERT((vm_offset_t)m >= alloc_firstaddr, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#else + KASSERT((vm_offset_t)m >= KERNBASE, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#endif *pt = 0; PTE_SYNC(pt); npv = TAILQ_NEXT(pv, pv_plist); @@ -4563,7 +4569,7 @@ /* * pmap_link_l2pt: * - * Link the L2 page table specified by "pa" into the L1 + * Link the L2 page table specified by l2pv.pv_pa into the L1 * page table at the slot for "va". */ void @@ -4574,7 +4580,12 @@ proto = L1_S_DOM(PMAP_DOMAIN_KERNEL) | L1_C_PROTO; +#ifdef VERBOSE_INIT_ARM + printf("pmap_link_l2pt: pa=0x%x va=0x%x\n", l2pv->pv_pa, l2pv->pv_va); +#endif + pde[slot + 0] = proto | (l2pv->pv_pa + 0x000); + PTE_SYNC(&pde[slot]); SLIST_INSERT_HEAD(&kernel_pt_list, l2pv, pv_list); ==== //depot/projects/linuxolator/src/sys/arm/arm/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.28 2006/10/24 23:27:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.29 2006/11/07 22:35:30 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -456,7 +456,7 @@ MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); -static vm_offset_t alloc_firstaddr; +vm_offset_t alloc_firstaddr; vm_offset_t arm_ptovirt(vm_paddr_t pa) ==== //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#4 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.18 2006/10/26 21:42:17 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.19 2006/11/11 20:57:52 alc Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -129,7 +129,6 @@ vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; -vm_offset_t clean_sva, clean_eva; struct pv_addr systempage; struct pv_addr msgbufpv; @@ -496,7 +495,6 @@ /* Do basic tuning, hz etc */ init_param1(); init_param2(physmem); - avail_end = KERNPHYSADDR + memsize - 1; kdb_init(); return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); ==== //depot/projects/linuxolator/src/sys/arm/include/armreg.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/armreg.h,v 1.4 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/armreg.h,v 1.5 2006/11/07 22:36:56 cognet Exp $ */ #ifndef MACHINE_ARMREG_H @@ -157,6 +157,7 @@ #define CPU_ID_80321_600_B0 0x69052c30 #define CPU_ID_80219_400 0x69052e20 /* A0 stepping/revision. */ #define CPU_ID_80219_600 0x69052e30 /* A0 stepping/revision. */ +#define CPU_ID_81342 0x69056810 #define CPU_ID_IXP425_533 0x690541c0 #define CPU_ID_IXP425_400 0x690541d0 #define CPU_ID_IXP425_266 0x690541f0 ==== //depot/projects/linuxolator/src/sys/arm/include/atomic.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.19 2006/05/15 13:08:12 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.20 2006/11/07 11:53:44 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -337,6 +337,7 @@ #define atomic_cmpset_acq_int atomic_cmpset_32 #define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_cmpset_acq_32 atomic_cmpset_32 #define atomic_store_rel_ptr atomic_store_ptr #define atomic_store_rel_int atomic_store_32 #define atomic_cmpset_rel_32 atomic_cmpset_32 ==== //depot/projects/linuxolator/src/sys/arm/include/cpuconf.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.8 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.9 2006/11/07 22:36:56 cognet Exp $ * */ @@ -64,7 +64,8 @@ #define ARM_ARCH_4 0 #endif -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_80219) || \ +#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ defined(CPU_XSCALE_PXA2X0)) || defined(CPU_ARM10) #define ARM_ARCH_5 1 #else @@ -113,7 +114,7 @@ #if(defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_MMU_XSCALE 1 #else #define ARM_MMU_XSCALE 0 @@ -132,7 +133,7 @@ */ #if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_XSCALE_PMU 1 #else #define ARM_XSCALE_PMU 0 ==== //depot/projects/linuxolator/src/sys/arm/include/cpufunc.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.9 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.10 2006/11/07 22:36:56 cognet Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -374,7 +374,7 @@ defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void armv4_tlb_flushID (void); void armv4_tlb_flushI (void); @@ -392,7 +392,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void xscale_cpwait (void); void xscale_cpu_sleep (int mode); @@ -433,6 +433,28 @@ #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 + +void xscalec3_cache_cleanID (void); +void xscalec3_cache_cleanD (void); + +void xscalec3_cache_purgeID (void); +void xscalec3_cache_purgeID_E (u_int entry); +void xscalec3_cache_purgeD (void); +void xscalec3_cache_purgeD_E (u_int entry); + +void xscalec3_cache_syncI (void); +void xscalec3_cache_cleanID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_cleanD_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeD_rng (vm_offset_t start, vm_size_t end); + + +void xscalec3_setttb (u_int ttb); +void xscalec3_context_switch (void); + +#endif /* CPU_XSCALE_81342 */ + #define tlb_flush cpu_tlb_flushID #define setttb cpu_setttb #define drain_writebuf cpu_drain_writebuf ==== //depot/projects/linuxolator/src/sys/arm/include/pmap.h#2 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.20 2006/08/08 20:59:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.22 2006/11/11 20:57:52 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -213,9 +213,6 @@ return (ptep); } -extern vm_offset_t avail_end; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; @@ -426,7 +423,7 @@ extern void (*pmap_copy_page_func)(vm_paddr_t, vm_paddr_t); extern void (*pmap_zero_page_func)(vm_paddr_t, int, int); -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined(CPU_XSCALE_81342) void pmap_copy_page_generic(vm_paddr_t, vm_paddr_t); void pmap_zero_page_generic(vm_paddr_t, int, int); ==== //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.19 2006/10/26 21:42:17 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.20 2006/11/11 20:57:52 alc Exp $"); #include "opt_md.h" @@ -146,7 +146,6 @@ vm_paddr_t physical_end; vm_paddr_t physical_freestart; vm_offset_t physical_pages; -vm_offset_t clean_sva, clean_eva; struct pv_addr systempage; struct pv_addr irqstack; @@ -455,7 +454,6 @@ init_param1(); init_param2(physmem); kdb_init(); - avail_end = 0xc0000000 + memsize - 1; return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile#2 (text) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile,v 1.2 2006/04/21 06:43:32 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile,v 1.3 2006/11/09 20:45:21 imp Exp $ -SUBDIR= libat91 boot0 boot0iic boot0spi bootiic bootspi +SUBDIR= libat91 boot0 boot0iic boot0spi boot2 bootiic bootspi .include <bsd.subdir.mk> ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile.inc#3 (text) ==== @@ -1,11 +1,14 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.4 2006/10/21 22:51:20 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.5 2006/11/09 19:58:14 imp Exp $ .if !target(__at91_boot_Makefile.inc__) .PATH: ${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm __at91_boot_Makefile.inc__: -CFLAGS=-O2 -mcpu=arm9 -ffreestanding \ +# tsc, kb920x are the supported flavors +BOOT_FLAVOR=kb920x + +CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ -I${.CURDIR}/../../../.. \ -I${.CURDIR}/../../../../arm \ @@ -13,13 +16,12 @@ -Wall -Waggregate-return \ -Wnested-externs \ -Wpointer-arith -Wshadow -Wwrite-strings \ - -Werror -# -Wmissing-prototypes -# -Wmissing-declarations + -Werror \ + -Wmissing-prototypes \ + -Wmissing-declarations # -Wstrict-prototypes -#CFLAGS+=-DBOOT_TSC -CFLAGS+=-DBOOT_KB9202 +CFLAGS+=-DBOOT_${BOOT_FLAVOR:U} LIBAT91=${.OBJDIR}/../libat91/libat91.a ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0iic/main.c#2 (text) ==== @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/boot0iic/main.c,v 1.2 2006/08/16 23:14:52 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0iic/main.c,v 1.3 2006/11/09 19:55:25 imp Exp $ */ #include "at91rm9200.h" @@ -36,8 +36,8 @@ while (xmodem_rx(addr) == -1) continue; InitEEPROM(); - printf("Writing EEPROM from 0x%x to addr 0\r\n", addr); + printf("Writing EEPROM from 0x%x to addr 0\n", addr); WriteEEPROM(0, addr, 8192); - printf("Write complete. Press reset\r\n"); + printf("Write complete. Press reset\n"); return (1); } ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/Makefile#2 (text+ko) ==== @@ -1,16 +1,22 @@ -# $FreeBSD: src/sys/boot/arm/at91/boot2/Makefile,v 1.1 2006/10/20 09:12:05 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/boot2/Makefile,v 1.2 2006/11/09 20:07:26 imp Exp $ -.PATH: ${.CURDIR}/../bootspi +.PATH: ${.CURDIR}/../libat91 P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c kb920x_board.c ee.c +SRCS=arm_init.S boot2.c ${BOOT_FLAVOR}_board.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include <bsd.prog.mk> +.if ${BOOT_FLAVOR} == "tsc" +SRCS+=ee.c +.endif +.if ${BOOT_FLAVOR} == "kb920x" +CFLAGS+=-DBOOT_IIC +.endif CFLAGS+= \ -I${.CURDIR}/../bootspi \ -I${.CURDIR}/../../../common \ ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.1 2006/10/20 09:12:05 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.2 2006/11/09 20:07:26 imp Exp $"); #include <sys/param.h> #include <sys/disklabel.h> @@ -30,6 +30,7 @@ #include "lib.h" #include "sd-card.h" #include "ee.h" +#include "board.h" #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ @@ -66,7 +67,7 @@ #define PATH_CONFIG "/boot.config" //#define PATH_KERNEL "/boot/kernel/kernel" -#define PATH_KERNEL "/kernel.gz.tramp" +#define PATH_KERNEL "/boot/kernel/kernel.gz.tramp" #define NOPT 5 @@ -141,9 +142,6 @@ } } -// Each board has to provide one of these. -void board_init(void); - int main(void) { ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611112320.kABNKtHd086699>