Package: src:linux Version: 4.17~rc3-1~exp1 We should use Boston instead of Malta to support mips r6, as only Boston is used for MIPS r6, while Malta is never used for r6.
Due to this, we have to increase RELOCATION_TABLE_SIZE. The patch mips-boston-disable-its.patch is used to stop uboot Image generation, as it asks for u-boot-tools installed. -- YunQiang Su
From a9be091e3ffdf8dee8e7114c9b7f9710e9d199d8 Mon Sep 17 00:00:00 2001 From: root <root@zfs-01> Date: Sat, 12 May 2018 14:04:37 +0000 Subject: [PATCH 5/5] fix mips r6 --- debian/config/kernelarch-mips/config.boston | 10 ++++++++++ debian/config/mips64r6/defines | 8 ++++---- debian/config/mips64r6el/defines | 8 ++++---- debian/config/mipsr6/defines | 16 ++++++++-------- debian/config/mipsr6el/defines | 16 ++++++++-------- debian/installer/mips64r6/kernel-versions | 2 +- .../modules/{mips64r6 => mips64r6-boston-64r6eb} | 0 debian/installer/mips64r6el/kernel-versions | 2 +- .../modules/{mips64r6 => mips64r6el-boston-64r6el} | 0 debian/installer/mipsr6/kernel-versions | 2 +- .../mipsr6/modules/{mips32r6 => mipsr6-boston-32r6eb} | 0 debian/installer/mipsr6el/kernel-versions | 2 +- .../modules/{mips32r6 => mipsr6el-boston-32r6el} | 0 debian/patches/debian/mips-boston-disable-its.patch | 13 +++++++++++++ debian/patches/series | 1 + 15 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 debian/config/kernelarch-mips/config.boston rename debian/installer/mips64r6/modules/{mips64r6 => mips64r6-boston-64r6eb} (100%) rename debian/installer/mips64r6el/modules/{mips64r6 => mips64r6el-boston-64r6el} (100%) rename debian/installer/mipsr6/modules/{mips32r6 => mipsr6-boston-32r6eb} (100%) rename debian/installer/mipsr6el/modules/{mips32r6 => mipsr6el-boston-32r6el} (100%) create mode 100644 debian/patches/debian/mips-boston-disable-its.patch diff --git a/debian/config/kernelarch-mips/config.boston b/debian/config/kernelarch-mips/config.boston new file mode 100644 index 0000000..66713de --- /dev/null +++ b/debian/config/kernelarch-mips/config.boston @@ -0,0 +1,10 @@ +## +## file: arch/mips/Kconfig +## +## choice: System type +CONFIG_MIPS_GENERIC=y +## end choice +## +## Common Clock Framework +## +CONFIG_COMMON_CLK_BOSTON=y diff --git a/debian/config/mips64r6/defines b/debian/config/mips64r6/defines index 1952e15..132a7db 100644 --- a/debian/config/mips64r6/defines +++ b/debian/config/mips64r6/defines @@ -1,6 +1,6 @@ [base] flavours: - mips64r6 + boston-64r6eb kernel-arch: mips [build] @@ -9,12 +9,12 @@ image-file: vmlinux [image] install-stem: vmlinux -[mips64r6_description] +[boston-64r6eb_description] hardware: MIPS R6 (64 bit, big endian) hardware-long: MIPS R6 (64 bit, big endian) -[mips64r6_image] +[boston-64r6eb_image] configs: - kernelarch-mips/config.malta + kernelarch-mips/config.boston kernelarch-mips/config.mips64r6 diff --git a/debian/config/mips64r6el/defines b/debian/config/mips64r6el/defines index ac92b9b..3e7123e 100644 --- a/debian/config/mips64r6el/defines +++ b/debian/config/mips64r6el/defines @@ -1,6 +1,6 @@ [base] flavours: - mips64r6el + boston-64r6el kernel-arch: mips [build] @@ -9,12 +9,12 @@ image-file: vmlinux [image] install-stem: vmlinux -[mips64r6el_description] +[boston-64r6el_description] hardware: MIPS R6 (64 bit, little endian) hardware-long: MIPS R6 (64 bit, little endian) -[mips64r6el_image] +[boston-64r6el_image] configs: - kernelarch-mips/config.malta + kernelarch-mips/config.boston kernelarch-mips/config.mips64r6 diff --git a/debian/config/mipsr6/defines b/debian/config/mipsr6/defines index 9f5a11d..52d3bde 100644 --- a/debian/config/mipsr6/defines +++ b/debian/config/mipsr6/defines @@ -1,7 +1,7 @@ [base] flavours: - mips32r6 - mips64r6 + boston-32r6eb + boston-64r6eb kernel-arch: mips [build] @@ -10,21 +10,21 @@ image-file: vmlinux [image] install-stem: vmlinux -[mips32r6_description] +[boston-32r6eb_description] hardware: MIPS R6 (32 bit, big endian) hardware-long: MIPS R6 (32 bit, big endian) -[mips32r6_image] +[boston-32r6eb_image] configs: - kernelarch-mips/config.malta + kernelarch-mips/config.boston kernelarch-mips/config.mips32r6 -[mips64r6_description] +[boston-64r6eb_description] hardware: MIPS R6 (64 bit, big endian) hardware-long: MIPS R6 (64 bit, big endian) -[mips64r6_image] +[boston-64r6eb_image] configs: - kernelarch-mips/config.malta + kernelarch-mips/config.boston kernelarch-mips/config.mips64r6 diff --git a/debian/config/mipsr6el/defines b/debian/config/mipsr6el/defines index 257bc06..caded55 100644 --- a/debian/config/mipsr6el/defines +++ b/debian/config/mipsr6el/defines @@ -1,7 +1,7 @@ [base] flavours: - mips32r6el - mips64r6el + boston-32r6el + boston-64r6el kernel-arch: mips [build] @@ -10,21 +10,21 @@ image-file: vmlinux [image] install-stem: vmlinux -[mips32r6el_description] +[boston-32r6el_description] hardware: MIPS R6 (32 bit, little endian) hardware-long: MIPS R6 (32 bit, little endian) -[mips32r6el_image] +[boston-32r6el_image] configs: - kernelarch-mips/config.malta + kernelarch-mips/config.boston kernelarch-mips/config.mips32r6 -[mips64r6el_description] +[boston-64r6el_description] hardware: MIPS R6 (64 bit, little endian) hardware-long: MIPS R6 (64 bit, little endian) -[mips64r6el_image] +[boston-64r6el_image] configs: - kernelarch-mips/config.malta + kernelarch-mips/config.boston kernelarch-mips/config.mips64r6 diff --git a/debian/installer/mips64r6/kernel-versions b/debian/installer/mips64r6/kernel-versions index a4e3787..7d4cd38 100644 --- a/debian/installer/mips64r6/kernel-versions +++ b/debian/installer/mips64r6/kernel-versions @@ -1,2 +1,2 @@ # arch version flavour installedname suffix build-depends -mips64r6 - mips64r6 - y - +mips64r6 - boston-64r6eb - y - diff --git a/debian/installer/mips64r6/modules/mips64r6 b/debian/installer/mips64r6/modules/mips64r6-boston-64r6eb similarity index 100% rename from debian/installer/mips64r6/modules/mips64r6 rename to debian/installer/mips64r6/modules/mips64r6-boston-64r6eb diff --git a/debian/installer/mips64r6el/kernel-versions b/debian/installer/mips64r6el/kernel-versions index 426e2ba..d9283b6 100644 --- a/debian/installer/mips64r6el/kernel-versions +++ b/debian/installer/mips64r6el/kernel-versions @@ -1,2 +1,2 @@ # arch version flavour installedname suffix build-depends -mips64r6el - mips64r6 - y - +mips64r6el - boston-64r6el - y - diff --git a/debian/installer/mips64r6el/modules/mips64r6 b/debian/installer/mips64r6el/modules/mips64r6el-boston-64r6el similarity index 100% rename from debian/installer/mips64r6el/modules/mips64r6 rename to debian/installer/mips64r6el/modules/mips64r6el-boston-64r6el diff --git a/debian/installer/mipsr6/kernel-versions b/debian/installer/mipsr6/kernel-versions index db5d2d2..ca8e780 100644 --- a/debian/installer/mipsr6/kernel-versions +++ b/debian/installer/mipsr6/kernel-versions @@ -1,2 +1,2 @@ # arch version flavour installedname suffix build-depends -mipsr6 - mips32r6 - y - +mipsr6 - boston-32r6eb - y - diff --git a/debian/installer/mipsr6/modules/mips32r6 b/debian/installer/mipsr6/modules/mipsr6-boston-32r6eb similarity index 100% rename from debian/installer/mipsr6/modules/mips32r6 rename to debian/installer/mipsr6/modules/mipsr6-boston-32r6eb diff --git a/debian/installer/mipsr6el/kernel-versions b/debian/installer/mipsr6el/kernel-versions index 330e1ed..5c6740b 100644 --- a/debian/installer/mipsr6el/kernel-versions +++ b/debian/installer/mipsr6el/kernel-versions @@ -1,2 +1,2 @@ # arch version flavour installedname suffix build-depends -mipsr6el - mips32r6 - y - +mipsr6el - boston-32r6el - y - diff --git a/debian/installer/mipsr6el/modules/mips32r6 b/debian/installer/mipsr6el/modules/mipsr6el-boston-32r6el similarity index 100% rename from debian/installer/mipsr6el/modules/mips32r6 rename to debian/installer/mipsr6el/modules/mipsr6el-boston-32r6el diff --git a/debian/patches/debian/mips-boston-disable-its.patch b/debian/patches/debian/mips-boston-disable-its.patch new file mode 100644 index 0000000..e8c4fd0 --- /dev/null +++ b/debian/patches/debian/mips-boston-disable-its.patch @@ -0,0 +1,13 @@ +Index: linux-4.16.5/arch/mips/generic/Platform +=================================================================== +--- linux-4.16.5.orig/arch/mips/generic/Platform ++++ linux-4.16.5/arch/mips/generic/Platform +@@ -11,8 +11,6 @@ + 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 diff --git a/debian/patches/series b/debian/patches/series index ab206ae..8a17fe8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,6 +5,7 @@ debian/kernelvariables.patch debian/gitignore.patch debian/ia64-hardcode-arch-script-output.patch debian/mips-disable-werror.patch +debian/mips-boston-disable-its.patch debian/arch-sh4-fix-uimage-build.patch debian/powerpcspe-omit-uimage.patch debian/modpost-symbol-prefix.patch -- 2.11.0
From fa9488358d93b8f9cc3f54d42824d545fd087163 Mon Sep 17 00:00:00 2001 From: root <root@zfs-01> Date: Sat, 12 May 2018 01:57:22 +0000 Subject: [PATCH 4/5] rasie relocation_table_size --- debian/config/kernelarch-mips/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config index e846495..dcb6695 100644 --- a/debian/config/kernelarch-mips/config +++ b/debian/config/kernelarch-mips/config @@ -2,7 +2,7 @@ ## file: arch/mips/Kconfig ## CONFIG_RELOCATABLE=y -CONFIG_RELOCATION_TABLE_SIZE=0x00120000 +CONFIG_RELOCATION_TABLE_SIZE=0x00121000 CONFIG_RANDOMIZE_BASE=y CONFIG_KEXEC=y CONFIG_SECCOMP=y -- 2.11.0