From c0201ae0fe67e757bd77af4eade95a214d8ae6ee Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 22 Feb 2017 19:53:05 +0100 Subject: fix rpi2 bootup with mini.config and USB for rpi2/rpi3 --- target/arm/kernel/raspberry-pi2 | 19 +++++++++---------- target/arm/kernel/raspberry-pi3 | 1 + target/linux/config/Config.in.pm | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/target/arm/kernel/raspberry-pi2 b/target/arm/kernel/raspberry-pi2 index dd55d7ddf..07de1cf22 100644 --- a/target/arm/kernel/raspberry-pi2 +++ b/target/arm/kernel/raspberry-pi2 @@ -1,18 +1,17 @@ CONFIG_ARM=y -CONFIG_ARCH_BCM2709=y -CONFIG_BCM2709_DT=y -CONFIG_PHYS_OFFSET=0 -CONFIG_HAVE_ARM_ARCH_TIMER=y -CONFIG_FIQ=y -CONFIG_ATAGS=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V6_V7=y +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM2835=y CONFIG_KUSER_HELPERS=y -CONFIG_ARM_ERRATA_643719=y -CONFIG_BCM2708_NOL2CACHE=y CONFIG_RASPBERRYPI_FIRMWARE=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_BCM_VCIO=y CONFIG_MAILBOX=y CONFIG_BCM2835_MBOX=y -CONFIG_OF=y -CONFIG_CMDLINE_FROM_BOOTLOADER=y +CONFIG_RASPBERRYPI_POWER=y diff --git a/target/arm/kernel/raspberry-pi3 b/target/arm/kernel/raspberry-pi3 index 01b711e44..f1ba6cf7f 100644 --- a/target/arm/kernel/raspberry-pi3 +++ b/target/arm/kernel/raspberry-pi3 @@ -13,3 +13,4 @@ CONFIG_BCM_VC_CMA=y CONFIG_BCM_VCIO=y CONFIG_MAILBOX=y CONFIG_BCM2835_MBOX=y +CONFIG_RASPBERRYPI_POWER=y diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 4cac6d845..045b8ad03 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -4,6 +4,7 @@ config ADK_KERNEL_PM bool default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + default y if ADK_TARGET_BOARD_BCM28XX config ADK_KERNEL_PM_RUNTIME bool -- cgit v1.2.3