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 /platforms | |
| 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 'platforms')
| -rw-r--r-- | platforms/dtc.in | 2 | ||||
| -rw-r--r-- | platforms/kernel.in | 62 |
2 files changed, 1 insertions, 63 deletions
diff --git a/platforms/dtc.in b/platforms/dtc.in index 0f248e278..038dff5c8 100644 --- a/platforms/dtc.in +++ b/platforms/dtc.in @@ -20,7 +20,7 @@ config DTC_INSTALL_OFTREE config DTC_OFTREE_DTS_PATH string "path to source dts file" - default "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${PTXCONF_KERNEL_ARCH_STRING}/boot/dts" + default "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts" help Define path to the dts source file. Multiple directories can be specified separated by ':'. diff --git a/platforms/kernel.in b/platforms/kernel.in index 220433c93..a57bb4d96 100644 --- a/platforms/kernel.in +++ b/platforms/kernel.in @@ -52,68 +52,6 @@ config KERNEL_MD5 string choice - prompt "kernel architecture " - depends on ARCH_PPC || ARCH_X86 - default KERNEL_ARCH_POWERPC if ARCH_PPC - default KERNEL_ARCH_X86 if ARCH_X86 - help - For x86 and PowerPC there are different possibilities to set the kernel - architecture: - - - The old variant for PowerPC is ppc, the newer one is powerpc. - - The old variant for x86 is i386 for 32 bit and x86_64 for 64 bit, - kernels later than 2.6.24 use x86. - - config KERNEL_ARCH_PPC - bool - depends on ARCH_PPC - prompt "ppc " - - config KERNEL_ARCH_POWERPC - bool - depends on ARCH_PPC - prompt "powerpc" - - config KERNEL_ARCH_X86 - bool - depends on ARCH_X86 - prompt "x86 " - - config KERNEL_ARCH_I386 - bool - depends on ARCH_X86 - prompt "i386 " - - config KERNEL_ARCH_X86_64 - bool - depends on ARCH_X86 - prompt "x86_64 " - -endchoice - -config KERNEL_ARCH_STRING - string - default "arm" if ARCH_ARM - default "arm64" if ARCH_ARM64 - default "armnommu" if ARCH_ARM && !HAS_MMU - default "alpha" if ARCH_ALPHA - default "avr32" if ARCH_AVR32 - default "blackfin" if ARCH_BLACKFIN - default "m68k" if ARCH_M68K - default "sparc" if ARCH_SPARC - default "mips" if ARCH_MIPS - default "cris" if ARCH_CRIS - default "parisc" if ARCH_PARISC - default "sh" if ARCH_SH - - default "ppc" if KERNEL_ARCH_PPC - default "powerpc" if KERNEL_ARCH_POWERPC - default "x86" if KERNEL_ARCH_X86 - default "i386" if KERNEL_ARCH_I386 - default "x86_64" if KERNEL_ARCH_X86_64 - default "riscv" if ARCH_RISCV - -choice prompt "Image Type " default KERNEL_IMAGE_BZ |