Skip to content

kill i386 and x86_64 directories

Sam Ravnborg lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 20 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6x86: move i386 and x86_64 Makefiles to arch/x86Makefile arch/x86/Makefile arch/x86/Makefile_32 +2 more+21 -110 replies
2/6x86: move defconfig files for i386 and x86_64 to x86arch/x86/Makefile arch/x86/configs/i386_defconfig arch/x86/configs/x86_64_defconfig +1 more+7 -40 replies
3/6x86: unification of i386 and x86_64 Kconfig.debugarch/i386/Kconfig.debug arch/x86_64/Kconfig arch/x86_64/Kconfig.debug+82 -245 replies
4/6kconfig: small code refactoring in kconfig Makefilescripts/kconfig/Makefile+15 -130 replies
5/6x86: move i386 and x86_64 Kconfig files to x86 directoryarch/x86/Kconfig.cpu arch/x86/Kconfig.debug arch/x86/Kconfig.i386 +3 more+9 -1237 replies
6/6x86: kill the old i386 and x86_64 directoriesarch/i386/.gitignore arch/x86_64/.gitignore+0 -20 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/6] kill i386 and x86_64 directories

This series kill the old i386 and x86_64 directories. The relevant files are moved and adapted and Kconfig.debug was consolidated (thanks to Randy).

I had to modify both the top-lvel Makefile and the kconfig Makefile to accomplish this. It was done in such a way that it is trivial for other archs to use the same mechanism should they have the need.

To solve the defconfig issue (i386 and x86_64 cannot share one) the arch/x86/configs/ directory were introduced. This has been used by other archs for some time now but x86 had not had the need until now.

The Kconfig files could be consolidated much more - I only did the minimal changes to make it work in the new place.

Total diffstat (in git format):

 Makefile                                           |    7 ++-
 arch/i386/.gitignore                               |    1 -
 arch/{i386 => x86}/Kconfig.cpu                     |    0 
 arch/{i386 => x86}/Kconfig.debug                   |   51 +++++++++++++---
 arch/{i386/Kconfig => x86/Kconfig.i386}            |    4 +-
 arch/{x86_64/Kconfig => x86/Kconfig.x86_64}        |    6 +--
 arch/x86/Makefile                                  |   16 +++++
 arch/{i386/Makefile => x86/Makefile_32}            |    7 +--
 arch/{i386/Makefile.cpu => x86/Makefile_32.cpu}    |    0 
 arch/{x86_64/Makefile => x86/Makefile_64}          |    5 +-
 .../{i386/defconfig => x86/configs/i386_defconfig} |    0 
 .../defconfig => x86/configs/x86_64_defconfig}     |    0 
 arch/x86_64/.gitignore                             |    1 -
 arch/x86_64/Kconfig.debug                          |   61 --------------------
 scripts/kconfig/Makefile                           |   35 +++++++-----
 15 files changed, 89 insertions(+), 105 deletions(-)

Patches follows.
The full serie can be pulled from:

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

Note: The serie were slightly modfied compared to the fist published
version.

Sam