Merge branch 'mips-r6-improve' into 'master'
Mips r6 improve See merge request kernel-team/linux!37
This commit is contained in:
commit
450204a676
|
@ -5,6 +5,10 @@ linux (4.18~rc2-1~exp1) UNRELEASED; urgency=medium
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
* aufs: Update to aufs4.x-rcN 20180702
|
* aufs: Update to aufs4.x-rcN 20180702
|
||||||
|
|
||||||
|
[ YunQiang Su ]
|
||||||
|
* [mips*r6*] Enable dtb building for boston.
|
||||||
|
* [mips*r6*/mipsn32*] build linux-perf in rules.real.
|
||||||
|
|
||||||
-- Ben Hutchings <ben@decadent.org.uk> Tue, 26 Jun 2018 01:43:53 +0100
|
-- Ben Hutchings <ben@decadent.org.uk> Tue, 26 Jun 2018 01:43:53 +0100
|
||||||
|
|
||||||
linux (4.17.3-1) UNRELEASED; urgency=medium
|
linux (4.17.3-1) UNRELEASED; urgency=medium
|
||||||
|
|
|
@ -6,6 +6,11 @@ CONFIG_MIPS_GENERIC=y
|
||||||
## end choice
|
## end choice
|
||||||
CONFIG_MIPS_CPS=y
|
CONFIG_MIPS_CPS=y
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: arch/mips/generic/Kconfig
|
||||||
|
##
|
||||||
|
CONFIG_FIT_IMAGE_FDT_BOSTON=y
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/clk/imgtec/Kconfig
|
## file: drivers/clk/imgtec/Kconfig
|
||||||
##
|
##
|
||||||
|
|
|
@ -81,7 +81,7 @@ binary-indep: install-support
|
||||||
ifneq ($(DO_TOOLS_VERSIONED),False)
|
ifneq ($(DO_TOOLS_VERSIONED),False)
|
||||||
build-arch-arch: $(STAMPS_DIR)/build-tools
|
build-arch-arch: $(STAMPS_DIR)/build-tools
|
||||||
binary-arch-arch: install-kbuild
|
binary-arch-arch: install-kbuild
|
||||||
ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_HOST_ARCH)),)
|
ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsr6 mipsr6el mips64r6 mips64r6el mipsn32 mipsn32el mipsn32r6 mipsn32r6el powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_HOST_ARCH)),)
|
||||||
ifeq ($(filter nopython,$(DEB_BUILD_PROFILES)),)
|
ifeq ($(filter nopython,$(DEB_BUILD_PROFILES)),)
|
||||||
binary-arch-arch: install-perf
|
binary-arch-arch: install-perf
|
||||||
endif
|
endif
|
||||||
|
@ -466,7 +466,7 @@ endif
|
||||||
|
|
||||||
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt: DT_INSTALL_DIR = $(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
|
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt: DT_INSTALL_DIR = $(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
|
||||||
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt:
|
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt:
|
||||||
ifneq ($(filter arm64 armel armhf,$(ARCH)),)
|
ifneq ($(filter arm64 armel armhf mipsr6 mipsr6el mips64r6 mips64r6el,$(ARCH)),)
|
||||||
+$(MAKE_CLEAN) -C $(DIR) dtbs
|
+$(MAKE_CLEAN) -C $(DIR) dtbs
|
||||||
+$(MAKE_CLEAN) -C $(DIR) dtbs_install INSTALL_DTBS_PATH=$(CURDIR)/$(DT_INSTALL_DIR)
|
+$(MAKE_CLEAN) -C $(DIR) dtbs_install INSTALL_DTBS_PATH=$(CURDIR)/$(DT_INSTALL_DIR)
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue