diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-20 10:57:16 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-11-24 13:36:33 +0100 |
| commit | fb543e81b880925b8cf40f6298a720329342e300 (patch) | |
| tree | 6bf7ba5d9b19978f35989430613e1c0c3ce2ddcb /rules/kernel.make | |
| parent | 3dd50debec0264b69524c3770d88689f30f1c514 (diff) | |
| download | ptxdist-fb543e81b880925b8cf40f6298a720329342e300.tar.gz ptxdist-fb543e81b880925b8cf40f6298a720329342e300.tar.xz | |
kernel: Replace PTXCONF_KERNEL_ARCH_STRING with GENERIC_KERNEL_ARCH
PTXCONF_KERNEL_ARCH_STRING is used for cases when for a given ptxdist
architecture multiple kernel architectures exist. This only happens on
more than 10 year old Kernels, it's time to remove this compatibility
cruft. We can now use GENERIC_KERNEL_ARCH which has the same purpose and
is used in other places already, but doesn't handle the multiple kernel
architecture case.
PTXCONF_KERNEL_ARCH_STRING was useful on PowerPC where the kernel
architectures "ppc" and "powerpc" existed and on x86 where we had "i386"
and "x86_64". These are stories from the old days, since v2.6.24 we only
have "x86" for all x86 machines and since v2.6.27 we only have "powerpc"
for all powerpc machines.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/kernel.make')
| -rw-r--r-- | rules/kernel.make | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/kernel.make b/rules/kernel.make index 46bd87fea..11407455a 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -48,7 +48,7 @@ $(STATEDIR)/kernel-header.% $(STATEDIR)/host-kernel-header.%: KERNEL_MAKEVARS= KERNEL_MAKE_OPT := \ V=$(PTXDIST_VERBOSE) \ O=$(KERNEL_BUILD_DIR) \ - ARCH=$(PTXCONF_KERNEL_ARCH_STRING) \ + ARCH=$(GENERIC_KERNEL_ARCH) \ CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) \ INSTALL_MOD_PATH=$(KERNEL_PKGDIR) \ PTX_KERNEL_DIR=$(KERNEL_DIR) \ @@ -73,13 +73,13 @@ KERNEL_CONF_OPT := \ KERNEL_IMAGE := $(call remove_quotes, $(PTXCONF_KERNEL_IMAGE)) # these are sane default -KERNEL_IMAGE_PATH_y := $(KERNEL_BUILD_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/$(KERNEL_IMAGE) +KERNEL_IMAGE_PATH_y := $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/$(KERNEL_IMAGE) # vmlinux and vmlinuz are special KERNEL_IMAGE_PATH_$(PTXCONF_KERNEL_IMAGE_VMLINUX) := $(KERNEL_BUILD_DIR)/vmlinux KERNEL_IMAGE_PATH_$(PTXCONF_KERNEL_IMAGE_VMLINUZ) := $(KERNEL_BUILD_DIR)/vmlinuz # avr32 is also special -KERNEL_IMAGE_PATH_$(PTXCONF_ARCH_AVR32) := $(KERNEL_BUILD_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/images/$(KERNEL_IMAGE) +KERNEL_IMAGE_PATH_$(PTXCONF_ARCH_AVR32) := $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/images/$(KERNEL_IMAGE) ifdef PTXCONF_KERNEL @@ -113,7 +113,7 @@ ifdef KERNEL_INITRAMFS_SOURCE_y endif ifdef PTXCONF_KERNEL_IMAGE_SIMPLE cp $(PTXCONF_KERNEL_IMAGE_SIMPLE_DTS) \ - $(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/dts/$(PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET).dts + $(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts/$(PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET).dts endif @$(call world/prepare, KERNEL) |