summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorraj <raj@FreeBSD.org>2008-10-13 20:07:13 +0000
committerraj <raj@FreeBSD.org>2008-10-13 20:07:13 +0000
commit3226c137788c6c0c6b82bd1b88fd42a2a8ea4cb8 (patch)
treed96b4a1062d4a3a8f75bdb30e300bd1a50f23e4f /sys/conf
parent000539b88803ce11f549bc8d24154dc9a6b1c386 (diff)
downloadFreeBSD-src-3226c137788c6c0c6b82bd1b88fd42a2a8ea4cb8.zip
FreeBSD-src-3226c137788c6c0c6b82bd1b88fd42a2a8ea4cb8.tar.gz
Introduce basic support for Marvell families of system-on-chip ARM devices:
* Orion - 88F5181 - 88F5182 - 88F5281 * Kirkwood - 88F6281 * Discovery - MV78100 The above families of SOCs are built around CPU cores compliant with ARMv5TE instruction set architecture definition. They share a number of integrated peripherals. This commit brings support for the following basic elements: * GPIO * Interrupt controller * L1, L2 cache * Timers, watchdog, RTC * TWSI (I2C) * UART Other peripherals drivers will be introduced separately. Reviewed by: imp, marcel, stass (Thanks guys!) Obtained from: Marvell, Semihalf
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/Makefile.arm3
-rw-r--r--sys/conf/options.arm4
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index da77634..99fc300 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -75,7 +75,8 @@ FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_arm7tdmi.S \
$S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \
$S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \
$S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \
- $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S
+ $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \
+ $S/$M/$M/cpufunc_asm_feroceon.S
KERNEL_EXTRA=trampoline
KERNEL_EXTRA_INSTALL=kernel.gz.tramp
trampoline: ${KERNEL_KO}.tramp
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 4846347..eb5a291 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -20,7 +20,11 @@ KERNPHYSADDR opt_global.h
KERNVIRTADDR opt_global.h
LOADERRAMADDR opt_global.h
PHYSADDR opt_global.h
+PHYSMEM_SIZE opt_global.h
SKYEYE_WORKAROUNDS opt_global.h
+SOC_MV_DISCOVERY opt_global.h
+SOC_MV_KIRKWOOD opt_global.h
+SOC_MV_ORION opt_global.h
STARTUP_PAGETABLE_ADDR opt_global.h
XSCALE_CACHE_READ_WRITE_ALLOCATE opt_global.h
XSACLE_DISABLE_CCNT opt_timer.h
OpenPOWER on IntegriCloud