Skip to content
  • Michael Ellerman's avatar
    powerpc: Stop passing ARCH=ppc64 to boot Makefile · 1196d7aa
    Michael Ellerman authored
    Back in 2005 when the ppc/ppc64 merge started, we used to build the
    kernel code in arch/powerpc but use the boot code from arch/ppc or
    arch/ppc64 depending on whether we were building for 32 or 64-bit.
    
    Originally we called the boot Makefile passing ARCH=$(OLDARCH), where
    OLDARCH was ppc or ppc64.
    
    In commit 20f62954 ("powerpc: Make building the boot image work for
    both 32-bit and 64-bit") (2005-10-11) we split the call for 32/64-bit
    using an ifeq check, because the two Makefiles took different targets,
    and explicitly passed ARCH=ppc64 for the 64-bit case and ARCH=ppc for
    the 32-bit case.
    
    Then in commit 94b212c2
    
     ("powerpc: Move ppc64 boot wrapper code over
    to arch/powerpc") (2005-11-16) we moved the boot code into arch/powerpc
    and dropped the ppc case, but kept passing ARCH=ppc64 to
    arch/powerpc/boot/Makefile.
    
    Since then there have been several more boot targets added, all of which
    have copied the ARCH=ppc64 setting, such that now we have four targets
    using it.
    
    Currently it seems that nothing actually uses the ARCH value, but that's
    basically just luck, and in particular it prevents us from using the
    generic cpp_lds_S rule. It's also clearly wrong, ARCH=ppc64 is dead,
    buried and cremated.
    
    Fix it by dropping the setting of ARCH completely, the correct value is
    exported by the top level Makefile.
    
    Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
    1196d7aa