Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a052f447 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86:
  x86: enable "make ARCH=x86"
  x86: do not use $(ARCH) when not needed
  kconfig: use $K64BIT to set 64BIT with all*config targets
  kconfig: add helper to set config symbol from environment variable
  kconfig: factor out code in confdata.c
  x86: move the rest of the menu's to Kconfig
  x86: move all simple arch settings to Kconfig
  x86: copy x86_64 specific Kconfig symbols to Kconfig.i386
  x86: add X86_64 dependency to x86_64 specific symbols in Kconfig.x86_64
  x86: add X86_32 dependency to i386 specific symbols in Kconfig.i386
  x86: arch/x86/Kconfig.cpu unification
  x86: start unification of arch/x86/Kconfig.*
  x86: unification of cfufreq/Kconfig
parents 6f37ac79 daa93fab

Makefile

+10 −3
Original line number Diff line number Diff line
@@ -197,8 +197,15 @@ CROSS_COMPILE ?= 
UTS_MACHINE 	:= $(ARCH)

SRCARCH 	:= $(ARCH)



# for i386 and x86_64 we use SRCARCH equal to x86

SRCARCH := $(if $(filter x86_64 i386,$(SRCARCH)),x86,$(SRCARCH))

# Additional ARCH settings for x86

ifeq ($(ARCH),i386)

        SRCARCH := x86

        K64BIT  := n

endif

ifeq ($(ARCH),x86_64)

        SRCARCH := x86

        K64BIT  := y

endif



KCONFIG_CONFIG	?= .config
@@ -334,7 +341,7 @@ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) 
KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)



export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC

export ARCH SRCARCH K64BIT CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC

export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE

export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS

README

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ CONFIGURING the kernel: 
   "make *config" checks for a file named "all{yes/mod/no/random}.config"

   for symbol values that are to be forced.  If this file is not found,

   it checks for a file named "all.config" to contain forced values.

   Finally it checks the environment variable K64BIT and if found, sets

   the config symbol "64BIT" to the value of the K64BIT variable.

   

	NOTES on "make config":

	- having unnecessary drivers will make the kernel bigger, and can