diff --git a/aports/linux-motorola-titan/APKBUILD b/aports/linux-motorola-titan/APKBUILD index f49b0736..2c20e008 100644 --- a/aports/linux-motorola-titan/APKBUILD +++ b/aports/linux-motorola-titan/APKBUILD @@ -107,6 +107,6 @@ package() { sha512sums="1a5599b1fe0d36a9804b2379cfc69f07ebd6f2fa472c7a7e4ae070131728c46db5f2b9766af282fd64ea075772f700c3b816ca7b7c90d24e21e9da289317ca37 linux-motorola-titan-09cff47d6b79b73ecc3461e227abf09faaa9e754.zip 80857bddbd9fcb93cec4e178c2fd377d39b1bd85454330c02866628942be826f2c1f77e0df3b77f41e893d3d04ee6e18b27fcfc6cda637fafc733916f2f5340d config-motorola-titan.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h -1cb3675952849acc83eac76787f35869021a98f07a9989f3835ff64f63ffe35b5c734e58f71b3f0418ae4c2e15e663be18956e832162b2f9ed6414e9fb3df594 changes1.patch -07753b5925524e2e319a0e5b9814afa8d78b615837fd76d505d356adc1600564798abc7b5f096b1e1e2ac185e781ab7785d296c69f0f654ee426ebe4e4edfc02 gcc5-compile.patch -64aeb4ba3609e5f3da12214a20c56147565706e04ee7fecc25a0a65868cbe791ccee23c9b08a499cd7de608a1cb3c56e074cefe2ecebd69df6b1151445f96218 Wno-error.patch" +00bd2504cb922204c3b6a9ce243918f44d12f08e12f64535b9ec9f91d827160c4d5da85c3b84788a5f92d9eca63552265a203916505918367e2d397edbe148a8 changes1.patch +4c13711fdcdce3ac0c4d30b79da7a331a9f32d46ad0b9572419b82d58db6eed76f728a340848d66a6378702749c56247439abb26fc1df0d3f5cfd1ef5b53acf9 gcc5-compile.patch +d77966385f1aeb17fad6c3989766e874fea9d5818433d0c92c106dfd9aa3065102f018afb38678b0d741192d9efa4ede0ac4278802bf0878e3dec62dec64f50c Wno-error.patch" diff --git a/aports/linux-motorola-titan/Wno-error.patch b/aports/linux-motorola-titan/Wno-error.patch index 6d99a78c..eeced123 100644 --- a/aports/linux-motorola-titan/Wno-error.patch +++ b/aports/linux-motorola-titan/Wno-error.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile_noerror +--- a/Makefile ++++ b/Makefile @@ -371,9 +371,8 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ diff --git a/aports/linux-motorola-titan/changes1.patch b/aports/linux-motorola-titan/changes1.patch index 870bce30..1856956f 100644 --- a/aports/linux-motorola-titan/changes1.patch +++ b/aports/linux-motorola-titan/changes1.patch @@ -1,5 +1,5 @@ ---- arch/arm/include/asm/ftrace.h -+++ ftrace2.h +--- a/arch/arm/include/asm/ftrace.h ++++ b/arch/arm/include/asm/ftrace.h @@ -45,7 +45,7 @@ #else @@ -9,8 +9,8 @@ { return NULL; } ---- arch/arm/kernel/return_address.c -+++ ret_address.c +--- a/arch/arm/kernel/return_address.c ++++ b/arch/arm/kernel/return_address.c @@ -58,11 +58,6 @@ #else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */ diff --git a/aports/linux-motorola-titan/gcc5-compile.patch b/aports/linux-motorola-titan/gcc5-compile.patch index 88f7113f..af6e7a55 100644 --- a/aports/linux-motorola-titan/gcc5-compile.patch +++ b/aports/linux-motorola-titan/gcc5-compile.patch @@ -8,17 +8,13 @@ Subject: [PATCH] toolchain: multiple fixes and changes for gcc 5.0.0 drivers/gpu/msm/Makefile | 3 +++ drivers/gpu/msm/adreno_ringbuffer.c | 4 ++-- drivers/gpu/msm/kgsl_iommu.c | 4 ++-- - drivers/media/platform/msm/camera_oppo_v2/isp/Makefile | 3 +++ - drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile | 3 +++ .../platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c | 14 +++++++------- drivers/media/video/Makefile | 2 ++ drivers/mmc/host/Makefile | 2 ++ drivers/staging/prima/CORE/HDD/src/wlan_hdd_wmm.c | 2 +- - drivers/staging/prima/Kbuild | 3 +++ drivers/video/msm/mdss/Makefile | 3 +++ drivers/video/msm/mdss/mdss_mdp_pp.c | 2 +- fs/fat/Makefile | 2 ++ - kernel/Makefile | 2 ++ mm/Makefile | 2 ++ mm/rmap.c | 2 +- sound/soc/codecs/Makefile | 3 +++ @@ -93,95 +89,6 @@ index 1680a679fb0..6a1f62a8a94 100644 unsigned int *cmds) { struct kgsl_device *device = mmu->device; -diff --git a/drivers/media/platform/msm/camera_oppo_v2/isp/Makefile b/drivers/media/platform/msm/camera_oppo_v2/isp/Makefile -index 819f9defbff..17c2d2e99dd 100644 ---- a/drivers/media/platform/msm/camera_oppo_v2/isp/Makefile -+++ b/drivers/media/platform/msm/camera_oppo_v2/isp/Makefile -@@ -1,3 +1,6 @@ -+ -+EXTRA_CFLAGS += -Wno-array-bounds -+ - ccflags-y += -Idrivers/media/platform/msm/camera_oppo_v2 - ccflags-y += -Idrivers/media/platform/msm/camera_oppo_v2/sensor/io - obj-$(CONFIG_MSMB_CAMERA) += msm_isp.o msm_buf_mgr.o msm_isp_util.o msm_isp_axi_util.o msm_isp_stats_util.o -diff --git a/drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile b/drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile -index ebb884dab8a..9e0440da8aa 100644 ---- a/drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile -+++ b/drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile -@@ -1,3 +1,6 @@ -+ -+EXTRA_CFLAGS += -Wno-array-bounds -+ - ccflags-y += -Idrivers/media/platform/msm/camera_oppo_v2 - ccflags-y += -Idrivers/media/platform/msm/camera_oppo_v2/sensor/io - obj-$(CONFIG_MSM_CSID) += msm_ispif.o -diff --git a/drivers/media/platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c b/drivers/media/platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c -index 5cc51ffa573..c456cc6557c 100644 ---- a/drivers/media/platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c -+++ b/drivers/media/platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c -@@ -27,7 +27,7 @@ - #define JPEG_DEC_ID 2 - #define UINT32_MAX (0xFFFFFFFFU) - --inline void msm_jpeg_q_init(char const *name, struct msm_jpeg_q *q_p) -+static inline void msm_jpeg_q_init(char const *name, struct msm_jpeg_q *q_p) - { - JPEG_DBG("%s:%d] %s\n", __func__, __LINE__, name); - q_p->name = name; -@@ -37,7 +37,7 @@ inline void msm_jpeg_q_init(char const *name, struct msm_jpeg_q *q_p) - q_p->unblck = 0; - } - --inline void *msm_jpeg_q_out(struct msm_jpeg_q *q_p) -+static inline void *msm_jpeg_q_out(struct msm_jpeg_q *q_p) - { - unsigned long flags; - struct msm_jpeg_q_entry *q_entry_p = NULL; -@@ -63,7 +63,7 @@ inline void *msm_jpeg_q_out(struct msm_jpeg_q *q_p) - return data; - } - --inline int msm_jpeg_q_in(struct msm_jpeg_q *q_p, void *data) -+static inline int msm_jpeg_q_in(struct msm_jpeg_q *q_p, void *data) - { - unsigned long flags; - -@@ -85,7 +85,7 @@ inline int msm_jpeg_q_in(struct msm_jpeg_q *q_p, void *data) - return 0; - } - --inline int msm_jpeg_q_in_buf(struct msm_jpeg_q *q_p, -+static inline int msm_jpeg_q_in_buf(struct msm_jpeg_q *q_p, - struct msm_jpeg_core_buf *buf) - { - struct msm_jpeg_core_buf *buf_p; -@@ -103,7 +103,7 @@ inline int msm_jpeg_q_in_buf(struct msm_jpeg_q *q_p, - return 0; - } - --inline int msm_jpeg_q_wait(struct msm_jpeg_q *q_p) -+static inline int msm_jpeg_q_wait(struct msm_jpeg_q *q_p) - { - int tm = MAX_SCHEDULE_TIMEOUT; /* 500ms */ - int rc; -@@ -146,7 +146,7 @@ inline int msm_jpeg_q_unblock(struct msm_jpeg_q *q_p) - return 0; - } - --inline void msm_jpeg_outbuf_q_cleanup(struct msm_jpeg_device *pgmn_dev, -+static inline void msm_jpeg_outbuf_q_cleanup(struct msm_jpeg_device *pgmn_dev, - struct msm_jpeg_q *q_p, int domain_num) - { - struct msm_jpeg_core_buf *buf_p; -@@ -163,7 +163,7 @@ inline void msm_jpeg_outbuf_q_cleanup(struct msm_jpeg_device *pgmn_dev, - q_p->unblck = 0; - } - --inline void msm_jpeg_q_cleanup(struct msm_jpeg_q *q_p) -+static inline void msm_jpeg_q_cleanup(struct msm_jpeg_q *q_p) - { - void *data; - JPEG_DBG("%s:%d] %s\n", __func__, __LINE__, q_p->name); diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 26f96cad452..750a92dc22d 100644 --- a/drivers/media/video/Makefile @@ -221,19 +128,6 @@ index 077e8cb2648..c7a661b4c62 100644 { VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying userspace", -diff --git a/drivers/staging/prima/Kbuild b/drivers/staging/prima/Kbuild -index 78ca4ad657a..dee3a6cc679 100644 ---- a/drivers/staging/prima/Kbuild -+++ b/drivers/staging/prima/Kbuild -@@ -1,5 +1,8 @@ - # We can build either as part of a standalone Kernel build or part - # of an Android build. Determine which mechanism is being used -+ -+EXTRA_CFLAGS += -Wno-discarded-array-qualifiers -+ - ifeq ($(MODNAME),) - KERNEL_BUILD := 1 - else diff --git a/drivers/video/msm/mdss/Makefile b/drivers/video/msm/mdss/Makefile index 568c020a7c4..00bef01e598 100644 --- a/drivers/video/msm/mdss/Makefile @@ -242,7 +136,7 @@ index 568c020a7c4..00bef01e598 100644 + +EXTRA_CFLAGS += -Wno-array-bounds + - mdss-mdp3-objs = mdp3.o mdp3_dma.o mdp3_ctrl.o dsi_status_v2.o + mdss-mdp3-objs = mdp3.o mdp3_dma.o mdp3_ctrl.o mdss-mdp3-objs += mdp3_ppp.o mdp3_ppp_hwio.o mdp3_ppp_data.o obj-$(CONFIG_FB_MSM_MDSS_MDP3) += mdss-mdp3.o diff --git a/drivers/video/msm/mdss/mdss_mdp_pp.c b/drivers/video/msm/mdss/mdss_mdp_pp.c @@ -271,19 +165,6 @@ index e06190322c1..a4f39fae7ec 100644 obj-$(CONFIG_FAT_FS) += fat.o obj-$(CONFIG_VFAT_FS) += vfat.o obj-$(CONFIG_MSDOS_FS) += msdos.o -diff --git a/kernel/Makefile b/kernel/Makefile -index 4c8635ffeda..0e0ee9696bf 100644 ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -2,6 +2,8 @@ - # Makefile for the linux kernel. - # - -+EXTRA_CFLAGS += -Wno-array-bounds -+ - obj-y = fork.o exec_domain.o panic.o printk.o printk_interface.o \ - cpu.o exit.o itimer.o time.o softirq.o resource.o \ - sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \ diff --git a/mm/Makefile b/mm/Makefile index 7dab505a3d3..6dca64e2d07 100644 --- a/mm/Makefile