Skip to content

Reorganize directory structure

Peter Tyser u-boot 5 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest20 patches 0 repliesNew
  2. v3 posting 2/20 of 20 patches 0 repliesSuperseded
  3. v3 posting 1/220 patches 0 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v220 patches0 repliesSuperseded
v10 of 17 patches0 repliesSuperseded

Changes in v4 from the cover letter

- Set CPUDIR variable earlier to prevent build errors on some arches
- Fix out of tree building for ARM

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/20Create CPUDIR variableMakefile board/freescale/mpc8536ds/config.mk board/freescale/mpc8569mds/config.mk +11 more+33 -320 replies
2/20Change directory-specific CFLAGS to use full pathboard/bf518f-ezbrd/config.mk board/bf526-ezbrd/config.mk board/bf527-ezkit/config.mk +17 more+30 -250 replies
3/20Move lib_$ARCH directories to arch/$ARCH/libMakefile README arch/arm/config.mk +248 more+232 -2320 replies
4/20Rename lib_generic/ to lib/Makefile README board/BuS/EB+MCF-EV123/u-boot.lds +191 more+321 -3210 replies
5/20Move libfdt/ into lib/Makefile lib/libfdt/Makefile lib/libfdt/README +9 more+7 -70 replies
6/20Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"board/amcc/bamboo/init.S board/amcc/canyonlands/init.S board/amcc/ebony/init.S +30 more+36 -360 replies
7/20Move architecture-specific includes to arch/$ARCH/include/asmarch/arm/include/asm/arch-a320/a320.h arch/arm/include/asm/arch-a320/ftpmu010.h arch/arm/include/asm/arch-a320/ftsdmc020.h +626 more+9 -110 replies
8/20ppc: Move cpu/$CPU to arch/ppc/cpu/$CPUMakefile README arch/ppc/cpu/74xx_7xx/Makefile +439 more+392 -3873 replies
8/20ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU+0 -00 replies
9/20sh: Move cpu/$CPU to arch/sh/cpu/$CPUarch/sh/cpu/sh2/Makefile arch/sh/cpu/sh2/cache.c arch/sh/cpu/sh2/config.mk +22 more+4 -40 replies
10/20arm: Move cpu/$CPU to arch/arm/cpu/$CPUMakefile arch/arm/cpu/arm1136/Makefile arch/arm/cpu/arm1136/config.mk +404 more+56 -560 replies
11/20m68k: Move cpu/$CPU to arch/m68k/cpu/$CPUarch/m68k/cpu/mcf5227x/Makefile arch/m68k/cpu/mcf5227x/config.mk arch/m68k/cpu/mcf5227x/cpu.c +76 more+88 -880 replies
12/20blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*Makefile arch/blackfin/cpu/.gitignore arch/blackfin/cpu/Makefile +26 more+30 -300 replies
13/20mips: Move cpu/mips/* to arch/mips/cpu/*arch/mips/cpu/Makefile arch/mips/cpu/asc_serial.c arch/mips/cpu/asc_serial.h +16 more+6 -60 replies
14/20avr32: Move cpu/at32ap/* to arch/avr32/cpu/*arch/avr32/cpu/Makefile arch/avr32/cpu/at32ap700x/Makefile arch/avr32/cpu/at32ap700x/clk.c +15 more+1 -10 replies
15/20microblaze: Move cpu/microblaze/* to arch/microblaze/cpu/*arch/microblaze/cpu/Makefile arch/microblaze/cpu/cache.c arch/microblaze/cpu/cpu.c +6 more+1 -10 replies
16/20i386: Move cpu/i386/* to arch/i386/cpu/*arch/i386/cpu/Makefile arch/i386/cpu/config.mk arch/i386/cpu/cpu.c +14 more+4 -40 replies
17/20sparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23]arch/sparc/cpu/leon2/Makefile arch/sparc/cpu/leon2/config.mk arch/sparc/cpu/leon2/cpu.c +21 more+5 -50 replies
18/20nios: Move cpu/nios/* to arch/nios/cpu/*arch/nios/cpu/Makefile arch/nios/cpu/asmi.c arch/nios/cpu/config.mk +15 more+9 -90 replies
19/20nios2: Move cpu/nios2/* to arch/nios2/cpu/*arch/nios2/cpu/Makefile arch/nios2/cpu/config.mk arch/nios2/cpu/cpu.c +6 more+0 -00 replies
20/20Update README to reflect new directory structureREADME+91 -670 replies

Reviews trailers per patch

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

Read the v4 thread

Cover letter [U-Boot] [PATCH v4 00/20] Reorganize directory structure

This series reorganizes U-Boot's directory structure so that it looks
like:
/arch/$ARCH/
/lib/<sources currently in lib_$ARCH/>
/include/asm/<headers currently in incluce/asm-$ARCH/> /cpu/<appropriate cpu directories in cpu/ or just files in cpu/$CPU if 1 CPU type> /config.mk (old lib_$ARCH/config.mk)

/lib/

        /<source files currently in lib_generic>
        /libfdt/
        /lzma/
        /lzo/

Patches 8 through 19 can be squashed if desired, I split them up to keep the series somewhat manageable. Some of the patches still exceed the mailinglist's arbitrary size limit. I can post the series on a website if needed.

I compile tested on PPC, mips, and blackfin and no new errors were introduced.

The previous discussion about this series can be seen at
http://lists.denx.de/pipermail/u-boot/2009-December/065391.html

Changes since v1:
- Convert to using directory-specific CFLAGS
- No cpu subdirectories for 1-CPU architectures (eg blackfin, mips, etc) as mentioned by Mike Frysinger
- Fix libfdt path typo pointed out by Luigi Mantellini
- Added final README fixup patch

Changes since v2:
- Rebased on current TOT

Changes since v3:
- Set CPUDIR variable earlier to prevent build errors on some arches
- Fix out of tree building for ARM

Peter Tyser (20):
Create CPUDIR variable
Change directory-specific CFLAGS to use full path Move lib_$ARCH directories to arch/$ARCH/lib
Rename lib_generic/ to lib/
Move libfdt/ into lib/
Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>" Move architecture-specific includes to arch/$ARCH/include/asm
ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU
sh: Move cpu/$CPU to arch/sh/cpu/$CPU
arm: Move cpu/$CPU to arch/arm/cpu/$CPU
m68k: Move cpu/$CPU to arch/m68k/cpu/$CPU
blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*
mips: Move cpu/mips/* to arch/mips/cpu/*
avr32: Move cpu/at32ap/* to arch/avr32/cpu/*
microblaze: Move cpu/microblaze/* to arch/microblaze/cpu/*
i386: Move cpu/i386/* to arch/i386/cpu/*
sparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23]
nios: Move cpu/nios/* to arch/nios/cpu/*
nios2: Move cpu/nios2/* to arch/nios2/cpu/*
Update README to reflect new directory structure

Read the cover letter in its thread