diff options
| author | imp <imp@FreeBSD.org> | 2012-07-01 06:34:17 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2012-07-01 06:34:17 +0000 |
| commit | 4ed0f242810392486e5bd814935d6d4fcb2f20b1 (patch) | |
| tree | f3acdcf3cc2115d9daf8b919cfcf4e1d2120b625 | |
| parent | 380bfd1f7ad3d8812be9f6444bb0e920f5d34228 (diff) | |
| download | FreeBSD-src-4ed0f242810392486e5bd814935d6d4fcb2f20b1.zip FreeBSD-src-4ed0f242810392486e5bd814935d6d4fcb2f20b1.tar.gz | |
Opt-in rather than opt-out of the SoC. We don't really support
running with multiple SoCs compiled in very well anyway, so this just
wastes space. As more and more SoCs arrive in the tree, it is better
to edit one master file that builds them all than many board files.
| -rw-r--r-- | sys/arm/at91/std.at91 | 2 | ||||
| -rw-r--r-- | sys/arm/at91/std.at91sam9 | 6 | ||||
| -rw-r--r-- | sys/arm/at91/std.ethernut5 | 3 | ||||
| -rw-r--r-- | sys/arm/at91/std.hl201 | 1 | ||||
| -rw-r--r-- | sys/arm/at91/std.qila9g20 | 1 | ||||
| -rw-r--r-- | sys/arm/at91/std.sam9g20ek | 1 | ||||
| -rw-r--r-- | sys/arm/at91/std.sam9x25ek | 3 |
7 files changed, 7 insertions, 10 deletions
diff --git a/sys/arm/at91/std.at91 b/sys/arm/at91/std.at91 index fe57721..0c950b0 100644 --- a/sys/arm/at91/std.at91 +++ b/sys/arm/at91/std.at91 @@ -1,6 +1,6 @@ # $FreeBSD$ -files "../at91/files.at91" +files "../at91/files.at91" cpu CPU_ARM9 makeoptions CONF_CFLAGS=-mcpu=arm9 options PHYSADDR=0x20000000 diff --git a/sys/arm/at91/std.at91sam9 b/sys/arm/at91/std.at91sam9 index 417b388..75c3276 100644 --- a/sys/arm/at91/std.at91sam9 +++ b/sys/arm/at91/std.at91sam9 @@ -1,13 +1,9 @@ # $FreeBSD$ -files "../at91/files.at91" +files "../at91/files.at91" cpu CPU_ARM9 makeoptions CONF_CFLAGS=-mcpu=arm9 options PHYSADDR=0x20000000 # bring in the sam specific timers and such device at91sam9 - -device at91sam9260 -device at91sam9g20 -device at91sam9x25 diff --git a/sys/arm/at91/std.ethernut5 b/sys/arm/at91/std.ethernut5 index aa9a2f8..876b59a 100644 --- a/sys/arm/at91/std.ethernut5 +++ b/sys/arm/at91/std.ethernut5 @@ -8,5 +8,4 @@ options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_ethernut5 -nodevice at91sam9g20 -nodevice at91sam9x25 +device at91sam9260 diff --git a/sys/arm/at91/std.hl201 b/sys/arm/at91/std.hl201 index 86022b6..ff27308 100644 --- a/sys/arm/at91/std.hl201 +++ b/sys/arm/at91/std.hl201 @@ -8,3 +8,4 @@ options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_hl201 +device at91sam9g20 diff --git a/sys/arm/at91/std.qila9g20 b/sys/arm/at91/std.qila9g20 index 4595d4e..e2043b6 100644 --- a/sys/arm/at91/std.qila9g20 +++ b/sys/arm/at91/std.qila9g20 @@ -8,3 +8,4 @@ options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_qila9g20 +device at91sam9g20 diff --git a/sys/arm/at91/std.sam9g20ek b/sys/arm/at91/std.sam9g20ek index f600d9c..cdbecda 100644 --- a/sys/arm/at91/std.sam9g20ek +++ b/sys/arm/at91/std.sam9g20ek @@ -8,3 +8,4 @@ options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_sam9g20ek +device at91sam9g20 diff --git a/sys/arm/at91/std.sam9x25ek b/sys/arm/at91/std.sam9x25ek index 2ee119d..32b1f3b 100644 --- a/sys/arm/at91/std.sam9x25ek +++ b/sys/arm/at91/std.sam9x25ek @@ -8,5 +8,4 @@ options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_sam9x25ek -nodevice at91sam9g20 -nodevice at91sam9260 +device at91sam9x25 |
