diff --git a/debian/changelog b/debian/changelog index c778a898b..d0ece34cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,11 @@ linux (4.17~rc4-1~exp1) UNRELEASED; urgency=medium [ YunQiang Su ] * [mips{,64}el/loongson-3] enable NUMA, CPU_PM, CPU_IDLE, RS780_HPET, REGULATOR. (Closes: #898521). + * [mips{,64}r6{,el}] use boston as the target. + Add a patch to disable uImage generation to avoid depend on u-boot-tools. + Fix typo the EL's flavor names in installer: not same within defines + Malta is never used for r6. (Closes: #898523) + Boston also requires relocation table size >= 0x00121000. -- Luca Boccassi Wed, 02 May 2018 12:59:01 +0100 diff --git a/debian/config/kernelarch-mips/config.boston b/debian/config/kernelarch-mips/config.boston new file mode 100644 index 000000000..32b930567 --- /dev/null +++ b/debian/config/kernelarch-mips/config.boston @@ -0,0 +1,11 @@ +## +## file: arch/mips/Kconfig +## +## choice: System type +CONFIG_MIPS_GENERIC=y +CONFIG_RELOCATION_TABLE_SIZE=0x00121000 +## end choice +## +## Common Clock Framework +## +CONFIG_COMMON_CLK_BOSTON=y diff --git a/debian/config/mips64r6/defines b/debian/config/mips64r6/defines index 1952e1562..a38a3b721 100644 --- a/debian/config/mips64r6/defines +++ b/debian/config/mips64r6/defines @@ -15,6 +15,6 @@ hardware-long: MIPS R6 (64 bit, big endian) [mips64r6_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 ac92b9b6d..67b77d8db 100644 --- a/debian/config/mips64r6el/defines +++ b/debian/config/mips64r6el/defines @@ -15,6 +15,6 @@ hardware-long: MIPS R6 (64 bit, little endian) [mips64r6el_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 9f5a11dbb..77b095baa 100644 --- a/debian/config/mipsr6/defines +++ b/debian/config/mipsr6/defines @@ -16,7 +16,7 @@ hardware-long: MIPS R6 (32 bit, big endian) [mips32r6_image] configs: - kernelarch-mips/config.malta + kernelarch-mips/config.boston kernelarch-mips/config.mips32r6 [mips64r6_description] @@ -25,6 +25,6 @@ hardware-long: MIPS R6 (64 bit, big endian) [mips64r6_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 257bc06ed..78f7c521a 100644 --- a/debian/config/mipsr6el/defines +++ b/debian/config/mipsr6el/defines @@ -16,7 +16,7 @@ hardware-long: MIPS R6 (32 bit, little endian) [mips32r6el_image] configs: - kernelarch-mips/config.malta + kernelarch-mips/config.boston kernelarch-mips/config.mips32r6 [mips64r6el_description] @@ -25,6 +25,6 @@ hardware-long: MIPS R6 (64 bit, little endian) [mips64r6el_image] configs: - kernelarch-mips/config.malta + kernelarch-mips/config.boston kernelarch-mips/config.mips64r6 diff --git a/debian/installer/mips64r6el/kernel-versions b/debian/installer/mips64r6el/kernel-versions index 426e2badb..802b414e2 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 - mips64r6el - y - diff --git a/debian/installer/mips64r6el/modules/mips64r6 b/debian/installer/mips64r6el/modules/mips64r6el similarity index 100% rename from debian/installer/mips64r6el/modules/mips64r6 rename to debian/installer/mips64r6el/modules/mips64r6el diff --git a/debian/installer/mipsr6el/kernel-versions b/debian/installer/mipsr6el/kernel-versions index 330e1ed7b..6e45c34ef 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 - mips32r6el - y - diff --git a/debian/installer/mipsr6el/modules/mips32r6 b/debian/installer/mipsr6el/modules/mips32r6el similarity index 100% rename from debian/installer/mipsr6el/modules/mips32r6 rename to debian/installer/mipsr6el/modules/mips32r6el 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 000000000..4c8e1fdee --- /dev/null +++ b/debian/patches/debian/mips-boston-disable-its.patch @@ -0,0 +1,21 @@ +From: YunQiang Su +Date: Mon, 14 May 2018 16:16:18 +0800 +Subject: Disable uImage generation for mips generic +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 @@ + 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 e99ab1474..b98375702 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