diff options
-rw-r--r-- | target/arm/bcm28xx/patches/4.4.10/0001-raspberry-pi-github.patch | 2 | ||||
-rw-r--r-- | target/arm/kernel/raspberry-pi3 | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.dma | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.graphics | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.i2c | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.kernel | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.spi | 2 |
7 files changed, 7 insertions, 10 deletions
diff --git a/target/arm/bcm28xx/patches/4.4.10/0001-raspberry-pi-github.patch b/target/arm/bcm28xx/patches/4.4.10/0001-raspberry-pi-github.patch index 45df39fbf..60caefd3b 100644 --- a/target/arm/bcm28xx/patches/4.4.10/0001-raspberry-pi-github.patch +++ b/target/arm/bcm28xx/patches/4.4.10/0001-raspberry-pi-github.patch @@ -7701,7 +7701,7 @@ diff -Nur linux-4.4.8/arch/arm/configs/bcm2709_defconfig linux-rpi/arch/arm/conf @@ -0,0 +1,1275 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_PHYS_OFFSET=0 -+CONFIG_LOCALVERSION="-v7" ++# CONFIG_LOCALVERSION is not set +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y diff --git a/target/arm/kernel/raspberry-pi3 b/target/arm/kernel/raspberry-pi3 index dd55d7ddf..27610cc02 100644 --- a/target/arm/kernel/raspberry-pi3 +++ b/target/arm/kernel/raspberry-pi3 @@ -14,5 +14,4 @@ CONFIG_BCM2708_VCHIQ=y CONFIG_BCM2708_VCMEM=y CONFIG_MAILBOX=y CONFIG_BCM2835_MBOX=y -CONFIG_OF=y CONFIG_CMDLINE_FROM_BOOTLOADER=y diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma index 47da4db97..18dc2bd20 100644 --- a/target/linux/config/Config.in.dma +++ b/target/linux/config/Config.in.dma @@ -51,12 +51,12 @@ config ADK_KERNEL_BCM_VC_CMA config ADK_KERNEL_BCM_VCIO bool -config ADK_KERNEL_DMA_BCM2708_LEGACY +config ADK_KERNEL_DMA_BCM2835 bool config ADK_KERNEL_DMA_BCM2708 bool - select ADK_KERNEL_DMA_BCM2708_LEGACY + select ADK_KERNEL_DMA_BCM2835 select ADK_KERNEL_DMADEVICES select ADK_KERNEL_DMA_SHARED_BUFFER select ADK_KERNEL_CMA diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index dd3adfba7..0af70a757 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -243,8 +243,6 @@ config ADK_KERNEL_FB_SM7XX config ADK_KERNEL_FB_BCM2708 bool "Framebuffer support for BCM28XX boards" - select ADK_KERNEL_DRM if ADK_TARGET_KERNEL_VERSION_4_4 - select ADK_KERNEL_DRM_VC4 if ADK_TARGET_KERNEL_VERSION_4_4 select ADK_KERNEL_FB select ADK_KERNEL_FRAMEBUFFER_CONSOLE select ADK_KERNEL_FONT_8x16 diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c index 6dff40fe2..13149c47d 100644 --- a/target/linux/config/Config.in.i2c +++ b/target/linux/config/Config.in.i2c @@ -17,7 +17,7 @@ config ADK_KERNEL_I2C_BCM2708 select ADK_KERNEL_REGMAP_I2C select ADK_KERNEL_I2C_CHARDEV depends on ADK_TARGET_BOARD_BCM28XX - default y if ADK_TARGET_BOARD_BCM28XX + default m if ADK_TARGET_BOARD_BCM28XX default n help I2C driver for BCM28XX boards. diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index e4a95d94f..9478e2860 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -195,9 +195,9 @@ config ADK_KERNEL_SMP config ADK_KERNEL_HIGHMEM bool "Enable high memory" + # produces broken kernel on bcm28xx + depends on !ADK_TARGET_BOARD_BCM28XX default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2 - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3 default y if ADK_TARGET_MODEL_CUBOX_I4PRO default y if ADK_TARGET_MODEL_CUBOX_I2ULTRA default y if ADK_TARGET_MODEL_CUBOX_I2EX diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index b7c1df0a7..fe77cc921 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -34,7 +34,7 @@ config ADK_KERNEL_SPI_BCM2835 select ADK_KERNEL_REGMAP select ADK_KERNEL_REGMAP_SPI depends on ADK_TARGET_BOARD_BCM28XX - default y if ADK_TARGET_BOARD_BCM28XX + default m if ADK_TARGET_BOARD_BCM28XX default n config ADK_KERNEL_SPI_IMX |