mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
269 lines
6.8 KiB
Diff
269 lines
6.8 KiB
Diff
From b6a574b3e3170b4dd2f297ba7f4dbc36f759983a Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Tue, 17 Apr 2018 09:16:46 +0100
|
|
Subject: [PATCH 306/321] configs: Add CONFIG_BCM2835_DEVGPIOMEM for aarch64
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/2514
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
arch/arm64/configs/bcmrpi3_defconfig | 73 ++++++++++++++----------------------
|
|
1 file changed, 28 insertions(+), 45 deletions(-)
|
|
|
|
diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
|
|
index 69aea2f6da4a..ff5d079c1bbf 100644
|
|
--- a/arch/arm64/configs/bcmrpi3_defconfig
|
|
+++ b/arch/arm64/configs/bcmrpi3_defconfig
|
|
@@ -352,20 +352,6 @@ CONFIG_YAM=m
|
|
CONFIG_CAN=m
|
|
CONFIG_CAN_VCAN=m
|
|
CONFIG_CAN_MCP251X=m
|
|
-CONFIG_IRDA=m
|
|
-CONFIG_IRLAN=m
|
|
-CONFIG_IRNET=m
|
|
-CONFIG_IRCOMM=m
|
|
-CONFIG_IRDA_ULTRA=y
|
|
-CONFIG_IRDA_CACHE_LAST_LSAP=y
|
|
-CONFIG_IRDA_FAST_RR=y
|
|
-CONFIG_IRTTY_SIR=m
|
|
-CONFIG_KINGSUN_DONGLE=m
|
|
-CONFIG_KSDAZZLE_DONGLE=m
|
|
-CONFIG_KS959_DONGLE=m
|
|
-CONFIG_USB_IRDA=m
|
|
-CONFIG_SIGMATEL_FIR=m
|
|
-CONFIG_MCS_FIR=m
|
|
CONFIG_BT=m
|
|
CONFIG_BT_RFCOMM=m
|
|
CONFIG_BT_RFCOMM_TTY=y
|
|
@@ -425,7 +411,6 @@ CONFIG_ISCSI_TCP=m
|
|
CONFIG_ISCSI_BOOT_SYSFS=m
|
|
CONFIG_MD=y
|
|
CONFIG_MD_LINEAR=m
|
|
-CONFIG_MD_RAID0=m
|
|
CONFIG_BLK_DEV_DM=m
|
|
CONFIG_DM_CRYPT=m
|
|
CONFIG_DM_SNAPSHOT=m
|
|
@@ -445,7 +430,6 @@ CONFIG_NETCONSOLE=m
|
|
CONFIG_TUN=m
|
|
CONFIG_VETH=m
|
|
CONFIG_ENC28J60=m
|
|
-CONFIG_QCA7000=m
|
|
CONFIG_MDIO_BITBANG=m
|
|
CONFIG_PPP=m
|
|
CONFIG_PPP_BSDCOMP=m
|
|
@@ -466,6 +450,7 @@ CONFIG_USB_KAWETH=m
|
|
CONFIG_USB_PEGASUS=m
|
|
CONFIG_USB_RTL8150=m
|
|
CONFIG_USB_RTL8152=m
|
|
+CONFIG_USB_LAN78XX=y
|
|
CONFIG_USB_USBNET=y
|
|
CONFIG_USB_NET_AX8817X=m
|
|
CONFIG_USB_NET_AX88179_178A=m
|
|
@@ -479,7 +464,6 @@ CONFIG_USB_NET_SR9700=m
|
|
CONFIG_USB_NET_SR9800=m
|
|
CONFIG_USB_NET_SMSC75XX=m
|
|
CONFIG_USB_NET_SMSC95XX=y
|
|
-CONFIG_USB_LAN78XX=y
|
|
CONFIG_USB_NET_GL620A=m
|
|
CONFIG_USB_NET_NET1080=m
|
|
CONFIG_USB_NET_PLUSB=m
|
|
@@ -540,7 +524,6 @@ CONFIG_IEEE802154_AT86RF230=m
|
|
CONFIG_IEEE802154_MRF24J40=m
|
|
CONFIG_IEEE802154_CC2520=m
|
|
CONFIG_INPUT_POLLDEV=m
|
|
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
|
|
CONFIG_INPUT_JOYDEV=m
|
|
CONFIG_INPUT_EVDEV=m
|
|
# CONFIG_KEYBOARD_ATKBD is not set
|
|
@@ -578,7 +561,7 @@ CONFIG_GAMEPORT_NS558=m
|
|
CONFIG_GAMEPORT_L4=m
|
|
CONFIG_BRCM_CHAR_DRIVERS=y
|
|
CONFIG_BCM_VCIO=y
|
|
-# CONFIG_BCM2835_DEVGPIOMEM is not set
|
|
+CONFIG_BCM2835_DEVGPIOMEM=y
|
|
# CONFIG_BCM2835_SMI_DEV is not set
|
|
# CONFIG_LEGACY_PTYS is not set
|
|
CONFIG_SERIAL_8250=y
|
|
@@ -617,7 +600,6 @@ CONFIG_GPIO_BCM_EXP=y
|
|
CONFIG_GPIO_BCM_VIRT=y
|
|
CONFIG_GPIO_ARIZONA=m
|
|
CONFIG_GPIO_STMPE=y
|
|
-CONFIG_GPIO_MCP23S08=m
|
|
CONFIG_W1=m
|
|
CONFIG_W1_MASTER_DS2490=m
|
|
CONFIG_W1_MASTER_DS2482=m
|
|
@@ -635,7 +617,6 @@ CONFIG_W1_SLAVE_DS2760=m
|
|
CONFIG_W1_SLAVE_DS2780=m
|
|
CONFIG_W1_SLAVE_DS2781=m
|
|
CONFIG_W1_SLAVE_DS28E04=m
|
|
-CONFIG_W1_SLAVE_BQ27000=m
|
|
CONFIG_POWER_RESET_GPIO=y
|
|
CONFIG_BATTERY_DS2760=m
|
|
CONFIG_HWMON=m
|
|
@@ -647,19 +628,11 @@ CONFIG_THERMAL=y
|
|
CONFIG_BCM2835_THERMAL=y
|
|
CONFIG_WATCHDOG=y
|
|
CONFIG_BCM2835_WDT=y
|
|
-CONFIG_UCB1400_CORE=m
|
|
CONFIG_MFD_STMPE=y
|
|
CONFIG_STMPE_SPI=y
|
|
CONFIG_MFD_ARIZONA_I2C=m
|
|
CONFIG_MFD_ARIZONA_SPI=m
|
|
CONFIG_MFD_WM5102=y
|
|
-CONFIG_MEDIA_SUPPORT=m
|
|
-CONFIG_MEDIA_CAMERA_SUPPORT=y
|
|
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
|
|
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
|
|
-CONFIG_MEDIA_RADIO_SUPPORT=y
|
|
-CONFIG_MEDIA_RC_SUPPORT=y
|
|
-CONFIG_MEDIA_CONTROLLER=y
|
|
CONFIG_LIRC=m
|
|
CONFIG_RC_DEVICES=y
|
|
CONFIG_RC_ATI_REMOTE=m
|
|
@@ -671,6 +644,12 @@ CONFIG_IR_IGUANA=m
|
|
CONFIG_IR_TTUSBIR=m
|
|
CONFIG_RC_LOOPBACK=m
|
|
CONFIG_IR_GPIO_CIR=m
|
|
+CONFIG_MEDIA_SUPPORT=m
|
|
+CONFIG_MEDIA_CAMERA_SUPPORT=y
|
|
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
|
|
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
|
|
+CONFIG_MEDIA_RADIO_SUPPORT=y
|
|
+CONFIG_MEDIA_CONTROLLER=y
|
|
CONFIG_MEDIA_USB_SUPPORT=y
|
|
CONFIG_USB_VIDEO_CLASS=m
|
|
CONFIG_USB_M5602=m
|
|
@@ -731,7 +710,6 @@ CONFIG_VIDEO_PVRUSB2=m
|
|
CONFIG_VIDEO_HDPVR=m
|
|
CONFIG_VIDEO_USBVISION=m
|
|
CONFIG_VIDEO_STK1160_COMMON=m
|
|
-CONFIG_VIDEO_STK1160_AC97=y
|
|
CONFIG_VIDEO_GO7007=m
|
|
CONFIG_VIDEO_GO7007_USB=m
|
|
CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
|
|
@@ -817,9 +795,9 @@ CONFIG_VIDEO_OV7640=m
|
|
CONFIG_VIDEO_MT9V011=m
|
|
CONFIG_DRM=m
|
|
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
|
+CONFIG_DRM_UDL=m
|
|
CONFIG_DRM_PANEL_SIMPLE=m
|
|
CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
|
|
-CONFIG_DRM_UDL=m
|
|
CONFIG_DRM_VC4=m
|
|
CONFIG_FB=y
|
|
CONFIG_FB_BCM2708=y
|
|
@@ -835,19 +813,15 @@ CONFIG_LOGO=y
|
|
# CONFIG_LOGO_LINUX_VGA16 is not set
|
|
CONFIG_SOUND=y
|
|
CONFIG_SND=m
|
|
+CONFIG_SND_HRTIMER=m
|
|
CONFIG_SND_SEQUENCER=m
|
|
CONFIG_SND_SEQ_DUMMY=m
|
|
-CONFIG_SND_MIXER_OSS=m
|
|
-CONFIG_SND_PCM_OSS=m
|
|
-CONFIG_SND_SEQUENCER_OSS=y
|
|
-CONFIG_SND_HRTIMER=m
|
|
CONFIG_SND_DUMMY=m
|
|
CONFIG_SND_ALOOP=m
|
|
CONFIG_SND_VIRMIDI=m
|
|
CONFIG_SND_MTPAV=m
|
|
CONFIG_SND_SERIAL_U16550=m
|
|
CONFIG_SND_MPU401=m
|
|
-CONFIG_SND_BCM2835=m
|
|
CONFIG_SND_USB_AUDIO=m
|
|
CONFIG_SND_USB_UA101=m
|
|
CONFIG_SND_USB_CAIAQ=m
|
|
@@ -876,7 +850,6 @@ CONFIG_SND_SOC_AK4554=m
|
|
CONFIG_SND_SOC_CS4271_I2C=m
|
|
CONFIG_SND_SOC_WM8804_I2C=m
|
|
CONFIG_SND_SIMPLE_CARD=m
|
|
-CONFIG_SOUND_PRIME=m
|
|
CONFIG_HIDRAW=y
|
|
CONFIG_UHID=m
|
|
CONFIG_HID_A4TECH=m
|
|
@@ -1032,12 +1005,14 @@ CONFIG_USB_UEAGLEATM=m
|
|
CONFIG_USB_XUSBATM=m
|
|
CONFIG_MMC=y
|
|
CONFIG_MMC_BLOCK_MINORS=32
|
|
-CONFIG_MMC_BCM2835=y
|
|
+CONFIG_MMC_BCM2835_MMC=y
|
|
CONFIG_MMC_BCM2835_DMA=y
|
|
CONFIG_MMC_BCM2835_SDHOST=y
|
|
CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_PLTFM=y
|
|
+CONFIG_MMC_SDHCI_IPROC=m
|
|
CONFIG_MMC_SPI=m
|
|
+CONFIG_MMC_BCM2835=y
|
|
CONFIG_LEDS_CLASS=y
|
|
CONFIG_LEDS_GPIO=y
|
|
CONFIG_LEDS_TRIGGER_TIMER=y
|
|
@@ -1091,6 +1066,20 @@ CONFIG_DMA_BCM2708=y
|
|
CONFIG_UIO=m
|
|
CONFIG_UIO_PDRV_GENIRQ=m
|
|
CONFIG_STAGING=y
|
|
+CONFIG_IRDA=m
|
|
+CONFIG_IRLAN=m
|
|
+CONFIG_IRNET=m
|
|
+CONFIG_IRCOMM=m
|
|
+CONFIG_IRDA_ULTRA=y
|
|
+CONFIG_IRDA_CACHE_LAST_LSAP=y
|
|
+CONFIG_IRDA_FAST_RR=y
|
|
+CONFIG_IRTTY_SIR=m
|
|
+CONFIG_KINGSUN_DONGLE=m
|
|
+CONFIG_KSDAZZLE_DONGLE=m
|
|
+CONFIG_KS959_DONGLE=m
|
|
+CONFIG_USB_IRDA=m
|
|
+CONFIG_SIGMATEL_FIR=m
|
|
+CONFIG_MCS_FIR=m
|
|
CONFIG_PRISM2_USB=m
|
|
CONFIG_R8712U=m
|
|
CONFIG_R8188EU=m
|
|
@@ -1099,9 +1088,7 @@ CONFIG_SPEAKUP=m
|
|
CONFIG_SPEAKUP_SYNTH_SOFT=m
|
|
CONFIG_STAGING_MEDIA=y
|
|
CONFIG_LIRC_STAGING=y
|
|
-CONFIG_LIRC_IMON=m
|
|
CONFIG_LIRC_RPI=m
|
|
-CONFIG_LIRC_SASEM=m
|
|
CONFIG_FB_TFT=m
|
|
CONFIG_FB_TFT_AGM1264K_FL=m
|
|
CONFIG_FB_TFT_BD663474=m
|
|
@@ -1132,6 +1119,7 @@ CONFIG_FB_TFT_UPD161704=m
|
|
CONFIG_FB_TFT_WATTEROTT=m
|
|
CONFIG_FB_FLEX=m
|
|
CONFIG_FB_TFT_FBTFT_DEVICE=m
|
|
+CONFIG_SND_BCM2835=m
|
|
CONFIG_MAILBOX=y
|
|
CONFIG_BCM2835_MBOX=y
|
|
# CONFIG_IOMMU_SUPPORT is not set
|
|
@@ -1218,7 +1206,6 @@ CONFIG_CIFS_XATTR=y
|
|
CONFIG_CIFS_POSIX=y
|
|
CONFIG_CIFS_ACL=y
|
|
CONFIG_CIFS_DFS_UPCALL=y
|
|
-CONFIG_CIFS_SMB2=y
|
|
CONFIG_CIFS_FSCACHE=y
|
|
CONFIG_9P_FS=m
|
|
CONFIG_9P_FS_POSIX_ACL=y
|
|
@@ -1265,13 +1252,11 @@ CONFIG_PRINTK_TIME=y
|
|
CONFIG_BOOT_PRINTK_DELAY=y
|
|
CONFIG_DEBUG_MEMORY_INIT=y
|
|
CONFIG_DETECT_HUNG_TASK=y
|
|
-CONFIG_TIMER_STATS=y
|
|
CONFIG_LATENCYTOP=y
|
|
CONFIG_IRQSOFF_TRACER=y
|
|
CONFIG_SCHED_TRACER=y
|
|
CONFIG_STACK_TRACER=y
|
|
CONFIG_BLK_DEV_IO_TRACE=y
|
|
-# CONFIG_KPROBE_EVENT is not set
|
|
CONFIG_FUNCTION_PROFILER=y
|
|
CONFIG_KGDB=y
|
|
CONFIG_KGDB_KDB=y
|
|
@@ -1289,5 +1274,3 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
|
|
CONFIG_ARM64_CRYPTO=y
|
|
CONFIG_CRC_ITU_T=y
|
|
CONFIG_LIBCRC32C=y
|
|
-CONFIG_MMC_BCM2835_MMC=y
|
|
-CONFIG_MMC_SDHCI_IPROC=m
|
|
--
|
|
2.16.1
|
|
|