From 257bf132e3e4b321e923afbc9e891e34e6b97578 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 28 May 2018 16:53:44 +0200 Subject: [PATCH] Update to 4.17-rc7 --- debian/changelog | 2 +- debian/patches/debian/mips-boston-disable-its.patch | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca6ec7760..1a67d436b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux (4.17~rc6-1~exp1) UNRELEASED; urgency=medium +linux (4.17~rc7-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate diff --git a/debian/patches/debian/mips-boston-disable-its.patch b/debian/patches/debian/mips-boston-disable-its.patch index 4c8e1fdee..f53102e11 100644 --- a/debian/patches/debian/mips-boston-disable-its.patch +++ b/debian/patches/debian/mips-boston-disable-its.patch @@ -6,16 +6,15 @@ Forwarded: not-needed MIPS generic trys to generate uImage when build, which then ask for u-boot-tools. -Index: b/arch/mips/generic/Platform -=================================================================== --- a/arch/mips/generic/Platform +++ b/arch/mips/generic/Platform -@@ -11,8 +11,6 @@ +@@ -11,9 +11,7 @@ platform-$(CONFIG_MIPS_GENERIC) += generic/ cflags-$(CONFIG_MIPS_GENERIC) += -I$(srctree)/arch/mips/include/asm/mach-generic load-$(CONFIG_MIPS_GENERIC) += 0xffffffff80100000 -all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb - + -its-y := vmlinux.its.S its-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += board-boston.its.S its-$(CONFIG_FIT_IMAGE_FDT_NI169445) += board-ni169445.its.S + its-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += board-xilfpga.its.S