From e68fcb030d9016801a0fc3dceaaff601829a89fd Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Tue, 24 Mar 2015 18:46:01 +0000 Subject: [PATCH] Add the SOC_BCM2835 and SOC_BCM2836 options for the arm kernel and add the former to std.bcm2835. These will be used to enable support for the Raspberry Pi 2. MFC after: 1 week --- sys/arm/broadcom/bcm2835/std.bcm2835 | 1 + sys/conf/options.arm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sys/arm/broadcom/bcm2835/std.bcm2835 b/sys/arm/broadcom/bcm2835/std.bcm2835 index 0f7881879a2..08e9d763bc8 100644 --- a/sys/arm/broadcom/bcm2835/std.bcm2835 +++ b/sys/arm/broadcom/bcm2835/std.bcm2835 @@ -3,6 +3,7 @@ machine arm armv6 cpu CPU_ARM1176 makeoptions CONF_CFLAGS="-mcpu=arm1176jzf-s" +options SOC_BCM2835 files "../broadcom/bcm2835/files.bcm2835" files "../broadcom/bcm2835/files.bcm283x" diff --git a/sys/conf/options.arm b/sys/conf/options.arm index 40e07397203..aec06ae5390 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -39,6 +39,8 @@ SOCDEV_PA opt_global.h SOCDEV_VA opt_global.h PV_STATS opt_pmap.h QEMU_WORKAROUNDS opt_global.h +SOC_BCM2835 opt_global.h +SOC_BCM2836 opt_global.h SOC_MV_ARMADAXP opt_global.h SOC_MV_DISCOVERY opt_global.h SOC_MV_DOVE opt_global.h