From 64c75b14d7104e8858fb30fbf0f901673ff055ac Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 18 Jul 2015 18:07:37 +0100 Subject: [PATCH 1/2] Config options required by https://github.com/raspberrypi/linux/pull/1037 --- projects/RPi/linux/linux.arm.conf | 4 +++- projects/RPi2/linux/linux.arm.conf | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 440b156e49..4a1d75bbfe 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1381,6 +1381,7 @@ CONFIG_HW_RANDOM_BCM2708=m CONFIG_BRCM_CHAR_DRIVERS=y CONFIG_BCM_VC_CMA=y CONFIG_BCM2708_VCMEM=y +CONFIG_BCM_VCIO=y CONFIG_BCM_VC_SM=y # CONFIG_XILLYBUS is not set @@ -3018,6 +3019,7 @@ CONFIG_BCM2708_MBOX=y # CONFIG_ARM_MHU is not set # CONFIG_PL320_MBOX is not set # CONFIG_ALTERA_MBOX is not set +CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set # @@ -3032,7 +3034,6 @@ CONFIG_BCM2708_MBOX=y # # SOC (System On Chip) specific Drivers # -CONFIG_BCM2708_POWER=y # CONFIG_SOC_TI is not set # CONFIG_PM_DEVFREQ is not set CONFIG_EXTCON=m @@ -3070,6 +3071,7 @@ CONFIG_IRQCHIP=y # Firmware Drivers # # CONFIG_FIRMWARE_MEMMAP is not set +CONFIG_RASPBERRYPI_FIRMWARE=y # # File systems diff --git a/projects/RPi2/linux/linux.arm.conf b/projects/RPi2/linux/linux.arm.conf index da7c521ffd..a2ad6b9d51 100644 --- a/projects/RPi2/linux/linux.arm.conf +++ b/projects/RPi2/linux/linux.arm.conf @@ -1433,6 +1433,7 @@ CONFIG_HW_RANDOM_BCM2708=m CONFIG_BRCM_CHAR_DRIVERS=y CONFIG_BCM_VC_CMA=y CONFIG_BCM2708_VCMEM=y +CONFIG_BCM_VCIO=y CONFIG_BCM_VC_SM=y # CONFIG_XILLYBUS is not set @@ -3073,6 +3074,7 @@ CONFIG_BCM2708_MBOX=y # CONFIG_ARM_MHU is not set # CONFIG_PL320_MBOX is not set # CONFIG_ALTERA_MBOX is not set +CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set # @@ -3087,7 +3089,6 @@ CONFIG_BCM2708_MBOX=y # # SOC (System On Chip) specific Drivers # -CONFIG_BCM2708_POWER=y # CONFIG_SOC_TI is not set # CONFIG_PM_DEVFREQ is not set CONFIG_EXTCON=m @@ -3125,6 +3126,7 @@ CONFIG_IRQCHIP=y # Firmware Drivers # # CONFIG_FIRMWARE_MEMMAP is not set +CONFIG_RASPBERRYPI_FIRMWARE=y # # File systems From f0002de461a7b994037b68470f6e225f81bf5c10 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 18 Jul 2015 18:07:54 +0100 Subject: [PATCH 2/2] Config options required by https://github.com/raspberrypi/linux/pull/1043 --- projects/RPi/linux/linux.arm.conf | 3 +++ projects/RPi2/linux/linux.arm.conf | 3 +++ 2 files changed, 6 insertions(+) diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 4a1d75bbfe..7457e92267 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1289,6 +1289,7 @@ CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y +# CONFIG_JOYSTICK_RPISENSE is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y @@ -1783,6 +1784,7 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y # Multifunction device drivers # CONFIG_MFD_CORE=y +# CONFIG_MFD_RPISENSE_CORE is not set # CONFIG_MFD_AS3711 is not set # CONFIG_MFD_AS3722 is not set # CONFIG_PMIC_ADP5520 is not set @@ -2306,6 +2308,7 @@ CONFIG_FB_BCM2708=y # CONFIG_FB_AUO_K190X is not set # CONFIG_FB_SIMPLE is not set # CONFIG_FB_SSD1307 is not set +# CONFIG_FB_RPISENSE is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_VGASTATE is not set diff --git a/projects/RPi2/linux/linux.arm.conf b/projects/RPi2/linux/linux.arm.conf index a2ad6b9d51..1a72942e44 100644 --- a/projects/RPi2/linux/linux.arm.conf +++ b/projects/RPi2/linux/linux.arm.conf @@ -1341,6 +1341,7 @@ CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y +# CONFIG_JOYSTICK_RPISENSE is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y @@ -1835,6 +1836,7 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y # Multifunction device drivers # CONFIG_MFD_CORE=y +# CONFIG_MFD_RPISENSE_CORE is not set # CONFIG_MFD_AS3711 is not set # CONFIG_MFD_AS3722 is not set # CONFIG_PMIC_ADP5520 is not set @@ -2358,6 +2360,7 @@ CONFIG_FB_BCM2708=y # CONFIG_FB_AUO_K190X is not set # CONFIG_FB_SIMPLE is not set # CONFIG_FB_SSD1307 is not set +# CONFIG_FB_RPISENSE is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_VGASTATE is not set