mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0
This commit is contained in:
commit
26e29e2ef1
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="bcm2835-driver"
|
PKG_NAME="bcm2835-driver"
|
||||||
PKG_VERSION="afc05b9"
|
PKG_VERSION="99a37d1"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="bcm2835-bootloader"
|
PKG_NAME="bcm2835-bootloader"
|
||||||
PKG_VERSION="afc05b9"
|
PKG_VERSION="99a37d1"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="arm"
|
PKG_ARCH="arm"
|
||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
|
@ -312,7 +312,6 @@ CONFIG_MACH_BCM2708=y
|
|||||||
CONFIG_BCM2708_GPIO=y
|
CONFIG_BCM2708_GPIO=y
|
||||||
CONFIG_BCM2708_VCMEM=y
|
CONFIG_BCM2708_VCMEM=y
|
||||||
# CONFIG_BCM2708_NOL2CACHE is not set
|
# CONFIG_BCM2708_NOL2CACHE is not set
|
||||||
CONFIG_BCM2708_DMAER=y
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Processor Type
|
# Processor Type
|
||||||
@ -379,11 +378,9 @@ CONFIG_FLATMEM_MANUAL=y
|
|||||||
CONFIG_FLATMEM=y
|
CONFIG_FLATMEM=y
|
||||||
CONFIG_FLAT_NODE_MEM_MAP=y
|
CONFIG_FLAT_NODE_MEM_MAP=y
|
||||||
CONFIG_HAVE_MEMBLOCK=y
|
CONFIG_HAVE_MEMBLOCK=y
|
||||||
CONFIG_MEMORY_ISOLATION=y
|
|
||||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||||
CONFIG_SPLIT_PTLOCK_CPUS=4
|
CONFIG_SPLIT_PTLOCK_CPUS=4
|
||||||
# CONFIG_COMPACTION is not set
|
# CONFIG_COMPACTION is not set
|
||||||
CONFIG_MIGRATION=y
|
|
||||||
# CONFIG_PHYS_ADDR_T_64BIT is not set
|
# CONFIG_PHYS_ADDR_T_64BIT is not set
|
||||||
CONFIG_ZONE_DMA_FLAG=0
|
CONFIG_ZONE_DMA_FLAG=0
|
||||||
CONFIG_VIRT_TO_BUS=y
|
CONFIG_VIRT_TO_BUS=y
|
||||||
@ -690,19 +687,7 @@ CONFIG_EXTRA_FIRMWARE=""
|
|||||||
# CONFIG_SYS_HYPERVISOR is not set
|
# CONFIG_SYS_HYPERVISOR is not set
|
||||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||||
# CONFIG_DMA_SHARED_BUFFER is not set
|
# CONFIG_DMA_SHARED_BUFFER is not set
|
||||||
CONFIG_CMA=y
|
# CONFIG_CMA is not set
|
||||||
# CONFIG_CMA_DEBUG is not set
|
|
||||||
|
|
||||||
#
|
|
||||||
# Default contiguous memory area size:
|
|
||||||
#
|
|
||||||
CONFIG_CMA_SIZE_MBYTES=16
|
|
||||||
CONFIG_CMA_SIZE_SEL_MBYTES=y
|
|
||||||
# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
|
|
||||||
# CONFIG_CMA_SIZE_SEL_MIN is not set
|
|
||||||
# CONFIG_CMA_SIZE_SEL_MAX is not set
|
|
||||||
CONFIG_CMA_ALIGNMENT=8
|
|
||||||
CONFIG_CMA_AREAS=7
|
|
||||||
# CONFIG_CONNECTOR is not set
|
# CONFIG_CONNECTOR is not set
|
||||||
# CONFIG_MTD is not set
|
# CONFIG_MTD is not set
|
||||||
# CONFIG_PARPORT is not set
|
# CONFIG_PARPORT is not set
|
||||||
@ -1054,7 +1039,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
|
|||||||
# CONFIG_RAW_DRIVER is not set
|
# CONFIG_RAW_DRIVER is not set
|
||||||
# CONFIG_TCG_TPM is not set
|
# CONFIG_TCG_TPM is not set
|
||||||
CONFIG_BRCM_CHAR_DRIVERS=y
|
CONFIG_BRCM_CHAR_DRIVERS=y
|
||||||
CONFIG_BCM_VC_CMA=y
|
|
||||||
CONFIG_I2C=y
|
CONFIG_I2C=y
|
||||||
CONFIG_I2C_BOARDINFO=y
|
CONFIG_I2C_BOARDINFO=y
|
||||||
# CONFIG_I2C_COMPAT is not set
|
# CONFIG_I2C_COMPAT is not set
|
||||||
|
Loading…
x
Reference in New Issue
Block a user