diff options
-rw-r--r-- | package/gpu-viv-bin-mx6q/Makefile | 6 | ||||
-rw-r--r-- | package/imx-lib/Makefile | 5 | ||||
-rw-r--r-- | package/imx-lib/patches/patch-hdmi-cec_Makefile | 27 | ||||
-rw-r--r-- | package/imx-lib/patches/patch-ipu_Makefile | 27 | ||||
-rw-r--r-- | package/imx-lib/patches/patch-pxp_Makefile | 27 | ||||
-rw-r--r-- | package/imx-lib/patches/patch-sim_Makefile | 10 | ||||
-rw-r--r-- | target/appliances/kodi.appliance | 11 | ||||
-rw-r--r-- | target/arm/systems/raspberry-pi2 | 1 | ||||
-rw-r--r-- | target/arm/systems/solidrun-imx6 | 1 | ||||
-rw-r--r-- | target/config/Config.in.cpu | 20 | ||||
-rw-r--r-- | target/config/Config.in.fpu.choice | 6 | ||||
-rw-r--r-- | target/config/Config.in.fpu.default | 14 | ||||
-rw-r--r-- | target/config/Config.in.libc.choice | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.audio | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.kernel | 4 |
15 files changed, 118 insertions, 44 deletions
diff --git a/package/gpu-viv-bin-mx6q/Makefile b/package/gpu-viv-bin-mx6q/Makefile index c73e22687..cf1303b4a 100644 --- a/package/gpu-viv-bin-mx6q/Makefile +++ b/package/gpu-viv-bin-mx6q/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gpu-viv-bin-mx6q -PKG_VERSION:= 3.10.17-1.0.0 +PKG_VERSION:= 3.10.31-1.1.0-beta PKG_RELEASE:= 1 -PKG_HASH:= 7e5a3db22b99740756f408b881691f81c03090256754e44f69369bf039e9cbcf -PKG_DESCR:= IMX GPU library (Freescale) +PKG_HASH:= c132de60b28c73e8d6ea12219151ca9a0a0bb4f73d62ca1bdd0feac6db0d964e +PKG_DESCR:= imx gpu library (vivante gpu) PKG_SECTION:= libs/video PKG_URL:= http://www.freescale.com/ PKG_SITES:= http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/ diff --git a/package/imx-lib/Makefile b/package/imx-lib/Makefile index fbd1b4fcd..15ad99b2c 100644 --- a/package/imx-lib/Makefile +++ b/package/imx-lib/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= imx-lib -PKG_VERSION:= 3.10.53-1.1.0 +PKG_VERSION:= 3.10.31-1.1.0-beta PKG_RELEASE:= 1 -PKG_HASH:= 4db2c1f286f2478b8236e62de4df9d2a2c26ff727c752dc4f21e2910f4a5e5d7 +PKG_HASH:= 011eb34c6fd1b1ea9894bbe07a539c1aeee1500bc8fdd29d8ce1dc1d02f79e24 PKG_DESCR:= IMX library (Freescale) PKG_SECTION:= libs/video PKG_URL:= http://www.freescale.com/ @@ -24,7 +24,6 @@ TARGET_CPPFLAGS+= -I${LINUX_DIR}/drivers/mxc/security/rng/include \ -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \ -idirafter $(LINUX_DIR)/include/uapi MAKE_ENV+= PLATFORM=IMX6Q -FAKE_FLAGS+= DEST_DIR=$(WRKINST) CONFIG_STYLE:= manual imx-lib-install: diff --git a/package/imx-lib/patches/patch-hdmi-cec_Makefile b/package/imx-lib/patches/patch-hdmi-cec_Makefile index ba404e621..020998bd6 100644 --- a/package/imx-lib/patches/patch-hdmi-cec_Makefile +++ b/package/imx-lib/patches/patch-hdmi-cec_Makefile @@ -1,11 +1,26 @@ ---- imx-lib-3.10.53-1.1.0.orig/hdmi-cec/Makefile 2014-12-23 03:34:05.000000000 -0600 -+++ imx-lib-3.10.53-1.1.0/hdmi-cec/Makefile 2015-03-08 13:57:44.305700918 -0500 -@@ -33,7 +33,7 @@ all install : +--- imx-lib-3.10.17-1.0.0.orig/hdmi-cec/Makefile 2014-01-16 15:27:12.000000000 +0100 ++++ imx-lib-3.10.17-1.0.0/hdmi-cec/Makefile 2014-08-27 08:38:14.339600710 +0200 +@@ -21,18 +21,18 @@ endif + all: $(LIBNAME).so $(LIBNAME).a + + install: install_headers +- @mkdir -p $(DEST_DIR)/usr/lib +- cp -P $(LIBNAME).* $(DEST_DIR)/usr/lib ++ @mkdir -p $(DESTDIR)/usr/lib ++ cp -P $(LIBNAME).* $(DESTDIR)/usr/lib + + install_headers: +- @mkdir -p $(DEST_DIR)/usr/include +- cp hdmi-cec.h $(DEST_DIR)/usr/include ++ @mkdir -p $(DESTDIR)/usr/include ++ cp hdmi-cec.h $(DESTDIR)/usr/include + else + all install : endif %.o: %.c -- $(CC) -D$(PLATFORM) -Wall -fPIC $(CFLAGS) -c $^ -o $@ -+ $(CC) -D$(PLATFORM) $(CPPFLAGS) $(CFLAGS) -fPIC -c $^ -o $@ +- $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@ ++ $(CC) -D$(PLATFORM) $(CFLAGS) -fPIC -c $^ -o $@ $(LIBNAME).so.$(SONAMEVERSION): $(OBJ) - $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS) + $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ diff --git a/package/imx-lib/patches/patch-ipu_Makefile b/package/imx-lib/patches/patch-ipu_Makefile index 639691a50..6016a1a26 100644 --- a/package/imx-lib/patches/patch-ipu_Makefile +++ b/package/imx-lib/patches/patch-ipu_Makefile @@ -1,11 +1,28 @@ ---- imx-lib-3.10.53-1.1.0.orig/ipu/Makefile 2014-12-23 03:34:05.000000000 -0600 -+++ imx-lib-3.10.53-1.1.0/ipu/Makefile 2015-03-08 13:58:13.577700650 -0500 -@@ -38,7 +38,7 @@ $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVER +--- imx-lib-3.10.17-1.0.0.orig/ipu/Makefile 2014-01-16 15:27:12.000000000 +0100 ++++ imx-lib-3.10.17-1.0.0/ipu/Makefile 2014-08-27 08:37:52.467524299 +0200 +@@ -17,11 +17,11 @@ ifeq ($(PLATFORM), $(findstring $(PLATFO + all: $(LIBNAME).so + + install: +- @mkdir -p $(DEST_DIR)/usr/lib +- cp -P $(LIBNAME).* $(DEST_DIR)/usr/lib +- @mkdir -p $(DEST_DIR)/usr/include +- cp mxc_ipu_hl_lib.h $(DEST_DIR)/usr/include +- cp ipu.h $(DEST_DIR)/usr/include ++ @mkdir -p $(DESTDIR)/usr/lib ++ cp -P $(LIBNAME).* $(DESTDIR)/usr/lib ++ @mkdir -p $(DESTDIR)/usr/include ++ cp mxc_ipu_hl_lib.h $(DESTDIR)/usr/include ++ cp ipu.h $(DESTDIR)/usr/include + else + all install: + @echo "Not support platform, will not complile" +@@ -37,7 +37,7 @@ $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVER ifeq "$(PLATFORM)" "" $(error "Unspecified PLATFORM variable") endif -- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@ -+ $(CC) -D$(PLATFORM) $(CPPFLAGS) $(CFLAGS) -fPIC -c $^ -o $@ +- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ ++ $(CC) -D$(PLATFORM) $(CFLAGS) -fPIC -c $^ -o $@ .PHONY: clean clean: diff --git a/package/imx-lib/patches/patch-pxp_Makefile b/package/imx-lib/patches/patch-pxp_Makefile index 13bb1eddb..b38c12807 100644 --- a/package/imx-lib/patches/patch-pxp_Makefile +++ b/package/imx-lib/patches/patch-pxp_Makefile @@ -1,11 +1,26 @@ ---- imx-lib-3.10.53-1.1.0.orig/pxp/Makefile 2014-12-23 03:34:05.000000000 -0600 -+++ imx-lib-3.10.53-1.1.0/pxp/Makefile 2015-03-08 13:57:06.325701267 -0500 -@@ -27,7 +27,7 @@ all install : +--- imx-lib-3.10.17-1.0.0.orig/pxp/Makefile 2014-01-16 15:27:12.000000000 +0100 ++++ imx-lib-3.10.17-1.0.0/pxp/Makefile 2014-08-27 08:37:26.291432836 +0200 +@@ -15,18 +15,18 @@ ifeq ($(PLATFORM), $(findstring $(PLATFO + all: $(LIBNAME).so $(LIBNAME).a + + install: install_headers +- @mkdir -p $(DEST_DIR)/usr/lib +- cp -P $(LIBNAME).* $(DEST_DIR)/usr/lib ++ @mkdir -p $(DESTDIR)/usr/lib ++ cp -P $(LIBNAME).* $(DESTDIR)/usr/lib + + install_headers: +- @mkdir -p $(DEST_DIR)/usr/include +- cp pxp_lib.h $(DEST_DIR)/usr/include ++ @mkdir -p $(DESTDIR)/usr/include ++ cp pxp_lib.h $(DESTDIR)/usr/include + else + all install : endif %.o: %.c -- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@ -+ $(CC) -D$(PLATFORM) $(CPPFLAGS) $(CFLAGS) -fPIC -c $^ -o $@ +- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ ++ $(CC) -D$(PLATFORM) $(CFLAGS) -fPIC -c $^ -o $@ $(LIBNAME).so.$(SONAMEVERSION): $(OBJ) - $(CC) -shared -nostartfiles -Wl,-soname,$@ $(LFLAGS) $^ -o $@ $(LDFLAGS) + $(CC) -shared -nostartfiles -Wl,-soname,$@ $(LFLAGS) $^ -o $@ diff --git a/package/imx-lib/patches/patch-sim_Makefile b/package/imx-lib/patches/patch-sim_Makefile index 786b19b66..6a592d49f 100644 --- a/package/imx-lib/patches/patch-sim_Makefile +++ b/package/imx-lib/patches/patch-sim_Makefile @@ -1,11 +1,11 @@ ---- imx-lib-3.10.53-1.1.0.orig/sim/Makefile 2014-12-23 03:34:05.000000000 -0600 -+++ imx-lib-3.10.53-1.1.0/sim/Makefile 2015-03-08 14:09:51.269694263 -0500 -@@ -28,7 +28,7 @@ $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVER +--- imx-lib-3.10.17-1.0.0.orig/sim/Makefile 2014-01-16 15:27:12.000000000 +0100 ++++ imx-lib-3.10.17-1.0.0/sim/Makefile 2014-08-27 08:30:04.293885958 +0200 +@@ -27,7 +27,7 @@ $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVER ln -s $< $@ %.o: %.c -- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@ -+ $(CC) -D$(PLATFORM) $(CPPFLAGS) $(CFLAGS) -fPIC -c $^ -o $@ +- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ ++ $(CC) -D$(PLATFORM) $(CFLAGS) -c $^ -o $@ else all install : diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance index 492684dca..a126972ae 100644 --- a/target/appliances/kodi.appliance +++ b/target/appliances/kodi.appliance @@ -5,12 +5,6 @@ config ADK_APPLIANCE_KODI select ADK_PACKAGE_GLIBC select ADK_PACKAGE_GLIBC_GCONV select ADK_PACKAGE_KODI - select ADK_PACKAGE_KODI_WITH_SMB - select ADK_PACKAGE_KODI_WITH_NFS - select ADK_PACKAGE_KODI_WITH_SSH - select ADK_PACKAGE_KODI_WITH_RTMP - select ADK_PACKAGE_KODI_WITH_BLURAY - select ADK_PACKAGE_KODI_WITH_WEBSERVER select ADK_PACKAGE_DROPBEAR select ADK_PACKAGE_DROPBEAR_WITH_UTMP select ADK_PACKAGE_E2FSCK @@ -28,6 +22,9 @@ config ADK_APPLIANCE_KODI select ADK_PACKAGE_BCM28XX_BOOTLOADER_EXTRA if ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_PACKAGE_BCM28XX_VC_LIBS if ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_PACKAGE_BCM28XX_VC_GL_LIBS if ADK_TARGET_SYSTEM_RASPBERRY_PI + select ADK_PACKAGE_LIBFSLVPUWRAP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + select ADK_PACKAGE_GPU_VIV_BIN_MX6Q if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 help - Create a small kodi multimedia appliance. + Create a small kodi multimedia appliance. Please enable additional features + in Package/Multimedia diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2 index 0ca33a131..6aae1f623 100644 --- a/target/arm/systems/raspberry-pi2 +++ b/target/arm/systems/raspberry-pi2 @@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI2 select ADK_raspberry_pi2 select ADK_TARGET_LITTLE_ENDIAN select ADK_CPU_CORTEX_A7 - select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6 index ebda88096..ddb274be1 100644 --- a/target/arm/systems/solidrun-imx6 +++ b/target/arm/systems/solidrun-imx6 @@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_solidrun_imx6 select ADK_TARGET_LITTLE_ENDIAN select ADK_CPU_CORTEX_A9 - select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_CPU_FREQ diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 10909a12e..1dcd72fd0 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -77,22 +77,40 @@ config ADK_CPU_CORTEX_M4 bool select ADK_TARGET_WITH_LT +config ADK_CPU_CORTEX_A5 + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_WITH_FPU_VFPV3 + select ADK_TARGET_CPU_WITH_NEON + config ADK_CPU_CORTEX_A7 bool select ADK_TARGET_WITH_NPTL select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV4 + select ADK_TARGET_CPU_WITH_NEON config ADK_CPU_CORTEX_A8 bool select ADK_TARGET_WITH_NPTL select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_WITH_FPU_VFPV3 + select ADK_TARGET_CPU_WITH_NEON config ADK_CPU_CORTEX_A9 bool select ADK_TARGET_WITH_NPTL select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV3 + select ADK_TARGET_CPU_WITH_NEON + +config ADK_CPU_CORTEX_A15 + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_WITH_FPU_VFPV4 + select ADK_TARGET_CPU_WITH_NEON config ADK_CPU_CORTEX_A53 bool @@ -306,9 +324,11 @@ config ADK_TARGET_GCC_CPU default "arm1176jzf-s" if ADK_CPU_ARM1176JZF_S default "arm926ej-s" if ADK_CPU_ARM926EJ_S default "armv8-a" if ADK_CPU_ARMV8 + default "cortex-a5" if ADK_CPU_CORTEX_A5 default "cortex-a7" if ADK_CPU_CORTEX_A7 default "cortex-a8" if ADK_CPU_CORTEX_A8 default "cortex-a9" if ADK_CPU_CORTEX_A9 + default "cortex-a15" if ADK_CPU_CORTEX_A15 default "cortex-a53" if ADK_CPU_CORTEX_A53 default "cortex-a57" if ADK_CPU_CORTEX_A57 default "cortex-m3" if ADK_CPU_CORTEX_M3 diff --git a/target/config/Config.in.fpu.choice b/target/config/Config.in.fpu.choice index 43df6220c..47ac22ddd 100644 --- a/target/config/Config.in.fpu.choice +++ b/target/config/Config.in.fpu.choice @@ -1,3 +1,9 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +config ADK_TARGET_ARCH_ARM_WITH_NEON + bool "enable NEON SIMD support" + depends on ADK_TARGET_ARCH_ARM + default n + help + Enable support for NEON SIMD CPU extensions. diff --git a/target/config/Config.in.fpu.default b/target/config/Config.in.fpu.default index c55b0a602..55c00e0a5 100644 --- a/target/config/Config.in.fpu.default +++ b/target/config/Config.in.fpu.default @@ -4,7 +4,13 @@ config ADK_TARGET_FPU string depends on ADK_TARGET_ARCH_ARM - default "neon" if ADK_TARGET_CPU_WITH_NEON - default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP - default "vfpv3" if ADK_TARGET_CPU_WITH_FPU_VFPV3 - default "vfpv4" if ADK_TARGET_CPU_WITH_FPU_VFPV4 + default "vfpv3-fp16" if ADK_CPU_CORTEX_A5 && !ADK_TARGET_ARCH_ARM_WITH_NEON + default "vfpv4" if ADK_CPU_CORTEX_A7 && !ADK_TARGET_ARCH_ARM_WITH_NEON + default "vfpv3" if ADK_CPU_CORTEX_A8 && !ADK_TARGET_ARCH_ARM_WITH_NEON + default "vfpv3-fp16" if ADK_CPU_CORTEX_A9 && !ADK_TARGET_ARCH_ARM_WITH_NEON + default "vfpv4" if ADK_CPU_CORTEX_A15 && !ADK_TARGET_ARCH_ARM_WITH_NEON + default "neon-fp16" if ADK_CPU_CORTEX_A5 && ADK_TARGET_ARCH_ARM_WITH_NEON + default "neon-vfpv4" if ADK_CPU_CORTEX_A7 && ADK_TARGET_ARCH_ARM_WITH_NEON + default "neon" if ADK_CPU_CORTEX_A8 && ADK_TARGET_ARCH_ARM_WITH_NEON + default "neon-fp16" if ADK_CPU_CORTEX_A9 && ADK_TARGET_ARCH_ARM_WITH_NEON + default "neon-vfpv4" if ADK_CPU_CORTEX_A15 && ADK_TARGET_ARCH_ARM_WITH_NEON diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 9a892d889..f45f86591 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -51,6 +51,7 @@ config ADK_TARGET_LIB_GLIBC config ADK_TARGET_LIB_UCLIBC bool "uClibc embedded C library" select ADK_uclibc + depends on ADK_BROKEN depends on \ !ADK_TARGET_ARCH_AARCH64 && \ !ADK_TARGET_ARCH_ALPHA && \ diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 7566b8cdd..5fc901854 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -207,7 +207,7 @@ config ADK_KERNEL_SND_IMX_SOC select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI select ADK_KERNEL_SND_SOC_IMX_SPDIF - select ADK_KERNEL_SND_SOC_IMX_SGTL5000 + select ADK_KERNEL_SND_SOC_IMX_SGTL5000 if ADK_TARGET_HUMMINGBOARD_I2EX select ADK_KERNEL_SND_SOC_FSL_ASRC select ADK_KERNEL_SND_SOC_FSL_SPDIF select ADK_KERNEL_REGMAP_SPI diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 9583beeff..95904d9af 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -198,11 +198,11 @@ config ADK_KERNEL_VFPv4 config ADK_KERNEL_NEON bool - default y if ADK_TARGET_CPU_WITH_NEON + default y if ADK_TARGET_ARCH_ARM_WITH_NEON config ADK_KERNEL_MODE_NEON bool - default y if ADK_TARGET_CPU_WITH_NEON + default y if ADK_TARGET_ARCH_ARM_WITH_NEON config ADK_TARGET_NO_CMDLINE bool "Do not builtin any kernel cmdline" |