--- zzzz-none-000/linux-5.15.111/arch/arm/Makefile 2023-05-11 14:00:40.000000000 +0000 +++ puma7-arm-6670-761/linux-5.15.111/arch/arm/Makefile 2024-02-07 09:27:15.000000000 +0000 @@ -10,6 +10,9 @@ # # Copyright (C) 1995-2001 by Russell King +# Includes Intel Corporation's changes/modifications dated: 2017. +# Changed/modified portions - Copyright © 2017, Intel Corporation. + LDFLAGS_vmlinux := --no-undefined -X --pic-veneer -z norelro ifeq ($(CONFIG_CPU_ENDIAN_BE8),y) LDFLAGS_vmlinux += --be8 @@ -94,7 +97,7 @@ tune-$(CONFIG_CPU_XSC3) =-mtune=xscale tune-$(CONFIG_CPU_FEROCEON) =-mtune=xscale tune-$(CONFIG_CPU_V6) =-mtune=arm1136j-s -tune-$(CONFIG_CPU_V6K) =-mtune=arm1136j-s +tune-$(CONFIG_CPU_V6K) =-mtune=arm1176jz-s # Evaluate tune cc-option calls now tune-y := $(tune-y) @@ -128,6 +131,11 @@ KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float +# Puma ARM core do not suppots unaligned access +ifeq ($(CONFIG_ARCH_AVALANCHE),y) +KBUILD_CFLAGS +=$(call cc-option,-mno-unaligned-access) +endif + CHECKFLAGS += -D__arm__ #Default value @@ -152,6 +160,8 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 textofs-$(CONFIG_ARCH_MESON) := 0x00208000 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 +textofs-$(CONFIG_ARCH_AVALANCHE) := 0x00018000 + # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. @@ -160,6 +170,7 @@ machine-$(CONFIG_ARCH_ARTPEC) += artpec machine-$(CONFIG_ARCH_ASPEED) += aspeed machine-$(CONFIG_ARCH_AT91) += at91 +machine-$(CONFIG_ARCH_AVALANCHE) += avalanche machine-$(CONFIG_ARCH_AXXIA) += axxia machine-$(CONFIG_ARCH_BCM) += bcm machine-$(CONFIG_ARCH_BERLIN) += berlin @@ -231,6 +242,12 @@ # The byte offset of the kernel image in RAM from the start of RAM. TEXT_OFFSET := $(textofs-y) +ifeq ($(incdir-y),) +incdir-y := $(machine-y) +endif +INCDIR := arch-$(incdir-y) + + # The first directory contains additional information for the boot setup code ifneq ($(machine-y),) MACHINE := arch/arm/mach-$(word 1,$(machine-y))/ @@ -254,6 +271,7 @@ # If we have a machine-specific directory, then include it in the build. core-y += $(machdirs) $(platdirs) +core-$(CONFIG_AVM_ENHANCED) += arch/arm/avm_enh/ # For cleaning core- += $(patsubst %,arch/arm/mach-%/, $(machine-))