projects/imx6: use galcore v5 on linux 4.4

This commit is contained in:
Peter Vicman 2017-05-11 17:44:42 +02:00
parent 73e0b6b5a4
commit 49e316bc98
2 changed files with 17 additions and 17 deletions

View File

@ -1475,9 +1475,9 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y
CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE="" CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin"
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_EXTRA_FIRMWARE_DIR="firmware"
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
CONFIG_WANT_DEV_COREDUMP=y CONFIG_WANT_DEV_COREDUMP=y
CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_ALLOW_DEV_COREDUMP=y
CONFIG_DEV_COREDUMP=y CONFIG_DEV_COREDUMP=y
@ -5860,7 +5860,8 @@ CONFIG_MXC_IPU=y
# #
# Vivante GPU support # Vivante GPU support
# #
CONFIG_MXC_GPU_VIV=y # CONFIG_MXC_GPU_VIV is not set
CONFIG_MXC_GPU_VIV_V5=y
CONFIG_MXC_IPU_V3_FSL=y CONFIG_MXC_IPU_V3_FSL=y
# #

View File

@ -33,13 +33,17 @@
KERNEL_TARGET="zImage" KERNEL_TARGET="zImage"
# Kernel extra targets to build # Kernel extra targets to build
KERNEL_UBOOT_EXTRA_TARGET="imx6q-cubox-i.dtb imx6dl-cubox-i.dtb \ KERNEL_UBOOT_EXTRA_TARGET="
imx6q-hummingboard.dtb imx6dl-hummingboard.dtb \ imx6q-cubox-i.dtb imx6dl-cubox-i.dtb \
imx6q-hummingboard2.dtb imx6dl-hummingboard2.dtb \ imx6q-cubox-i-som-v15.dtb imx6dl-cubox-i-som-v15.dtb \
imx6q-tbs2910.dtb \ imx6q-hummingboard.dtb imx6dl-hummingboard.dtb \
imx6q-udoo.dtb imx6dl-udoo.dtb \ imx6q-hummingboard-som-v15.dtb imx6dl-hummingboard-som-v15.dtb \
imx6q-udoo-7lvds.dtb imx6dl-udoo-7lvds.dtb \ imx6q-hummingboard2.dtb imx6dl-hummingboard2.dtb \
imx6q-udoo-15lvds.dtb imx6dl-udoo-15lvds.dtb" imx6q-hummingboard2-som-v15.dtb imx6dl-hummingboard2-som-v15.dtb \
imx6q-tbs2910.dtb \
imx6q-udoo.dtb imx6dl-udoo.dtb \
imx6q-udoo-7lvds.dtb imx6dl-udoo-7lvds.dtb \
imx6q-udoo-15lvds.dtb imx6dl-udoo-15lvds.dtb"
# Additional kernel make parameters (for example to specify the u-boot loadaddress) # Additional kernel make parameters (for example to specify the u-boot loadaddress)
KERNEL_MAKE_EXTRACMD="" KERNEL_MAKE_EXTRACMD=""
@ -49,11 +53,6 @@
if [ "$LINUX_VERSION" = "sr-3.14" ]; then if [ "$LINUX_VERSION" = "sr-3.14" ]; then
LINUX="imx6-3.14-sr" LINUX="imx6-3.14-sr"
KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET \
imx6q-cubox-i-som-v15.dtb imx6dl-cubox-i-som-v15.dtb \
imx6q-hummingboard-som-v15.dtb imx6dl-hummingboard-som-v15.dtb \
imx6q-hummingboard2-som-v15.dtb imx6dl-hummingboard2-som-v15.dtb"
# OpenGL-ES implementation to use # OpenGL-ES implementation to use
OPENGLES="imx-gpu-viv" OPENGLES="imx-gpu-viv"
elif [ "$LINUX_VERSION" = "xbian-4.8" ]; then elif [ "$LINUX_VERSION" = "xbian-4.8" ]; then
@ -67,7 +66,7 @@
LIBCEC_TYPE="xbian" LIBCEC_TYPE="xbian"
# OpenGL-ES implementation to use # OpenGL-ES implementation to use
OPENGLES="gpu-viv-bin-mx6q" OPENGLES="imx-gpu-viv"
fi fi
################################################################################ ################################################################################