Browse Source

rpi: fix mini.config

Waldemar Brodkorb 7 years ago
parent
commit
bc43d28e42

+ 4 - 0
package/bcm28xx-bootloader/Makefile

@@ -85,6 +85,10 @@ ifneq ($(ADK_TARGET_HARDWARE_RPI_PROTO),)
 	printf "dtoverlay=rpi-proto.dtb\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 endif
+ifeq ($(ADK_TARGET_HARDWARE_RPI3_SERIAL),y)
+	printf "dtoverlay=pi3-disable-bt.dtb\n" >> \
+		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
+endif
 ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y)
 	$(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/opt/vc/bin
 	$(INSTALL_BIN) ./files/vcdbg \

+ 13 - 6
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

+ 17 - 0
target/config/Config.in.addons

@@ -1,6 +1,23 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # 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

+ 1 - 1
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.

+ 2 - 1
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