From 4c110f10eafc4af4c5b2d5e0b3b81e56a2edfba4 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jun 15 2019 12:51:20 +0000 Subject: Update to 4.14.126 --- diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index f167148..bd76912 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,23 +1,14 @@ -d0dfacd86c286e54e6e1f56f84b62be7b6d91059 SOURCES/877656cd145497db7c09a7de06ea85db98bd72a3.tar.gz +5da09cf4c566e05434c62824e6e276975138cb03 SOURCES/caa653325d58e5062907ec378269e77e6018f2ee.tar.gz da349c7c7e4f44f00bedd91767dc4669e7491548 SOURCES/83977fe3b6ef54c1d29c83b0a778d330f523441f.tar.gz -8a6efa04d0de9b7aaa176c2873600a53244a7b3e SOURCES/patch-4.14.98-99.xz -d0e71a944598cf0c3078ce25177c6de80651ff9d SOURCES/patch-4.14.99-100.xz -d899d197a41382c50fab113787b9788ba10e8b66 SOURCES/patch-4.14.100-101.xz -c2494e145278e7ff6d218815c0c1d44ad0a26040 SOURCES/patch-4.14.101-102.xz -ced2cbf884317bdb9501d11ac849dec38fb73db1 SOURCES/patch-4.14.102-103.xz -7c6c1429a74ebddd1a52612fcfa24d8e88487a1a SOURCES/patch-4.14.103-104.xz -8065821ef2d894e62713489c102711455a2a3278 SOURCES/patch-4.14.104-105.xz -487a7d4a9a7faddbdbaae131fe72a5348347af27 SOURCES/patch-4.14.105-106.xz -c4b442ab1e979598c5bbbbedb666a194b2b41ab3 SOURCES/patch-4.14.106-107.xz -edb180057c12283e878ed30e1efd41a335895472 SOURCES/patch-4.14.107-108.xz -da3efc8265f3388b07743feaf0aee2c733b02956 SOURCES/patch-4.14.108-109.xz -6025a75f95247da153b0694f6c4fc65865bfd44f SOURCES/patch-4.14.109-110.xz -3ec88d7b528f2d96bc06d951f1271537c90c4b3e SOURCES/patch-4.14.110-111.xz -355a5a8e577122e8f73a4111fb29ce38763848d1 SOURCES/patch-4.14.111-112.xz -1d3575ec32de202f2a9e7563a1c6704accf49e46 SOURCES/patch-4.14.112-113.xz -fa8c65d5804a2ec564bba0ac27a593d638c25a8b SOURCES/patch-4.14.113-114.xz 20192fed47da0522fea758e071df95d25137f6c4 SOURCES/patch-4.14.114-115.xz 3c941bc1908477e0746b57ea73cf19df604788f5 SOURCES/patch-4.14.115-116.xz b7bcf338611c710c8af71fd193656a78a79960a2 SOURCES/patch-4.14.116-117.xz a56be2360a81081dfcfd0903e5c7e2c3f0b4c442 SOURCES/patch-4.14.117-118.xz 9502795624043f7e2b9d15dce409676309eade0e SOURCES/patch-4.14.118-119.xz +30fe1392af90cbc878926ccd034a7847ed8c3fd5 SOURCES/patch-4.14.119-120.xz +ae3b10ac6c91c67055140030ed3e820fb3fce02d SOURCES/patch-4.14.120-121.xz +09ae3dab5a870b88aa14500ba78881f76d87cfe2 SOURCES/patch-4.14.121-122.xz +06af177a72f51cd81850865da5758534bad15f83 SOURCES/patch-4.14.122-123.xz +79e0267fcd98e3a58c3126a7f53ffbd1adaac923 SOURCES/patch-4.14.123-124.xz +2b800db84d3d5654071f6bcd9c72fe27e1f9d7e5 SOURCES/patch-4.14.124-125.xz +64faf106675e35d5a0cff9d9630fc7c9428eb906 SOURCES/patch-4.14.125-126.xz diff --git a/SOURCES/0001-80d7fcc321f01c7a69de38a20de726fe8e1149ee.patch b/SOURCES/0001-80d7fcc321f01c7a69de38a20de726fe8e1149ee.patch deleted file mode 100644 index 0522cd2..0000000 --- a/SOURCES/0001-80d7fcc321f01c7a69de38a20de726fe8e1149ee.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 80d7fcc321f01c7a69de38a20de726fe8e1149ee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= -Date: Tue, 1 Nov 2016 15:15:41 +0100 -Subject: [PATCH] i2c: bcm2835: Add debug support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This adds a debug module parameter to aid in debugging transfer issues -by printing info to the kernel log. When enabled, status values are -collected in the interrupt routine and msg info in -bcm2835_i2c_start_transfer(). This is done in a way that tries to avoid -affecting timing. Having printk in the isr can mask issues. - -debug values (additive): -1: Print info on error -2: Print info on all transfers -3: Print messages before transfer is started - -The value can be changed at runtime: -/sys/module/i2c_bcm2835/parameters/debug - -Example output, debug=3: -[ 747.114448] bcm2835_i2c_xfer: msg(1/2) write addr=0x54, len=2 flags= [i2c1] -[ 747.114463] bcm2835_i2c_xfer: msg(2/2) read addr=0x54, len=32 flags= [i2c1] -[ 747.117809] start_transfer: msg(1/2) write addr=0x54, len=2 flags= [i2c1] -[ 747.117825] isr: remain=2, status=0x30000055 : TA TXW TXD TXE [i2c1] -[ 747.117839] start_transfer: msg(2/2) read addr=0x54, len=32 flags= [i2c1] -[ 747.117849] isr: remain=32, status=0xd0000039 : TA RXR TXD RXD [i2c1] -[ 747.117861] isr: remain=20, status=0xd0000039 : TA RXR TXD RXD [i2c1] -[ 747.117870] isr: remain=8, status=0x32 : DONE TXD RXD [i2c1] - -Signed-off-by: Noralf Trønnes ---- - drivers/i2c/busses/i2c-bcm2835.c | 99 +++++++++++++++++++++++++++++++- - 1 file changed, 98 insertions(+), 1 deletion(-) - -diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c -index 44deae78913e5..b7110eb2163e7 100644 ---- a/drivers/i2c/busses/i2c-bcm2835.c -+++ b/drivers/i2c/busses/i2c-bcm2835.c -@@ -56,6 +56,18 @@ - #define BCM2835_I2C_CDIV_MIN 0x0002 - #define BCM2835_I2C_CDIV_MAX 0xFFFE - -+static unsigned int debug; -+module_param(debug, uint, 0644); -+MODULE_PARM_DESC(debug, "1=err, 2=isr, 3=xfer"); -+ -+#define BCM2835_DEBUG_MAX 512 -+struct bcm2835_debug { -+ struct i2c_msg *msg; -+ int msg_idx; -+ size_t remain; -+ u32 status; -+}; -+ - struct bcm2835_i2c_dev { - struct device *dev; - void __iomem *regs; -@@ -69,8 +81,78 @@ struct bcm2835_i2c_dev { - u32 msg_err; - u8 *msg_buf; - size_t msg_buf_remaining; -+ struct bcm2835_debug debug[BCM2835_DEBUG_MAX]; -+ unsigned int debug_num; -+ unsigned int debug_num_msgs; - }; - -+static inline void bcm2835_debug_add(struct bcm2835_i2c_dev *i2c_dev, u32 s) -+{ -+ if (!i2c_dev->debug_num_msgs || i2c_dev->debug_num >= BCM2835_DEBUG_MAX) -+ return; -+ -+ i2c_dev->debug[i2c_dev->debug_num].msg = i2c_dev->curr_msg; -+ i2c_dev->debug[i2c_dev->debug_num].msg_idx = -+ i2c_dev->debug_num_msgs - i2c_dev->num_msgs; -+ i2c_dev->debug[i2c_dev->debug_num].remain = i2c_dev->msg_buf_remaining; -+ i2c_dev->debug[i2c_dev->debug_num].status = s; -+ i2c_dev->debug_num++; -+} -+ -+static void bcm2835_debug_print_status(struct bcm2835_i2c_dev *i2c_dev, -+ struct bcm2835_debug *d) -+{ -+ u32 s = d->status; -+ -+ pr_info("isr: remain=%zu, status=0x%x : %s%s%s%s%s%s%s%s%s%s [i2c%d]\n", -+ d->remain, s, -+ s & BCM2835_I2C_S_TA ? "TA " : "", -+ s & BCM2835_I2C_S_DONE ? "DONE " : "", -+ s & BCM2835_I2C_S_TXW ? "TXW " : "", -+ s & BCM2835_I2C_S_RXR ? "RXR " : "", -+ s & BCM2835_I2C_S_TXD ? "TXD " : "", -+ s & BCM2835_I2C_S_RXD ? "RXD " : "", -+ s & BCM2835_I2C_S_TXE ? "TXE " : "", -+ s & BCM2835_I2C_S_RXF ? "RXF " : "", -+ s & BCM2835_I2C_S_ERR ? "ERR " : "", -+ s & BCM2835_I2C_S_CLKT ? "CLKT " : "", -+ i2c_dev->adapter.nr); -+} -+ -+static void bcm2835_debug_print_msg(struct bcm2835_i2c_dev *i2c_dev, -+ struct i2c_msg *msg, int i, int total, -+ const char *fname) -+{ -+ pr_info("%s: msg(%d/%d) %s addr=0x%02x, len=%u flags=%s%s%s%s%s%s%s [i2c%d]\n", -+ fname, i, total, -+ msg->flags & I2C_M_RD ? "read" : "write", msg->addr, msg->len, -+ msg->flags & I2C_M_TEN ? "TEN" : "", -+ msg->flags & I2C_M_RECV_LEN ? "RECV_LEN" : "", -+ msg->flags & I2C_M_NO_RD_ACK ? "NO_RD_ACK" : "", -+ msg->flags & I2C_M_IGNORE_NAK ? "IGNORE_NAK" : "", -+ msg->flags & I2C_M_REV_DIR_ADDR ? "REV_DIR_ADDR" : "", -+ msg->flags & I2C_M_NOSTART ? "NOSTART" : "", -+ msg->flags & I2C_M_STOP ? "STOP" : "", -+ i2c_dev->adapter.nr); -+} -+ -+static void bcm2835_debug_print(struct bcm2835_i2c_dev *i2c_dev) -+{ -+ struct bcm2835_debug *d; -+ unsigned int i; -+ -+ for (i = 0; i < i2c_dev->debug_num; i++) { -+ d = &i2c_dev->debug[i]; -+ if (d->status == ~0) -+ bcm2835_debug_print_msg(i2c_dev, d->msg, d->msg_idx, -+ i2c_dev->debug_num_msgs, "start_transfer"); -+ else -+ bcm2835_debug_print_status(i2c_dev, d); -+ } -+ if (i2c_dev->debug_num >= BCM2835_DEBUG_MAX) -+ pr_info("BCM2835_DEBUG_MAX reached\n"); -+} -+ - static inline void bcm2835_i2c_writel(struct bcm2835_i2c_dev *i2c_dev, - u32 reg, u32 val) - { -@@ -189,6 +271,7 @@ static void bcm2835_i2c_start_transfer(struct bcm2835_i2c_dev *i2c_dev) - bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_A, msg->addr); - bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_DLEN, msg->len); - bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, c); -+ bcm2835_debug_add(i2c_dev, ~0); - } - - /* -@@ -206,6 +289,7 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data) - u32 val, err; - - val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S); -+ bcm2835_debug_add(i2c_dev, val); - - err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR); - if (err) { -@@ -272,6 +356,13 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], - unsigned long time_left; - int i, ret; - -+ if (debug) -+ i2c_dev->debug_num_msgs = num; -+ -+ if (debug > 2) -+ for (i = 0; i < num; i++) -+ bcm2835_debug_print_msg(i2c_dev, &msgs[i], i + 1, num, __func__); -+ - for (i = 0; i < (num - 1); i++) - if (msgs[i].flags & I2C_M_RD) { - dev_warn_once(i2c_dev->dev, -@@ -291,6 +382,10 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], - - time_left = wait_for_completion_timeout(&i2c_dev->completion, - adap->timeout); -+ if (debug > 1 || (debug && (!time_left || i2c_dev->msg_err))) -+ bcm2835_debug_print(i2c_dev); -+ i2c_dev->debug_num_msgs = 0; -+ i2c_dev->debug_num = 0; - if (!time_left) { - bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, - BCM2835_I2C_C_CLEAR); -@@ -301,7 +396,9 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], - if (!i2c_dev->msg_err) - return num; - -- dev_dbg(i2c_dev->dev, "i2c transfer failed: %x\n", i2c_dev->msg_err); -+ if (debug) -+ dev_err(i2c_dev->dev, "i2c transfer failed: %x\n", -+ i2c_dev->msg_err); - - if (i2c_dev->msg_err & BCM2835_I2C_S_ERR) - return -EREMOTEIO; diff --git a/SOURCES/0001-Fix-FTBFS-use-new-define-name.patch b/SOURCES/0001-Fix-FTBFS-use-new-define-name.patch deleted file mode 100644 index c828925..0000000 --- a/SOURCES/0001-Fix-FTBFS-use-new-define-name.patch +++ /dev/null @@ -1,25 +0,0 @@ -From af269603624539c0374089add8b76d53e57ffdb8 Mon Sep 17 00:00:00 2001 -From: Pablo Greco -Date: Sat, 4 May 2019 12:06:24 +0000 -Subject: [PATCH] Fix FTBFS, use new define name - ---- - drivers/mmc/host/bcm2835-mmc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c -index 98a2d80..6b9cb30 100644 ---- a/drivers/mmc/host/bcm2835-mmc.c -+++ b/drivers/mmc/host/bcm2835-mmc.c -@@ -251,7 +251,7 @@ static void bcm2835_mmc_dumpregs(struct bcm2835_host *host) - bcm2835_mmc_readl(host, SDHCI_INT_ENABLE), - bcm2835_mmc_readl(host, SDHCI_SIGNAL_ENABLE)); - pr_debug(DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n", -- bcm2835_mmc_readw(host, SDHCI_ACMD12_ERR), -+ bcm2835_mmc_readw(host, SDHCI_AUTO_CMD_STATUS), - bcm2835_mmc_readw(host, SDHCI_SLOT_INT_STATUS)); - pr_debug(DRIVER_NAME ": Caps: 0x%08x | Caps_1: 0x%08x\n", - bcm2835_mmc_readl(host, SDHCI_CAPABILITIES), --- -1.8.3.1 - diff --git a/SOURCES/0001-Reintroduce-80d7fcc321f01c7a69de38a20de726fe8e1149ee.patch b/SOURCES/0001-Reintroduce-80d7fcc321f01c7a69de38a20de726fe8e1149ee.patch deleted file mode 100644 index fec4818..0000000 --- a/SOURCES/0001-Reintroduce-80d7fcc321f01c7a69de38a20de726fe8e1149ee.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 90a50a3b5ff3863c3a3c2fd5959dacaa742b7797 Mon Sep 17 00:00:00 2001 -From: Pablo Greco -Date: Fri, 29 Mar 2019 18:41:35 +0000 -Subject: [PATCH] Reintroduce 80d7fcc321f01c7a69de38a20de726fe8e1149ee - ---- - drivers/i2c/busses/i2c-bcm2835.c | 100 ++++++++++++++++++++++++++++++++++++++- - 1 file changed, 99 insertions(+), 1 deletion(-) - -diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c -index 4d19254..31d8d9e 100644 ---- a/drivers/i2c/busses/i2c-bcm2835.c -+++ b/drivers/i2c/busses/i2c-bcm2835.c -@@ -56,6 +56,18 @@ - #define BCM2835_I2C_CDIV_MIN 0x0002 - #define BCM2835_I2C_CDIV_MAX 0xFFFE - -+static unsigned int debug; -+module_param(debug, uint, 0644); -+MODULE_PARM_DESC(debug, "1=err, 2=isr, 3=xfer"); -+ -+#define BCM2835_DEBUG_MAX 512 -+struct bcm2835_debug { -+ struct i2c_msg *msg; -+ int msg_idx; -+ size_t remain; -+ u32 status; -+}; -+ - struct bcm2835_i2c_dev { - struct device *dev; - void __iomem *regs; -@@ -69,8 +81,78 @@ struct bcm2835_i2c_dev { - u32 msg_err; - u8 *msg_buf; - size_t msg_buf_remaining; -+ struct bcm2835_debug debug[BCM2835_DEBUG_MAX]; -+ unsigned int debug_num; -+ unsigned int debug_num_msgs; - }; - -+static inline void bcm2835_debug_add(struct bcm2835_i2c_dev *i2c_dev, u32 s) -+{ -+ if (!i2c_dev->debug_num_msgs || i2c_dev->debug_num >= BCM2835_DEBUG_MAX) -+ return; -+ -+ i2c_dev->debug[i2c_dev->debug_num].msg = i2c_dev->curr_msg; -+ i2c_dev->debug[i2c_dev->debug_num].msg_idx = -+ i2c_dev->debug_num_msgs - i2c_dev->num_msgs; -+ i2c_dev->debug[i2c_dev->debug_num].remain = i2c_dev->msg_buf_remaining; -+ i2c_dev->debug[i2c_dev->debug_num].status = s; -+ i2c_dev->debug_num++; -+} -+ -+static void bcm2835_debug_print_status(struct bcm2835_i2c_dev *i2c_dev, -+ struct bcm2835_debug *d) -+{ -+ u32 s = d->status; -+ -+ pr_info("isr: remain=%zu, status=0x%x : %s%s%s%s%s%s%s%s%s%s [i2c%d]\n", -+ d->remain, s, -+ s & BCM2835_I2C_S_TA ? "TA " : "", -+ s & BCM2835_I2C_S_DONE ? "DONE " : "", -+ s & BCM2835_I2C_S_TXW ? "TXW " : "", -+ s & BCM2835_I2C_S_RXR ? "RXR " : "", -+ s & BCM2835_I2C_S_TXD ? "TXD " : "", -+ s & BCM2835_I2C_S_RXD ? "RXD " : "", -+ s & BCM2835_I2C_S_TXE ? "TXE " : "", -+ s & BCM2835_I2C_S_RXF ? "RXF " : "", -+ s & BCM2835_I2C_S_ERR ? "ERR " : "", -+ s & BCM2835_I2C_S_CLKT ? "CLKT " : "", -+ i2c_dev->adapter.nr); -+} -+ -+static void bcm2835_debug_print_msg(struct bcm2835_i2c_dev *i2c_dev, -+ struct i2c_msg *msg, int i, int total, -+ const char *fname) -+{ -+ pr_info("%s: msg(%d/%d) %s addr=0x%02x, len=%u flags=%s%s%s%s%s%s%s [i2c%d]\n", -+ fname, i, total, -+ msg->flags & I2C_M_RD ? "read" : "write", msg->addr, msg->len, -+ msg->flags & I2C_M_TEN ? "TEN" : "", -+ msg->flags & I2C_M_RECV_LEN ? "RECV_LEN" : "", -+ msg->flags & I2C_M_NO_RD_ACK ? "NO_RD_ACK" : "", -+ msg->flags & I2C_M_IGNORE_NAK ? "IGNORE_NAK" : "", -+ msg->flags & I2C_M_REV_DIR_ADDR ? "REV_DIR_ADDR" : "", -+ msg->flags & I2C_M_NOSTART ? "NOSTART" : "", -+ msg->flags & I2C_M_STOP ? "STOP" : "", -+ i2c_dev->adapter.nr); -+} -+ -+static void bcm2835_debug_print(struct bcm2835_i2c_dev *i2c_dev) -+{ -+ struct bcm2835_debug *d; -+ unsigned int i; -+ -+ for (i = 0; i < i2c_dev->debug_num; i++) { -+ d = &i2c_dev->debug[i]; -+ if (d->status == ~0) -+ bcm2835_debug_print_msg(i2c_dev, d->msg, d->msg_idx, -+ i2c_dev->debug_num_msgs, "start_transfer"); -+ else -+ bcm2835_debug_print_status(i2c_dev, d); -+ } -+ if (i2c_dev->debug_num >= BCM2835_DEBUG_MAX) -+ pr_info("BCM2835_DEBUG_MAX reached\n"); -+} -+ - static inline void bcm2835_i2c_writel(struct bcm2835_i2c_dev *i2c_dev, - u32 reg, u32 val) - { -@@ -189,6 +271,7 @@ static void bcm2835_i2c_start_transfer(struct bcm2835_i2c_dev *i2c_dev) - bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_A, msg->addr); - bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_DLEN, msg->len); - bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, c); -+ bcm2835_debug_add(i2c_dev, ~0); - } - - static void bcm2835_i2c_finish_transfer(struct bcm2835_i2c_dev *i2c_dev) -@@ -215,6 +298,7 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data) - u32 val, err; - - val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S); -+ bcm2835_debug_add(i2c_dev, val); - - err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR); - if (err) { -@@ -281,6 +365,13 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], - unsigned long time_left; - int i, ret; - -+ if (debug) -+ i2c_dev->debug_num_msgs = num; -+ -+ if (debug > 2) -+ for (i = 0; i < num; i++) -+ bcm2835_debug_print_msg(i2c_dev, &msgs[i], i + 1, num, __func__); -+ - for (i = 0; i < (num - 1); i++) - if (msgs[i].flags & I2C_M_RD) { - dev_warn_once(i2c_dev->dev, -@@ -303,6 +394,11 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], - - bcm2835_i2c_finish_transfer(i2c_dev); - -+ if (debug > 1 || (debug && (!time_left || i2c_dev->msg_err))) -+ bcm2835_debug_print(i2c_dev); -+ i2c_dev->debug_num_msgs = 0; -+ i2c_dev->debug_num = 0; -+ - if (!time_left) { - bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, - BCM2835_I2C_C_CLEAR); -@@ -313,7 +409,9 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], - if (!i2c_dev->msg_err) - return num; - -- dev_dbg(i2c_dev->dev, "i2c transfer failed: %x\n", i2c_dev->msg_err); -+ if (debug) -+ dev_err(i2c_dev->dev, "i2c transfer failed: %x\n", -+ i2c_dev->msg_err); - - if (i2c_dev->msg_err & BCM2835_I2C_S_ERR) - return -EREMOTEIO; --- -1.8.3.1 - diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 54682e3..072fd1b 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,6 +1,6 @@ %global commit_firmware_long 83977fe3b6ef54c1d29c83b0a778d330f523441f #%global commit_firmware_short %(c=%{commit_firmware_long}; echo ${c:0:7}) -%global commit_linux_long 877656cd145497db7c09a7de06ea85db98bd72a3 +%global commit_linux_long caa653325d58e5062907ec378269e77e6018f2ee #%global commit_linux_short %(c=%{commit_linux_long}; echo ${c:0:7}) %define Arch arm @@ -8,7 +8,7 @@ %define extra_version 1 Name: raspberrypi2 -Version: 4.14.119 +Version: 4.14.126 Release: %{local_version}.%{extra_version}%{?dist} Summary: Specific kernel and bootcode for Raspberry Pi @@ -26,30 +26,18 @@ BuildRequires: pciutils-devel gettext ncurses-devel # Compile with SELinux but disable per default Patch0: bcm2709_selinux_config.patch -Patch1099: patch-4.14.98-99.xz -Patch1100: patch-4.14.99-100.xz -Patch1101: patch-4.14.100-101.xz -Patch1102: patch-4.14.101-102.xz -Patch1103: patch-4.14.102-103.xz -Patch1104: patch-4.14.103-104.xz -Patch1105: patch-4.14.104-105.xz -Patch1106: patch-4.14.105-106.xz -Patch1107: patch-4.14.106-107.xz -Patch1108: patch-4.14.107-108.xz -Patch1109: patch-4.14.108-109.xz -Patch1110: patch-4.14.109-110.xz -Patch1111: patch-4.14.110-111.xz -Patch1112: patch-4.14.111-112.xz -Patch1113: patch-4.14.112-113.xz -Patch1114: patch-4.14.113-114.xz Patch1115: patch-4.14.114-115.xz Patch1116: patch-4.14.115-116.xz Patch1117: patch-4.14.116-117.xz Patch1118: patch-4.14.117-118.xz Patch1119: patch-4.14.118-119.xz -Patch9900: 0001-80d7fcc321f01c7a69de38a20de726fe8e1149ee.patch -Patch9901: 0001-Reintroduce-80d7fcc321f01c7a69de38a20de726fe8e1149ee.patch -Patch9902: 0001-Fix-FTBFS-use-new-define-name.patch +Patch1120: patch-4.14.119-120.xz +Patch1121: patch-4.14.120-121.xz +Patch1122: patch-4.14.121-122.xz +Patch1123: patch-4.14.122-123.xz +Patch1124: patch-4.14.123-124.xz +Patch1125: patch-4.14.124-125.xz +Patch1126: patch-4.14.125-126.xz %description Specific kernel and bootcode for Raspberry Pi @@ -103,34 +91,18 @@ including the kernel bootloader. %setup -q -n linux-%{commit_linux_long} %patch0 -p1 -%patch1099 -p1 -%patch1100 -p1 -%patch1101 -p1 -%patch1102 -p1 -%patch1103 -p1 -%patch1104 -p1 -%patch1105 -p1 -%patch1106 -p1 -%patch1107 -p1 - -%patch9900 -p1 -R -%patch1108 -p1 -%patch9901 -p1 - -%patch1109 -p1 -%patch1110 -p1 -%patch1111 -p1 -%patch1112 -p1 -%patch1113 -p1 -%patch1114 -p1 - -%patch9902 -p1 - %patch1115 -p1 %patch1116 -p1 %patch1117 -p1 %patch1118 -p1 %patch1119 -p1 +%patch1120 -p1 +%patch1121 -p1 +%patch1122 -p1 +%patch1123 -p1 +%patch1124 -p1 +%patch1125 -p1 +%patch1126 -p1 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm2709_defconfig @@ -241,6 +213,9 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README %doc /boot/LICENCE.broadcom %changelog +* Sat Jun 15 2019 Pablo Greco - 4.14.126-v7.1.el7 +- Rebase to LTS 4.14.126 + * Thu May 16 2019 Pablo Greco - 4.14.119-v7.1.el7 - Rebase to LTS 4.14.119