summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2018-05-28 23:28:54 +0200
committerWaldemar Brodkorb <wbrodkorb@conet.de>2018-05-28 23:32:11 +0200
commit68368b70fa58ceacdcdf40405f8f7713d0c44e8f (patch)
tree62ff675086404a7cb7d4434270f3c5095e479471 /target/config
parent382138104b46883071f867670445cd47bba2a897 (diff)
rpi: update firmware, kernel and fixup more stuff
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in.addons19
-rw-r--r--target/config/Config.in.runtime2
2 files changed, 16 insertions, 5 deletions
diff --git a/target/config/Config.in.addons b/target/config/Config.in.addons
index 241ff1b20..f26804e4a 100644
--- a/target/config/Config.in.addons
+++ b/target/config/Config.in.addons
@@ -46,20 +46,33 @@ depends on ( ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX ) \
|| ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 )
config ADK_TARGET_HARDWARE_RPI3_SERIAL
- bool "enable serial"
+ bool "serial"
+ select ADK_TARGET_HARDWARE_RPI3_NO_BT
select ADK_LINUX_KERNEL_SERIAL_AMBA_PL011 if ADK_TARGET_OS_LINUX
select ADK_WALDUX_KERNEL_SERIAL_AMBA_PL011 if ADK_TARGET_OS_WALDUX
config ADK_TARGET_HARDWARE_RPI3_BT
- bool "enable bluetooth"
+ bool "bluetooth"
select ADK_LINUX_KERNEL_BT_HCIUART_BCM m if ADK_TARGET_OS_LINUX
select ADK_WALDUX_KERNEL_BT_HCIUART_BCM m if ADK_TARGET_OS_WALDUX
config ADK_TARGET_HARDWARE_RPI3_NONE
- bool "disable serial and bluetooth"
+ bool "none"
endchoice
+config ADK_TARGET_HARDWARE_RPI3_NO_BT
+ bool
+
+config ADK_TARGET_HARDWARE_RPI3_NO_WIFI
+ bool "Disable wifi"
+ depends on ( ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX ) \
+ && ( ADK_TARGET_SYSTEM_RASPBERRY_PI3 \
+ || ADK_TARGET_SYSTEM_RASPBERRY_PI3P \
+ || ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 \
+ || ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 )
+
+
choice
prompt "Audio Board Addon"
depends on (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && ADK_TARGET_BOARD_BCM28XX
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 5403df361..974a2e3f2 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -723,13 +723,11 @@ depends on ADK_TARGET_BOARD_BCM28XX
config ADK_RUNTIME_MPEG2_KEY
string "MPEG2"
- default "0x12345678"
help
Hardware-specific license key for MPEG2 decoding.
config ADK_RUNTIME_VC1_KEY
string "VC-1"
- default "0x12345678"
help
Hardware-specific license key for VC-1 decoding.