summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2013-07-15 07:01:30 +0000
committerrpaulo <rpaulo@FreeBSD.org>2013-07-15 07:01:30 +0000
commit96cfc141562a66bbef089efaf29e8a95ae9f2b72 (patch)
tree5bcdbbb72fa1bc8b129e68b5a45c8aea084abcf5
parentc833aa741fe7347d0990dfb8080bdf319eb3cce5 (diff)
downloadFreeBSD-src-96cfc141562a66bbef089efaf29e8a95ae9f2b72.zip
FreeBSD-src-96cfc141562a66bbef089efaf29e8a95ae9f2b72.tar.gz
Move the Raspberry Pi low level options out of the kernel config and into
std.rpi + std.bcm2835. Reviewed by: imp
-rw-r--r--sys/arm/broadcom/bcm2835/std.bcm28357
-rw-r--r--sys/arm/broadcom/bcm2835/std.rpi12
-rw-r--r--sys/arm/conf/RPI-B13
3 files changed, 20 insertions, 12 deletions
diff --git a/sys/arm/broadcom/bcm2835/std.bcm2835 b/sys/arm/broadcom/bcm2835/std.bcm2835
new file mode 100644
index 0000000..ebc1fb0
--- /dev/null
+++ b/sys/arm/broadcom/bcm2835/std.bcm2835
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+machine arm armv6
+cpu CPU_ARM1176
+
+files "../broadcom/bcm2835/files.bcm2835"
+
diff --git a/sys/arm/broadcom/bcm2835/std.rpi b/sys/arm/broadcom/bcm2835/std.rpi
new file mode 100644
index 0000000..8bb62c8
--- /dev/null
+++ b/sys/arm/broadcom/bcm2835/std.rpi
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+include "../broadcom/bcm2835/std.bcm2835"
+
+options KERNVIRTADDR=0xc0100000
+makeoptions KERNVIRTADDR=0xc0100000
+options KERNPHYSADDR=0x00100000
+makeoptions KERNPHYSADDR=0x00100000
+options PHYSADDR=0x00000000
+options STARTUP_PAGETABLE_ADDR=0x01000000
+options FREEBSD_BOOT_LOADER
+options LINUX_BOOT_ABI
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 38db5dd..474f6a9 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -18,21 +18,10 @@
# $FreeBSD$
ident RPI-B
-machine arm armv6
-cpu CPU_ARM1176
-files "../broadcom/bcm2835/files.bcm2835"
+include "../broadcom/bcm2835/std.rpi"
makeoptions MODULES_OVERRIDE=""
-options KERNVIRTADDR=0xc0100000
-makeoptions KERNVIRTADDR=0xc0100000
-options KERNPHYSADDR=0x00100000
-makeoptions KERNPHYSADDR=0x00100000
-options PHYSADDR=0x00000000
-options STARTUP_PAGETABLE_ADDR=0x01000000
-options FREEBSD_BOOT_LOADER
-options LINUX_BOOT_ABI
-
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
options HZ=100
OpenPOWER on IntegriCloud