summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-03-27 07:59:20 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-03-27 07:59:27 +0200
commitbc43d28e4272a13316716f87b23ef69b594a6306 (patch)
tree88454b448292489c8b26719b56d0c8b9422e7fa6 /target
parentad28a2f96554bed2431258d0a32ae011ade7f4ee (diff)
rpi: fix mini.config
Diffstat (limited to 'target')
-rw-r--r--target/arm/kernel/raspberry-pi319
-rw-r--r--target/config/Config.in.addons17
-rw-r--r--target/linux/config/Config.in.bluetooth2
-rw-r--r--target/linux/config/Config.in.serial3
4 files changed, 33 insertions, 8 deletions
diff --git a/target/arm/kernel/raspberry-pi3 b/target/arm/kernel/raspberry-pi3
index 03e71ecde..905d1ef38 100644
--- a/target/arm/kernel/raspberry-pi3
+++ b/target/arm/kernel/raspberry-pi3
@@ -1,17 +1,24 @@
CONFIG_ARM=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_V6_V7=y
CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MULTI_V6_V7=y
CONFIG_ARCH_BCM=y
CONFIG_ARCH_BCM2835=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_VMSPLIT_2G=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_KUSER_HELPERS=y
+CONFIG_ARM_AMBA=y
CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_BCM2708_VCHIQ=y
-CONFIG_BCM2708_VCMEM=y
-CONFIG_BCM_VC_SM=y
CONFIG_BCM_VC_CMA=y
+CONFIG_BCM2708_VCMEM=y
CONFIG_BCM_VCIO=y
+CONFIG_BCM_VC_SM=y
+CONFIG_BCMA=y
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_STAGING=y
+CONFIG_BCM2708_VCHIQ=y
CONFIG_MAILBOX=y
CONFIG_BCM2835_MBOX=y
CONFIG_RASPBERRYPI_POWER=y
-CONFIG_STAGING=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
diff --git a/target/config/Config.in.addons b/target/config/Config.in.addons
index d7f75894e..225417252 100644
--- a/target/config/Config.in.addons
+++ b/target/config/Config.in.addons
@@ -2,6 +2,23 @@
# material, please see the LICENCE file in the top-level directory.
choice
+prompt "Optional hadware configuration"
+depends on ADK_TARGET_OS_LINUX && ADK_TARGET_SYSTEM_RASPBERRY_PI3
+
+config ADK_TARGET_HARDWARE_RPI3_SERIAL
+ bool "enable serial"
+ select ADK_KERNEL_SERIAL_AMBA_PL011
+
+config ADK_TARGET_HARDWARE_RPI3_BT
+ bool "enable bluetooth"
+ select ADK_KERNEL_BT_HCIUART_BCM
+
+config ADK_TARGET_HARDWARE_RPI3_NONE
+ bool "disable serial and bluetooth"
+
+endchoice
+
+choice
prompt "Audio Board"
depends on ADK_TARGET_OS_LINUX && ADK_TARGET_BOARD_BCM28XX
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 44358e4bf..0e0951d57 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -137,8 +137,8 @@ config ADK_KERNEL_BT_HCIUART_BCM
select ADK_KERNEL_BT_HCIUART
select ADK_KERNEL_BT_HCIUART_3WIRE
select ADK_KERNEL_BT_BCM
- default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3
+ default n
help
The Broadcom protocol support enables Bluetooth HCI over serial
port interface for Broadcom Bluetooth controllers.
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index f13a3b772..8a25d7f5d 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -214,7 +214,8 @@ config ADK_KERNEL_SERIAL_AMBA_PL011
|| ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
|| ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU \
|| ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
- default y if ADK_TARGET_BOARD_BCM28XX
+ default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2
default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU