diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-09 01:02:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-09 01:02:13 +0200 |
| commit | 1511e5d64a51292a84d38e4146304393ebe4d080 (patch) | |
| tree | 7e16e395e740fa92bfbd70f7b49f2d5d73ec0f7a /arch | |
| parent | Merge tag 'nfsd-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/... (diff) | |
| parent | microblaze: move core-y in arch/microblaze/Makefile to arch/microblaze/Kbuild (diff) | |
| download | linux-1511e5d64a51292a84d38e4146304393ebe4d080.tar.xz linux-1511e5d64a51292a84d38e4146304393ebe4d080.zip | |
Merge tag 'microblaze-v5.15' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
- Kbuild clean up
* tag 'microblaze-v5.15' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: move core-y in arch/microblaze/Makefile to arch/microblaze/Kbuild
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/Kbuild | 4 | ||||
| -rw-r--r-- | arch/microblaze/Makefile | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/microblaze/Kbuild b/arch/microblaze/Kbuild index a4e40e534e6a..a1c597889319 100644 --- a/arch/microblaze/Kbuild +++ b/arch/microblaze/Kbuild @@ -1 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += kernel/ +obj-y += mm/ +obj-$(CONFIG_PCI) += pci/ +obj-y += boot/dts/ diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 6d4af39e3890..9adc6b6434df 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -50,17 +50,12 @@ KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2) head-y := arch/microblaze/kernel/head.o libs-y += arch/microblaze/lib/ -core-y += arch/microblaze/kernel/ -core-y += arch/microblaze/mm/ -core-$(CONFIG_PCI) += arch/microblaze/pci/ boot := arch/microblaze/boot # Are we making a simpleImage.<boardname> target? If so, crack out the boardname DTB:=$(subst simpleImage.,,$(filter simpleImage.%, $(MAKECMDGOALS))) -core-y += $(boot)/dts/ - export DTB all: linux.bin |