Mon May 2 01:45:26 2011 UTC ()
mpc85xx uses MBRs


(matt)
diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/files.mpc85xx
diff -r1.2 -r1.3 src/sys/arch/evbppc/conf/std.mpc85xx
cvs diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/files.mpc85xx (expand / switch to unified diff)

--- src/sys/arch/evbppc/conf/files.mpc85xx 2011/02/08 06:22:29 1.3
+++ src/sys/arch/evbppc/conf/files.mpc85xx 2011/05/02 01:45:26 1.4
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
1# $NetBSD: files.mpc85xx,v 1.3 2011/02/08 06:22:29 matt Exp $ 1# $NetBSD: files.mpc85xx,v 1.4 2011/05/02 01:45:26 matt Exp $
2# 2#
3# mpc85xx-specific configuration info 3# mpc85xx-specific configuration info
4 4
5defflag opt_mpc85xx.h MPC8536 MPC8544 MPC8548 MPC8555 MPC8568 MPC8572 5defflag opt_mpc85xx.h MPC8536 MPC8544 MPC8548 MPC8555 MPC8568 MPC8572
6 P2020 CADMUS PIXIS 6 P2020 CADMUS PIXIS
7defparam opt_mpc85xx.h SYS_CLK 7defparam opt_mpc85xx.h SYS_CLK
8 8
9file arch/evbppc/mpc85xx/autoconf.c 9file arch/evbppc/mpc85xx/autoconf.c
10file arch/evbppc/mpc85xx/machdep.c 10file arch/evbppc/mpc85xx/machdep.c
11file arch/powerpc/booke/e500_autoconf.c 11file arch/powerpc/booke/e500_autoconf.c
12file arch/powerpc/booke/e500_intr.c 12file arch/powerpc/booke/e500_intr.c
13file arch/powerpc/booke/e500_timer.c 13file arch/powerpc/booke/e500_timer.c
14file arch/powerpc/booke/e500_tlb.c 14file arch/powerpc/booke/e500_tlb.c
15 15
 16# we usr MBR
 17file kern/subr_disk_mbr.c disk
 18
16# Memory Disk for install kernel 19# Memory Disk for install kernel
17file dev/md_root.c memory_disk_hooks 20file dev/md_root.c memory_disk_hooks
18 21
19# Machine-independent I2O drivers. 22# Machine-independent I2O drivers.
20include "dev/i2o/files.i2o" 23include "dev/i2o/files.i2o"
21 24
22# Machine-independent SCSI drivers 25# Machine-independent SCSI drivers
23include "dev/scsipi/files.scsipi" 26include "dev/scsipi/files.scsipi"
24 27
25# Machine-independent ATA drivers 28# Machine-independent ATA drivers
26include "dev/ata/files.ata" 29include "dev/ata/files.ata"
27 30
28# Machine-independent USB drivers 31# Machine-independent USB drivers
cvs diff -r1.2 -r1.3 src/sys/arch/evbppc/conf/std.mpc85xx (expand / switch to unified diff)

--- src/sys/arch/evbppc/conf/std.mpc85xx 2011/01/18 01:10:25 1.2
+++ src/sys/arch/evbppc/conf/std.mpc85xx 2011/05/02 01:45:26 1.3
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: std.mpc85xx,v 1.2 2011/01/18 01:10:25 matt Exp $ 1# $NetBSD: std.mpc85xx,v 1.3 2011/05/02 01:45:26 matt Exp $
2# 2#
3# Standard/required options for NetBSD/mpc85xx. 3# Standard/required options for NetBSD/mpc85xx.
4 4
5machine evbppc powerpc 5machine evbppc powerpc
6include "conf/std" # MI standard options 6include "conf/std" # MI standard options
7 7
8# standard ("mandatory") kernel options. 8# standard ("mandatory") kernel options.
9options PPC_BOOKE # Freescale e500 family 9options PPC_BOOKE # Freescale e500 family
 10options EVBPPC_HAS_MBR # Use MBR format (needed for SDCARD booting)
10 11
11# Executable support: 12# Executable support:
12options EXEC_ELF32 # (native) ELF32 binary support 13options EXEC_ELF32 # (native) ELF32 binary support
13options EXEC_SCRIPT # shell script support 14options EXEC_SCRIPT # shell script support
14 15
15makeoptions TEXTADDR=0x20000 16makeoptions TEXTADDR=0x20000
16makeoptions BOARDTYPE="mpc85xx" 17makeoptions BOARDTYPE="mpc85xx"
17makeoptions PPCDIR="booke" 18makeoptions PPCDIR="booke"
18makeoptions NEEDS_MDSETIMAGE="yes" 19makeoptions NEEDS_MDSETIMAGE="yes"
19 20
20options PPC_INTR_IMPL="<powerpc/booke/intr.h>" 21options PPC_INTR_IMPL="<powerpc/booke/intr.h>"
21options PPC_PCI_MACHDEP_IMPL="<powerpc/pci_machdep.h>" 22options PPC_PCI_MACHDEP_IMPL="<powerpc/pci_machdep.h>"
22options KERNBASE=0x20000 23options KERNBASE=0x20000