Skip to contentSkip to conversation

Pull request for branch remove-target-dir

GIT PULL New Thomas Petazzoni 3 participants 9 messages Sep 24, 2012 – Nov 3, 2012 Kbuild

lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

Hello,

The goal of this branch is to get rid of the target/ directory, which has now become mostly useless since the Xtensa architecture has been removed.

* Patch 1 creates a new top-level directory called 'system' to store the default device table, the default skeleton, and system-wide configuration options.

* Patch 2 removes the last file from target/, Config.in.arch, by splitting it into smaller chunks into a new top-level arch/ directory.

* Patch 3 improves the organization of files in arch/ by moving all the gcc mtune, march, mcpu and al. definitions to each architecture-specific file rather than having a big Config.in.common file for those definitions. Idea given by Yann E. Morin.

Changes from v1:

* Get rid of the Xtensa removal patch, since it has been applied.

* Squash the patch remove target/Makefile.in into the patch moving stuff into system/, since it was causing bisection breakage.

* Implement Yann's idea on how to implement nicely the definition of the gcc mtune, mcpu, march and al. values.

Best regards,

Thomas

The following changes since commit 90f908f21e4f7b1b7dd0c4c44515db67f441dcc3:

xlsclient: unbreak build (2012-09-23 21:27:13 +0200)

are available in the git repository at:

git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git remove-target-dir

for you to fetch changes up to a9b004ff67d93f81796aa2a6a10734cf1d59ccf2:

arch: improve definition of gcc mtune, mcpu, etc. (2012-09-24 08:17:46 +0200)

----------------------------------------------------------------
Thomas Petazzoni (3):
New top-level directory: system
Split target/Config.in.arch into multiple Config.in.* in arch/
arch: improve definition of gcc mtune, mcpu, etc.

 Config.in                                          |    4 +-
 Makefile                                           |    2 +-
 arch/Config.in                                     |  201 +++++
 arch/Config.in.arm                                 |  114 +++
 arch/Config.in.avr32                               |    5 +
 arch/Config.in.bfin                                |   16 +
 fs/skeleton/bin/.empty => arch/Config.in.common    |    0
 arch/Config.in.m68k                                |   21 +
 arch/Config.in.microblaze                          |   10 +
 arch/Config.in.mips                                |   79 ++
 arch/Config.in.powerpc                             |  128 +++
 arch/Config.in.sh                                  |   41 +
 arch/Config.in.sparc                               |   69 ++
 arch/Config.in.x86                                 |  235 ++++++
 {target/generic => system}/Config.in               |    2 +-
 {target/generic => system}/device_table.txt        |    0
 {target/generic => system}/device_table_dev.txt    |    0
 .../dev/pts => system/skeleton/bin}/.empty         |    0
 {fs => system}/skeleton/dev/log                    |    0
 .../skeleton/dev/pts}/.empty                       |    0
 {fs => system}/skeleton/etc/TZ                     |    0
 {fs => system}/skeleton/etc/fstab                  |    0
 {fs => system}/skeleton/etc/group                  |    0
 {fs => system}/skeleton/etc/hostname               |    0
 {fs => system}/skeleton/etc/hosts                  |    0
 {fs => system}/skeleton/etc/init.d/S20urandom      |    0
 {fs => system}/skeleton/etc/init.d/S40network      |    0
 {fs => system}/skeleton/etc/init.d/rcK             |    0
 {fs => system}/skeleton/etc/init.d/rcS             |    0
 {fs => system}/skeleton/etc/inittab                |    0
 {fs => system}/skeleton/etc/inputrc                |    0
 {fs => system}/skeleton/etc/issue                  |    0
 .../skeleton/etc/ld.so.conf.d}/.empty              |    0
 {fs => system}/skeleton/etc/mtab                   |    0
 .../skeleton/etc/network/if-down.d}/.empty         |    0
 .../skeleton/etc/network/if-post-down.d}/.empty    |    0
 .../skeleton/etc/network/if-pre-up.d}/.empty       |    0
 .../skeleton/etc/network/if-up.d}/.empty           |    0
 {fs => system}/skeleton/etc/network/interfaces     |    0
 {fs => system}/skeleton/etc/passwd                 |    0
 {fs => system}/skeleton/etc/profile                |    0
 {fs => system}/skeleton/etc/protocols              |    0
 {fs => system}/skeleton/etc/random-seed            |  Bin 512 -> 512 bytes
 {fs => system}/skeleton/etc/resolv.conf            |    0
 {fs => system}/skeleton/etc/securetty              |    0
 {fs => system}/skeleton/etc/services               |    0
 {fs => system}/skeleton/etc/shadow                 |    0
 .../lib => system/skeleton/home/ftp}/.empty        |    0
 {fs/skeleton/media => system/skeleton/lib}/.empty  |    0
 {fs/skeleton/mnt => system/skeleton/media}/.empty  |    0
 {fs/skeleton/opt => system/skeleton/mnt}/.empty    |    0
 {fs/skeleton/proc => system/skeleton/opt}/.empty   |    0
 {fs/skeleton/root => system/skeleton/proc}/.empty  |    0
 {fs => system}/skeleton/root/.bash_history         |    0
 {fs => system}/skeleton/root/.bash_logout          |    0
 {fs => system}/skeleton/root/.bash_profile         |    0
 {fs/skeleton/sbin => system/skeleton/root}/.empty  |    0
 {fs => system}/skeleton/run                        |    0
 {fs/skeleton/sys => system/skeleton/sbin}/.empty   |    0
 {fs/skeleton/tmp => system/skeleton/sys}/.empty    |    0
 .../usr/bin => system/skeleton/tmp}/.empty         |    0
 .../usr/lib => system/skeleton/usr/bin}/.empty     |    0
 .../usr/sbin => system/skeleton/usr/lib}/.empty    |    0
 {fs => system}/skeleton/var/cache                  |    0
 {fs => system}/skeleton/var/lib/misc               |    0
 {fs => system}/skeleton/var/lib/pcmcia             |    0
 {fs => system}/skeleton/var/lock                   |    0
 {fs => system}/skeleton/var/log                    |    0
 {fs => system}/skeleton/var/pcmcia                 |    0
 {fs => system}/skeleton/var/run                    |    0
 {fs => system}/skeleton/var/spool                  |    0
 {fs => system}/skeleton/var/tmp                    |    0
 target/generic/Makefile.in => system/system.mk     |    0
 target/Config.in.arch                              |  822 --------------------
 target/Makefile.in                                 |    3 -
 75 files changed, 923 insertions(+), 829 deletions(-)
 create mode 100644 arch/Config.in
 create mode 100644 arch/Config.in.arm
 create mode 100644 arch/Config.in.avr32
 create mode 100644 arch/Config.in.bfin
 rename fs/skeleton/bin/.empty => arch/Config.in.common (100%)
 create mode 100644 arch/Config.in.m68k
 create mode 100644 arch/Config.in.microblaze
 create mode 100644 arch/Config.in.mips
 create mode 100644 arch/Config.in.powerpc
 create mode 100644 arch/Config.in.sh
 create mode 100644 arch/Config.in.sparc
 create mode 100644 arch/Config.in.x86
 rename {target/generic => system}/Config.in (99%)
 rename {target/generic => system}/device_table.txt (100%)
 rename {target/generic => system}/device_table_dev.txt (100%)
 rename {fs/skeleton/dev/pts => system/skeleton/bin}/.empty (100%)
 rename {fs => system}/skeleton/dev/log (100%)
 rename {fs/skeleton/etc/ld.so.conf.d => system/skeleton/dev/pts}/.empty (100%)
 rename {fs => system}/skeleton/etc/TZ (100%)
 rename {fs => system}/skeleton/etc/fstab (100%)
 rename {fs => system}/skeleton/etc/group (100%)
 rename {fs => system}/skeleton/etc/hostname (100%)
 rename {fs => system}/skeleton/etc/hosts (100%)
 rename {fs => system}/skeleton/etc/init.d/S20urandom (100%)
 rename {fs => system}/skeleton/etc/init.d/S40network (100%)
 rename {fs => system}/skeleton/etc/init.d/rcK (100%)
 rename {fs => system}/skeleton/etc/init.d/rcS (100%)
 rename {fs => system}/skeleton/etc/inittab (100%)
 rename {fs => system}/skeleton/etc/inputrc (100%)
 rename {fs => system}/skeleton/etc/issue (100%)
 rename {fs/skeleton/etc/network/if-down.d => system/skeleton/etc/ld.so.conf.d}/.empty (100%)
 rename {fs => system}/skeleton/etc/mtab (100%)
 rename {fs/skeleton/etc/network/if-post-down.d => system/skeleton/etc/network/if-down.d}/.empty (100%)
 rename {fs/skeleton/etc/network/if-pre-up.d => system/skeleton/etc/network/if-post-down.d}/.empty (100%)
 rename {fs/skeleton/etc/network/if-up.d => system/skeleton/etc/network/if-pre-up.d}/.empty (100%)
 rename {fs/skeleton/home/ftp => system/skeleton/etc/network/if-up.d}/.empty (100%)
 rename {fs => system}/skeleton/etc/network/interfaces (100%)
 rename {fs => system}/skeleton/etc/passwd (100%)
 rename {fs => system}/skeleton/etc/profile (100%)
 rename {fs => system}/skeleton/etc/protocols (100%)
 rename {fs => system}/skeleton/etc/random-seed (100%)
 rename {fs => system}/skeleton/etc/resolv.conf (100%)
 rename {fs => system}/skeleton/etc/securetty (100%)
 rename {fs => system}/skeleton/etc/services (100%)
 rename {fs => system}/skeleton/etc/shadow (100%)
 rename {fs/skeleton/lib => system/skeleton/home/ftp}/.empty (100%)
 rename {fs/skeleton/media => system/skeleton/lib}/.empty (100%)
 rename {fs/skeleton/mnt => system/skeleton/media}/.empty (100%)
 rename {fs/skeleton/opt => system/skeleton/mnt}/.empty (100%)
 rename {fs/skeleton/proc => system/skeleton/opt}/.empty (100%)
 rename {fs/skeleton/root => system/skeleton/proc}/.empty (100%)
 rename {fs => system}/skeleton/root/.bash_history (100%)
 rename {fs => system}/skeleton/root/.bash_logout (100%)
 rename {fs => system}/skeleton/root/.bash_profile (100%)
 rename {fs/skeleton/sbin => system/skeleton/root}/.empty (100%)
 rename {fs => system}/skeleton/run (100%)
 rename {fs/skeleton/sys => system/skeleton/sbin}/.empty (100%)
 rename {fs/skeleton/tmp => system/skeleton/sys}/.empty (100%)
 rename {fs/skeleton/usr/bin => system/skeleton/tmp}/.empty (100%)
 rename {fs/skeleton/usr/lib => system/skeleton/usr/bin}/.empty (100%)
 rename {fs/skeleton/usr/sbin => system/skeleton/usr/lib}/.empty (100%)
 create mode 100644 system/skeleton/usr/sbin/.empty
 rename {fs => system}/skeleton/var/cache (100%)
 rename {fs => system}/skeleton/var/lib/misc (100%)
 rename {fs => system}/skeleton/var/lib/pcmcia (100%)
 rename {fs => system}/skeleton/var/lock (100%)
 rename {fs => system}/skeleton/var/log (100%)
 rename {fs => system}/skeleton/var/pcmcia (100%)
 rename {fs => system}/skeleton/var/run (100%)
 rename {fs => system}/skeleton/var/spool (100%)
 rename {fs => system}/skeleton/var/tmp (100%)
 rename target/generic/Makefile.in => system/system.mk (100%)
 delete mode 100644 target/Config.in.arch
 delete mode 100644 target/Makefile.in

Thanks,

Signature · 1 line
Thomas Petazzoni
author
#1 lore raw

PATCH 1/3 New top-level directory: system

This directory groups the following elements:
* the default root filesystem skeleton
* the default device tables
* the Config.in options for system configuration (UART port for getty, system hostname, etc.)
* the make rules to apply the system configuration options

Even though the skeleton and device tables could have lived in fs/, it would have been strange to have the UART, system hostname and other related options into fs/. A new system/ directory makes more sense.

As a consequence, this patch also removes target/Makefile.in, which has become useless in the process.

Signed-off-by Thomas Petazzoni <[email protected]>
Acked-by Yann E. MORIN <[email protected]>
---
 Config.in                                          |    2 +-
 Makefile                                           |    2 +-
 {target/generic => system}/Config.in               |    2 +-
 {target/generic => system}/device_table.txt        |    0
 {target/generic => system}/device_table_dev.txt    |    0
 {fs => system}/skeleton/bin/.empty                 |    0
 {fs => system}/skeleton/dev/log                    |    0
 {fs => system}/skeleton/dev/pts/.empty             |    0
 {fs => system}/skeleton/etc/TZ                     |    0
 {fs => system}/skeleton/etc/fstab                  |    0
 {fs => system}/skeleton/etc/group                  |    0
 {fs => system}/skeleton/etc/hostname               |    0
 {fs => system}/skeleton/etc/hosts                  |    0
 {fs => system}/skeleton/etc/init.d/S20urandom      |    0
 {fs => system}/skeleton/etc/init.d/S40network      |    0
 {fs => system}/skeleton/etc/init.d/rcK             |    0
 {fs => system}/skeleton/etc/init.d/rcS             |    0
 {fs => system}/skeleton/etc/inittab                |    0
 {fs => system}/skeleton/etc/inputrc                |    0
 {fs => system}/skeleton/etc/issue                  |    0
 {fs => system}/skeleton/etc/ld.so.conf.d/.empty    |    0
 {fs => system}/skeleton/etc/mtab                   |    0
 .../skeleton/etc/network/if-down.d/.empty          |    0
 .../skeleton/etc/network/if-post-down.d/.empty     |    0
 .../skeleton/etc/network/if-pre-up.d/.empty        |    0
 {fs => system}/skeleton/etc/network/if-up.d/.empty |    0
 {fs => system}/skeleton/etc/network/interfaces     |    0
 {fs => system}/skeleton/etc/passwd                 |    0
 {fs => system}/skeleton/etc/profile                |    0
 {fs => system}/skeleton/etc/protocols              |    0
 {fs => system}/skeleton/etc/random-seed            |  Bin 512 -> 512 bytes
 {fs => system}/skeleton/etc/resolv.conf            |    0
 {fs => system}/skeleton/etc/securetty              |    0
 {fs => system}/skeleton/etc/services               |    0
 {fs => system}/skeleton/etc/shadow                 |    0
 {fs => system}/skeleton/home/ftp/.empty            |    0
 {fs => system}/skeleton/lib/.empty                 |    0
 {fs => system}/skeleton/media/.empty               |    0
 {fs => system}/skeleton/mnt/.empty                 |    0
 {fs => system}/skeleton/opt/.empty                 |    0
 {fs => system}/skeleton/proc/.empty                |    0
 {fs => system}/skeleton/root/.bash_history         |    0
 {fs => system}/skeleton/root/.bash_logout          |    0
 {fs => system}/skeleton/root/.bash_profile         |    0
 {fs => system}/skeleton/root/.empty                |    0
 {fs => system}/skeleton/run                        |    0
 {fs => system}/skeleton/sbin/.empty                |    0
 {fs => system}/skeleton/sys/.empty                 |    0
 {fs => system}/skeleton/tmp/.empty                 |    0
 {fs => system}/skeleton/usr/bin/.empty             |    0
 {fs => system}/skeleton/usr/lib/.empty             |    0
 {fs => system}/skeleton/usr/sbin/.empty            |    0
 {fs => system}/skeleton/var/cache                  |    0
 {fs => system}/skeleton/var/lib/misc               |    0
 {fs => system}/skeleton/var/lib/pcmcia             |    0
 {fs => system}/skeleton/var/lock                   |    0
 {fs => system}/skeleton/var/log                    |    0
 {fs => system}/skeleton/var/pcmcia                 |    0
 {fs => system}/skeleton/var/run                    |    0
 {fs => system}/skeleton/var/spool                  |    0
 {fs => system}/skeleton/var/tmp                    |    0
 target/generic/Makefile.in => system/system.mk     |    0
 target/Makefile.in                                 |    3 ---
 63 files changed, 3 insertions(+), 6 deletions(-)
 rename {target/generic => system}/Config.in (99%)
 rename {target/generic => system}/device_table.txt (100%)
 rename {target/generic => system}/device_table_dev.txt (100%)
 rename {fs => system}/skeleton/bin/.empty (100%)
 rename {fs => system}/skeleton/dev/log (100%)
 rename {fs => system}/skeleton/dev/pts/.empty (100%)
 rename {fs => system}/skeleton/etc/TZ (100%)
 rename {fs => system}/skeleton/etc/fstab (100%)
 rename {fs => system}/skeleton/etc/group (100%)
 rename {fs => system}/skeleton/etc/hostname (100%)
 rename {fs => system}/skeleton/etc/hosts (100%)
 rename {fs => system}/skeleton/etc/init.d/S20urandom (100%)
 rename {fs => system}/skeleton/etc/init.d/S40network (100%)
 rename {fs => system}/skeleton/etc/init.d/rcK (100%)
 rename {fs => system}/skeleton/etc/init.d/rcS (100%)
 rename {fs => system}/skeleton/etc/inittab (100%)
 rename {fs => system}/skeleton/etc/inputrc (100%)
 rename {fs => system}/skeleton/etc/issue (100%)
 rename {fs => system}/skeleton/etc/ld.so.conf.d/.empty (100%)
 rename {fs => system}/skeleton/etc/mtab (100%)
 rename {fs => system}/skeleton/etc/network/if-down.d/.empty (100%)
 rename {fs => system}/skeleton/etc/network/if-post-down.d/.empty (100%)
 rename {fs => system}/skeleton/etc/network/if-pre-up.d/.empty (100%)
 rename {fs => system}/skeleton/etc/network/if-up.d/.empty (100%)
 rename {fs => system}/skeleton/etc/network/interfaces (100%)
 rename {fs => system}/skeleton/etc/passwd (100%)
 rename {fs => system}/skeleton/etc/profile (100%)
 rename {fs => system}/skeleton/etc/protocols (100%)
 rename {fs => system}/skeleton/etc/random-seed (100%)
 rename {fs => system}/skeleton/etc/resolv.conf (100%)
 rename {fs => system}/skeleton/etc/securetty (100%)
 rename {fs => system}/skeleton/etc/services (100%)
 rename {fs => system}/skeleton/etc/shadow (100%)
 rename {fs => system}/skeleton/home/ftp/.empty (100%)
 rename {fs => system}/skeleton/lib/.empty (100%)
 rename {fs => system}/skeleton/media/.empty (100%)
 rename {fs => system}/skeleton/mnt/.empty (100%)
 rename {fs => system}/skeleton/opt/.empty (100%)
 rename {fs => system}/skeleton/proc/.empty (100%)
 rename {fs => system}/skeleton/root/.bash_history (100%)
 rename {fs => system}/skeleton/root/.bash_logout (100%)
 rename {fs => system}/skeleton/root/.bash_profile (100%)
 rename {fs => system}/skeleton/root/.empty (100%)
 rename {fs => system}/skeleton/run (100%)
 rename {fs => system}/skeleton/sbin/.empty (100%)
 rename {fs => system}/skeleton/sys/.empty (100%)
 rename {fs => system}/skeleton/tmp/.empty (100%)
 rename {fs => system}/skeleton/usr/bin/.empty (100%)
 rename {fs => system}/skeleton/usr/lib/.empty (100%)
 rename {fs => system}/skeleton/usr/sbin/.empty (100%)
 rename {fs => system}/skeleton/var/cache (100%)
 rename {fs => system}/skeleton/var/lib/misc (100%)
 rename {fs => system}/skeleton/var/lib/pcmcia (100%)
 rename {fs => system}/skeleton/var/lock (100%)
 rename {fs => system}/skeleton/var/log (100%)
 rename {fs => system}/skeleton/var/pcmcia (100%)
 rename {fs => system}/skeleton/var/run (100%)
 rename {fs => system}/skeleton/var/spool (100%)
 rename {fs => system}/skeleton/var/tmp (100%)
 rename target/generic/Makefile.in => system/system.mk (100%)
 delete mode 100644 target/Makefile.in
Config.in +1 -1
index dab7787..cce4619 100644
@@ -419,7 +419,7 @@ endmenu
 
 source "toolchain/Config.in"
 
-source "target/generic/Config.in"
+source "system/Config.in"
 
 source "package/Config.in"
Makefile +1 -1
index 6536bca..ac4aa39 100644
@@ -309,7 +309,6 @@ endif
 include package/*/*.mk
 
 include boot/common.mk
-include target/Makefile.in
 include linux/linux.mk
 
 TARGETS+=target-finalize

@@ -324,6 +323,7 @@ TARGETS+=target-generatelocales
 endif
 endif
 
+include system/system.mk
 include fs/common.mk
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
system/Config.in renamed from target/generic/Config.in +1 -1
similarity index 99%
rename from target/generic/Config.in
rename to system/Config.in
index b8472f4..c30c6f7 100644
@@ -111,7 +111,7 @@ endchoice
 if BR2_ROOTFS_SKELETON_CUSTOM
 config BR2_ROOTFS_SKELETON_CUSTOM_PATH
 	string "custom target skeleton path"
-	default "fs/skeleton"
+	default "system/skeleton"
 	help
 	  Path custom target skeleton.
 endif
system/device_table.txt renamed from target/generic/device_table.txt +0 -0
similarity index 100%
rename from target/generic/device_table.txt
rename to system/device_table.txt
system/device_table_dev.txt renamed from target/generic/device_table_dev.txt +0 -0
similarity index 100%
rename from target/generic/device_table_dev.txt
rename to system/device_table_dev.txt
system/skeleton/bin/.empty renamed from fs/skeleton/bin/.empty +0 -0
similarity index 100%
rename from fs/skeleton/bin/.empty
rename to system/skeleton/bin/.empty
system/skeleton/dev/log renamed from fs/skeleton/dev/log +0 -0
similarity index 100%
rename from fs/skeleton/dev/log
rename to system/skeleton/dev/log
system/skeleton/dev/pts/.empty renamed from fs/skeleton/dev/pts/.empty +0 -0
similarity index 100%
rename from fs/skeleton/dev/pts/.empty
rename to system/skeleton/dev/pts/.empty
system/skeleton/etc/TZ renamed from fs/skeleton/etc/TZ +0 -0
similarity index 100%
rename from fs/skeleton/etc/TZ
rename to system/skeleton/etc/TZ
system/skeleton/etc/fstab renamed from fs/skeleton/etc/fstab +0 -0
similarity index 100%
rename from fs/skeleton/etc/fstab
rename to system/skeleton/etc/fstab
system/skeleton/etc/group renamed from fs/skeleton/etc/group +0 -0
similarity index 100%
rename from fs/skeleton/etc/group
rename to system/skeleton/etc/group
system/skeleton/etc/hostname renamed from fs/skeleton/etc/hostname +0 -0
similarity index 100%
rename from fs/skeleton/etc/hostname
rename to system/skeleton/etc/hostname
system/skeleton/etc/hosts renamed from fs/skeleton/etc/hosts +0 -0
similarity index 100%
rename from fs/skeleton/etc/hosts
rename to system/skeleton/etc/hosts
system/skeleton/etc/init.d/S20urandom renamed from fs/skeleton/etc/init.d/S20urandom +0 -0
similarity index 100%
rename from fs/skeleton/etc/init.d/S20urandom
rename to system/skeleton/etc/init.d/S20urandom
system/skeleton/etc/init.d/S40network renamed from fs/skeleton/etc/init.d/S40network +0 -0
similarity index 100%
rename from fs/skeleton/etc/init.d/S40network
rename to system/skeleton/etc/init.d/S40network
system/skeleton/etc/init.d/rcK renamed from fs/skeleton/etc/init.d/rcK +0 -0
similarity index 100%
rename from fs/skeleton/etc/init.d/rcK
rename to system/skeleton/etc/init.d/rcK
system/skeleton/etc/init.d/rcS renamed from fs/skeleton/etc/init.d/rcS +0 -0
similarity index 100%
rename from fs/skeleton/etc/init.d/rcS
rename to system/skeleton/etc/init.d/rcS
system/skeleton/etc/inittab renamed from fs/skeleton/etc/inittab +0 -0
similarity index 100%
rename from fs/skeleton/etc/inittab
rename to system/skeleton/etc/inittab
system/skeleton/etc/inputrc renamed from fs/skeleton/etc/inputrc +0 -0
similarity index 100%
rename from fs/skeleton/etc/inputrc
rename to system/skeleton/etc/inputrc
system/skeleton/etc/issue renamed from fs/skeleton/etc/issue +0 -0
similarity index 100%
rename from fs/skeleton/etc/issue
rename to system/skeleton/etc/issue
system/skeleton/etc/ld.so.conf.d/.empty renamed from fs/skeleton/etc/ld.so.conf.d/.empty +0 -0
similarity index 100%
rename from fs/skeleton/etc/ld.so.conf.d/.empty
rename to system/skeleton/etc/ld.so.conf.d/.empty
system/skeleton/etc/mtab renamed from fs/skeleton/etc/mtab +0 -0
similarity index 100%
rename from fs/skeleton/etc/mtab
rename to system/skeleton/etc/mtab
system/skeleton/etc/network/if-down.d/.empty renamed from fs/skeleton/etc/network/if-down.d/.empty +0 -0
similarity index 100%
rename from fs/skeleton/etc/network/if-down.d/.empty
rename to system/skeleton/etc/network/if-down.d/.empty
system/skeleton/etc/network/if-post-down.d/.empty renamed from fs/skeleton/etc/network/if-post-down.d/.empty +0 -0
similarity index 100%
rename from fs/skeleton/etc/network/if-post-down.d/.empty
rename to system/skeleton/etc/network/if-post-down.d/.empty
system/skeleton/etc/network/if-pre-up.d/.empty renamed from fs/skeleton/etc/network/if-pre-up.d/.empty +0 -0
similarity index 100%
rename from fs/skeleton/etc/network/if-pre-up.d/.empty
rename to system/skeleton/etc/network/if-pre-up.d/.empty
system/skeleton/etc/network/if-up.d/.empty renamed from fs/skeleton/etc/network/if-up.d/.empty +0 -0
similarity index 100%
rename from fs/skeleton/etc/network/if-up.d/.empty
rename to system/skeleton/etc/network/if-up.d/.empty
system/skeleton/etc/network/interfaces renamed from fs/skeleton/etc/network/interfaces +0 -0
similarity index 100%
rename from fs/skeleton/etc/network/interfaces
rename to system/skeleton/etc/network/interfaces
system/skeleton/etc/passwd renamed from fs/skeleton/etc/passwd +0 -0
similarity index 100%
rename from fs/skeleton/etc/passwd
rename to system/skeleton/etc/passwd
system/skeleton/etc/profile renamed from fs/skeleton/etc/profile +0 -0
similarity index 100%
rename from fs/skeleton/etc/profile
rename to system/skeleton/etc/profile
system/skeleton/etc/protocols renamed from fs/skeleton/etc/protocols +0 -0
similarity index 100%
rename from fs/skeleton/etc/protocols
rename to system/skeleton/etc/protocols
system/skeleton/etc/random-seed renamed from fs/skeleton/etc/random-seed +0 -0
similarity index 100%
rename from fs/skeleton/etc/random-seed
rename to system/skeleton/etc/random-seed
system/skeleton/etc/resolv.conf renamed from fs/skeleton/etc/resolv.conf +0 -0
similarity index 100%
rename from fs/skeleton/etc/resolv.conf
rename to system/skeleton/etc/resolv.conf
system/skeleton/etc/securetty renamed from fs/skeleton/etc/securetty +0 -0
similarity index 100%
rename from fs/skeleton/etc/securetty
rename to system/skeleton/etc/securetty
system/skeleton/etc/services renamed from fs/skeleton/etc/services +0 -0
similarity index 100%
rename from fs/skeleton/etc/services
rename to system/skeleton/etc/services
system/skeleton/etc/shadow renamed from fs/skeleton/etc/shadow +0 -0
similarity index 100%
rename from fs/skeleton/etc/shadow
rename to system/skeleton/etc/shadow
system/skeleton/home/ftp/.empty renamed from fs/skeleton/home/ftp/.empty +0 -0
similarity index 100%
rename from fs/skeleton/home/ftp/.empty
rename to system/skeleton/home/ftp/.empty
system/skeleton/lib/.empty renamed from fs/skeleton/lib/.empty +0 -0
similarity index 100%
rename from fs/skeleton/lib/.empty
rename to system/skeleton/lib/.empty
system/skeleton/media/.empty renamed from fs/skeleton/media/.empty +0 -0
similarity index 100%
rename from fs/skeleton/media/.empty
rename to system/skeleton/media/.empty
system/skeleton/mnt/.empty renamed from fs/skeleton/mnt/.empty +0 -0
similarity index 100%
rename from fs/skeleton/mnt/.empty
rename to system/skeleton/mnt/.empty
system/skeleton/opt/.empty renamed from fs/skeleton/opt/.empty +0 -0
similarity index 100%
rename from fs/skeleton/opt/.empty
rename to system/skeleton/opt/.empty
system/skeleton/proc/.empty renamed from fs/skeleton/proc/.empty +0 -0
similarity index 100%
rename from fs/skeleton/proc/.empty
rename to system/skeleton/proc/.empty
system/skeleton/root/.bash_history renamed from fs/skeleton/root/.bash_history +0 -0
similarity index 100%
rename from fs/skeleton/root/.bash_history
rename to system/skeleton/root/.bash_history
system/skeleton/root/.bash_logout renamed from fs/skeleton/root/.bash_logout +0 -0
similarity index 100%
rename from fs/skeleton/root/.bash_logout
rename to system/skeleton/root/.bash_logout
system/skeleton/root/.bash_profile renamed from fs/skeleton/root/.bash_profile +0 -0
similarity index 100%
rename from fs/skeleton/root/.bash_profile
rename to system/skeleton/root/.bash_profile
system/skeleton/root/.empty renamed from fs/skeleton/root/.empty +0 -0
similarity index 100%
rename from fs/skeleton/root/.empty
rename to system/skeleton/root/.empty
system/skeleton/run renamed from fs/skeleton/run +0 -0
similarity index 100%
rename from fs/skeleton/run
rename to system/skeleton/run
system/skeleton/sbin/.empty renamed from fs/skeleton/sbin/.empty +0 -0
similarity index 100%
rename from fs/skeleton/sbin/.empty
rename to system/skeleton/sbin/.empty
system/skeleton/sys/.empty renamed from fs/skeleton/sys/.empty +0 -0
similarity index 100%
rename from fs/skeleton/sys/.empty
rename to system/skeleton/sys/.empty
system/skeleton/tmp/.empty renamed from fs/skeleton/tmp/.empty +0 -0
similarity index 100%
rename from fs/skeleton/tmp/.empty
rename to system/skeleton/tmp/.empty
system/skeleton/usr/bin/.empty renamed from fs/skeleton/usr/bin/.empty +0 -0
similarity index 100%
rename from fs/skeleton/usr/bin/.empty
rename to system/skeleton/usr/bin/.empty
system/skeleton/usr/lib/.empty renamed from fs/skeleton/usr/lib/.empty +0 -0
similarity index 100%
rename from fs/skeleton/usr/lib/.empty
rename to system/skeleton/usr/lib/.empty
system/skeleton/usr/sbin/.empty renamed from fs/skeleton/usr/sbin/.empty +0 -0
similarity index 100%
rename from fs/skeleton/usr/sbin/.empty
rename to system/skeleton/usr/sbin/.empty
system/skeleton/var/cache renamed from fs/skeleton/var/cache +0 -0
similarity index 100%
rename from fs/skeleton/var/cache
rename to system/skeleton/var/cache
system/skeleton/var/lib/misc renamed from fs/skeleton/var/lib/misc +0 -0
similarity index 100%
rename from fs/skeleton/var/lib/misc
rename to system/skeleton/var/lib/misc
system/skeleton/var/lib/pcmcia renamed from fs/skeleton/var/lib/pcmcia +0 -0
similarity index 100%
rename from fs/skeleton/var/lib/pcmcia
rename to system/skeleton/var/lib/pcmcia
system/skeleton/var/lock renamed from fs/skeleton/var/lock +0 -0
similarity index 100%
rename from fs/skeleton/var/lock
rename to system/skeleton/var/lock
system/skeleton/var/log renamed from fs/skeleton/var/log +0 -0
similarity index 100%
rename from fs/skeleton/var/log
rename to system/skeleton/var/log
system/skeleton/var/pcmcia renamed from fs/skeleton/var/pcmcia +0 -0
similarity index 100%
rename from fs/skeleton/var/pcmcia
rename to system/skeleton/var/pcmcia
system/skeleton/var/run renamed from fs/skeleton/var/run +0 -0
similarity index 100%
rename from fs/skeleton/var/run
rename to system/skeleton/var/run
system/skeleton/var/spool renamed from fs/skeleton/var/spool +0 -0
similarity index 100%
rename from fs/skeleton/var/spool
rename to system/skeleton/var/spool
system/skeleton/var/tmp renamed from fs/skeleton/var/tmp +0 -0
similarity index 100%
rename from fs/skeleton/var/tmp
rename to system/skeleton/var/tmp
system/system.mk renamed from target/generic/Makefile.in +0 -0
similarity index 100%
rename from target/generic/Makefile.in
rename to system/system.mk
target/Makefile.in deleted +0 -3
deleted file mode 100644
index 915d625..0000000
@@ -1,3 +0,0 @@
-# make sure to put everything that is board-specific before the tarroot targets
-include target/generic/Makefile.in
-
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/3 New top-level directory: system

Thomas, All,

Quoted 6 lines · On Monday 24 September 2012 08:34:29 Thomas Petazzoni wrote:

This directory groups the following elements:
* the default root filesystem skeleton
* the default device tables
* the Config.in options for system configuration (UART port for getty, system hostname, etc.)
* the make rules to apply the system configuration options

[--SNIP--]

Quoted 13 lines
Makefile +0 -1
index 6536bca..ac4aa39 100644
@@ -309,7 +309,6 @@ endif
 include package/*/*.mk
 
 include boot/common.mk
-include target/Makefile.in
 include linux/linux.mk
 
 TARGETS+=target-finalize

Makefile TARGETS+=target-generatelocales · line 329

Quoted 7 lines
Makefile +1 -0
@@ -324,6 +323,7 @@ TARGETS+=target-generatelocales
 endif
 endif
 
+include system/system.mk
 include fs/common.mk
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))

I don't know why, but now the build is broken:

make defconfig
make
[--SNIP a lot of lines and a long time to build--]
/bin/sed -i -e '$a \127.0.1.1\tbuildroot' \
-e '/^127.0.1.1/d' /home/ymorin/dev/buildroot/O001/target/etc/hosts
/bin/sed: can't read /home/ymorin/dev/buildroot/O001/target/etc/hosts: No such file or directory

Looks like the skeleton is not copied.

I've tried moving back the include to the place its predecessor used to be (ie., moved it back in place of 'include target/Makefile.in'), but no matter what, the build is still broken the same way (although I'll double check again in a moment)...

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/3 New top-level directory: system

Thomas, All,

Quoted 39 lines · On Monday 24 September 2012 22:09:50 Yann E. MORIN wrote:
Quoted 6 lines · On Monday 24 September 2012 08:34:29 Thomas Petazzoni wrote:

This directory groups the following elements:
* the default root filesystem skeleton
* the default device tables
* the Config.in options for system configuration (UART port for getty, system hostname, etc.)
* the make rules to apply the system configuration options

[--SNIP--]

Quoted 13 lines
Makefile +0 -1
index 6536bca..ac4aa39 100644
@@ -309,7 +309,6 @@ endif
 include package/*/*.mk
 
 include boot/common.mk
-include target/Makefile.in
 include linux/linux.mk
 
 TARGETS+=target-finalize

Makefile TARGETS+=target-generatelocales · line 329

Quoted 7 lines
Makefile +1 -0
@@ -324,6 +323,7 @@ TARGETS+=target-generatelocales
 endif
 endif
 
+include system/system.mk
 include fs/common.mk
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))

I don't know why, but now the build is broken:

make defconfig
make
[--SNIP a lot of lines and a long time to build--]
/bin/sed -i -e '$a \127.0.1.1\tbuildroot' \
-e '/^127.0.1.1/d' /home/ymorin/dev/buildroot/O001/target/etc/hosts
/bin/sed: can't read /home/ymorin/dev/buildroot/O001/target/etc/hosts: No such file or directory

Quoted 6 lines

Looks like the skeleton is not copied.

I've tried moving back the include to the place its predecessor used to be (ie., moved it back in place of 'include target/Makefile.in'), but no matter what, the build is still broken the same way (although I'll double check again in a moment)...

Confirmed: moving the 'include system/system.mk' back to where the previous 'include target/Makefile.in' was yields a build with the same error.

I was unable to identify the root cause for this failure... :-(

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 1/3 New top-level directory: system

In reply to Thomas Petazzoni
Quoted 11 lines · Thomas Petazzoni

This directory groups the following elements:
* the default root filesystem skeleton
* the default device tables
* the Config.in options for system configuration (UART port for getty, system hostname, etc.)
* the make rules to apply the system configuration options

Even though the skeleton and device tables could have lived in fs/, it would have been strange to have the UART, system hostname and other related options into fs/. A new system/ directory makes more sense.

Quoted 5 lines

As a consequence, this patch also removes target/Makefile.in, which has become useless in the process.

Signed-off-by Thomas Petazzoni<[email protected]>
Acked-by Yann E. MORIN<[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Since nobody has opposed this, and since the problem Yann saw didn't
really exist (right?), I think this one can be applied right away.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
author
#5 lore raw

PATCH 2/3 Split target/Config.in.arch into multiple Config.in.* in arch/

In reply to Thomas Petazzoni

target/Config.in.arch had become too long, and we want to remove the target/ directory. So let's move it to arch/ and split it this way:

* An initial Config.in that lists the top-level architecture, and sources the arch-specific Config.in.<arch> files, as well as Config.in.common (see below)

* One Config.in.<arch> per architecture, listing the CPU families, ABI choices, etc.

* One Config.in.common that defines the gcc mtune, march, mcpu values and other hidden options.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 Config.in              |    2 +-
 arch/Config.in         |  154 +++++++++
 arch/Config.in.arm     |   62 ++++
 arch/Config.in.bfin    |   10 +
 arch/Config.in.common  |  244 ++++++++++++++
 arch/Config.in.mips    |   54 ++++
 arch/Config.in.powerpc |   83 +++++
 arch/Config.in.sh      |   24 ++
 arch/Config.in.sparc   |   38 +++
 arch/Config.in.x86     |  146 +++++++++
 target/Config.in.arch  |  822 ------------------------------------------------
 11 files changed, 816 insertions(+), 823 deletions(-)
 create mode 100644 arch/Config.in
 create mode 100644 arch/Config.in.arm
 create mode 100644 arch/Config.in.bfin
 create mode 100644 arch/Config.in.common
 create mode 100644 arch/Config.in.mips
 create mode 100644 arch/Config.in.powerpc
 create mode 100644 arch/Config.in.sh
 create mode 100644 arch/Config.in.sparc
 create mode 100644 arch/Config.in.x86
 delete mode 100644 target/Config.in.arch
Config.in +1 -1
index cce4619..68190a5 100644
@@ -14,7 +14,7 @@ config BR2_HOSTARCH
 	string
 	option env="HOSTARCH"
 
-source "target/Config.in.arch"
+source "arch/Config.in"
 
 menu "Build options"
arch/Config.in new file +154 -0

154 lines not on this page · raw message

arch/Config.in.arm new file +62 -0

62 lines not on this page · raw message

arch/Config.in.bfin new file +10 -0
new file mode 100644
index 0000000..1823bde
@@ -0,0 +1,10 @@
+choice
+	prompt "Target ABI"
+	depends on BR2_bfin
+	default BR2_BFIN_FDPIC
+config BR2_BFIN_FDPIC
+	bool "FDPIC"
+config BR2_BFIN_FLAT
+	bool "FLAT"
+	select BR2_PREFER_STATIC_LIB
+endchoice
arch/Config.in.common new file +244 -0

244 lines not on this page · raw message

arch/Config.in.mips new file +54 -0

54 lines not on this page · raw message

arch/Config.in.powerpc new file +83 -0

83 lines not on this page · raw message

arch/Config.in.sh new file +24 -0
new file mode 100644
index 0000000..314c55a
@@ -0,0 +1,24 @@
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_sh
+	default BR2_sh4
+	help
+	  Specific CPU variant to use
+
+config BR2_sh2
+	bool "sh2 (SH2 big endian)"
+config BR2_sh2a
+	bool "sh2a (SH2A big endian)"
+config BR2_sh3
+	bool "sh3 (SH3 little endian)"
+config BR2_sh3eb
+	bool "sh3eb (SH3 big endian)"
+config BR2_sh4
+	bool "sh4 (SH4 little endian)"
+config BR2_sh4eb
+	bool "sh4eb (SH4 big endian)"
+config BR2_sh4a
+	bool "sh4a (SH4A little endian)"
+config BR2_sh4aeb
+	bool "sh4aeb (SH4A big endian)"
+endchoice
arch/Config.in.sparc new file +38 -0
new file mode 100644
index 0000000..85e0833
@@ -0,0 +1,38 @@
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_sparc
+	default BR2_sparc_v7
+	help
+	  Specific CPU variant to use
+
+config BR2_sparc_v7
+	bool "v7"
+config BR2_sparc_cypress
+	bool "cypress"
+config BR2_sparc_v8
+	bool "v8"
+config BR2_sparc_sparchfleon
+	bool "hfleon"
+config BR2_sparc_sparchfleonv8
+	bool "hfleonv8"
+config BR2_sparc_sparcsfleon
+	bool "sfleon"
+config BR2_sparc_sparcsfleonv8
+	bool "sfleonv8"
+config BR2_sparc_supersparc
+	bool "supersparc"
+config BR2_sparc_sparclite
+	bool "sparclite"
+config BR2_sparc_f930
+	bool "f930"
+config BR2_sparc_f934
+	bool "f934"
+config BR2_sparc_hypersparc
+	bool "hypersparc"
+config BR2_sparc_sparclite86x
+	bool "sparclite86x"
+config BR2_sparc_sparclet
+	bool "sparclet"
+config BR2_sparc_tsc701
+	bool "tsc701"
+endchoice
arch/Config.in.x86 new file +146 -0

146 lines not on this page · raw message

target/Config.in.arch deleted +0 -822

822 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 2/3 Split target/Config.in.arch into multiple Config.in.* in arch/

Quoted 7 lines · Thomas Petazzoni

target/Config.in.arch had become too long, and we want to remove the target/ directory. So let's move it to arch/ and split it this way:

* An initial Config.in that lists the top-level architecture, and sources the arch-specific Config.in.<arch> files, as well as Config.in.common (see below)

Quoted 7 lines

* One Config.in.<arch> per architecture, listing the CPU families, ABI choices, etc.

* One Config.in.common that defines the gcc mtune, march, mcpu values and other hidden options.

Signed-off-by Thomas Petazzoni<[email protected]>

Checked by sorting everything and taking the diff with the original, which
brings me to:

[snip]

arch/Config.in line 98

Quoted 5 lines
arch/Config.in new file +5 -0
+config BR2_mips64el
+       bool "MIPS64 (little endian)"
+       select BR2_ARCH_IS_64
+       help
+         MIPS is a RISC microprocessor from MIPS Technologies. Big endian.

Not Big endian... But it was like that already in the original.

Also you're using spaces here I think.

[snip]

arch/Config.in.mips line 21

Quoted 3 lines
arch/Config.in.mips new file +3 -0
+config BR2_mips_3
+	bool "mips III"
+	depends on !BR2_ARCH_IS_64

This 'depends on !BR2_ARCH_IS_64' wasn't present in the original...

Regards,
Arnout

[snip]

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
author
#7 lore raw

PATCH 3/3 arch: improve definition of gcc mtune, mcpu, etc.

In reply to Thomas Petazzoni

As suggested by Yann E. Morin, there is a better way than our current big Config.in.common to define the gcc mtune, mcpu, march, etc. values. We can split the setting of those values in each architecture file, which makes a lot more sense.

Therefore, the Config.in file now creates empty kconfig variables BR2_ARCH, BR2_ENDIAN, BR2_GCC_TARGET_TUNE, BR2_GCC_TARGET_ARCH, BR2_GCC_TARGET_ABI and BR2_GCC_TARGET_CPU. The values of those variables are set by the individual Config.in.<arch> files. This is possible because such files are now only conditionally included depending on the top-level architecture that has been selected.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/Config.in            |   55 +++++++++-
 arch/Config.in.arm        |   52 ++++++++++
 arch/Config.in.avr32      |    5 +
 arch/Config.in.bfin       |    6 ++
 arch/Config.in.common     |  244 ---------------------------------------------
 arch/Config.in.m68k       |   21 ++++
 arch/Config.in.microblaze |   10 ++
 arch/Config.in.mips       |   25 +++++
 arch/Config.in.powerpc    |   45 +++++++++
 arch/Config.in.sh         |   17 ++++
 arch/Config.in.sparc      |   31 ++++++
 arch/Config.in.x86        |   89 +++++++++++++++++
 12 files changed, 352 insertions(+), 248 deletions(-)
 create mode 100644 arch/Config.in.avr32
 create mode 100644 arch/Config.in.m68k
 create mode 100644 arch/Config.in.microblaze
arch/Config.in +51 -4
index 1fcb63c..30b1510 100644
@@ -140,15 +140,62 @@ config BR2_x86_64
 
 endchoice
 
-config BR2_microblaze
-	bool
-	default y if BR2_microblazeel || BR2_microblazebe
+# The following string values are defined by the individual
+# Config.in.$ARCH files
+config BR2_ARCH
+	string
 
+config BR2_ENDIAN
+	string
+
+config BR2_GCC_TARGET_TUNE
+	string
+
+config BR2_GCC_TARGET_ARCH
+	string
+
+config BR2_GCC_TARGET_ABI
+	string
+
+config BR2_GCC_TARGET_CPU
+	string
+
+if BR2_arm || BR2_armeb
 source "arch/Config.in.arm"
+endif
+
+if BR2_avr32
+source "arch/Config.in.avr32"
+endif
+
+if BR2_bfin
 source "arch/Config.in.bfin"
+endif
+
+if BR2_m68k
+source "arch/Config.in.m68k"
+endif
+
+if BR2_microblazeel || BR2_microblazebe
+source "arch/Config.in.microblaze"
+endif
+
+if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el
 source "arch/Config.in.mips"
+endif
+
+if BR2_powerpc
 source "arch/Config.in.powerpc"
+endif
+
+if BR2_sh || BR2_sh64
 source "arch/Config.in.sh"
+endif
+
+if BR2_sparc
 source "arch/Config.in.sparc"
+endif
+
+if BR2_i386 || BR2_x86_64
 source "arch/Config.in.x86"
-source "arch/Config.in.common"
+endif
arch/Config.in.arm +52 -0

55 lines not on this page · raw message

arch/Config.in.avr32 new file +5 -0
new file mode 100644
index 0000000..ebf8454
@@ -0,0 +1,5 @@
+config BR2_ARCH
+       default "avr32"
+
+config BR2_ENDIAN
+       default "BIG"
arch/Config.in.bfin +6 -0
index 1823bde..0b137ae 100644
@@ -8,3 +8,9 @@ config BR2_BFIN_FLAT
 	bool "FLAT"
 	select BR2_PREFER_STATIC_LIB
 endchoice
+
+config BR2_ARCH
+	default "bfin"
+
+config BR2_ENDIAN
+        default "LITTLE"
arch/Config.in.common +0 -244

244 lines not on this page · raw message

arch/Config.in.m68k new file +21 -0
new file mode 100644
index 0000000..b3d95b7
@@ -0,0 +1,21 @@
+config BR2_ARCH
+	default "m68k"		if BR2_m68k
+
+config BR2_ENDIAN
+	default "BIG"
+
+config BR2_GCC_TARGET_TUNE
+	default 68000		if BR2_m68k_68000
+	default 68010		if BR2_m68k_68010
+	default 68020		if BR2_m68k_68020
+	default 68030		if BR2_m68k_68030
+	default 68040		if BR2_m68k_68040
+	default 68060		if BR2_m68k_68060
+
+config BR2_GCC_TARGET_ARCH
+	default 68000		if BR2_m68k_68000
+	default 68010		if BR2_m68k_68010
+	default 68020		if BR2_m68k_68020
+	default 68030		if BR2_m68k_68030
+	default 68040		if BR2_m68k_68040
+	default 68060		if BR2_m68k_68060
arch/Config.in.microblaze new file +10 -0
new file mode 100644
index 0000000..dbdd99a
@@ -0,0 +1,10 @@
+config BR2_ARCH
+	default "microblaze"
+
+config BR2_ENDIAN
+	default "LITTLE" if BR2_microblazeel
+	default "BIG"	 if BR2_microblazebe
+
+config BR2_microblaze
+	bool
+	default y if BR2_microblazeel || BR2_microblazebe
arch/Config.in.mips +25 -0
index dfcb1c3..f5162ca 100644
@@ -52,3 +52,28 @@ config BR2_MIPS_NABI64
 	bool "n64"
 	depends on BR2_ARCH_IS_64
 endchoice
+
+config BR2_ARCH
+	default "mips"		if BR2_mips
+	default "mipsel"	if BR2_mipsel
+	default "mips64"	if BR2_mips64
+	default "mips64el"	if BR2_mips64el
+
+config BR2_ENDIAN
+	default "LITTLE"	if BR2_mipsel || BR2_mips64el
+	default "BIG" 	    	if BR2_mips || BR2_mips64
+
+config BR2_GCC_TARGET_TUNE
+	default mips1		if BR2_mips_1
+	default mips2		if BR2_mips_2
+	default mips3		if BR2_mips_3
+	default mips4		if BR2_mips_4
+	default mips32		if BR2_mips_32
+	default mips32r2	if BR2_mips_32r2
+	default mips64		if BR2_mips_64
+	default mips64r2	if BR2_mips_64r2
+
+config BR2_GCC_TARGET_ABI
+	default 32		if BR2_MIPS_OABI32
+	default n32		if BR2_MIPS_NABI32
+	default 64		if BR2_MIPS_NABI64
arch/Config.in.powerpc +45 -0

48 lines not on this page · raw message

arch/Config.in.sh +17 -0
index 314c55a..cf70fd5 100644
@@ -22,3 +22,20 @@ config BR2_sh4a
 config BR2_sh4aeb
 	bool "sh4aeb (SH4A big endian)"
 endchoice
+
+config BR2_ARCH
+	default "sh2"		if BR2_sh2
+	default "sh2a"		if BR2_sh2a
+	default "sh3"		if BR2_sh3
+	default "sh3eb"		if BR2_sh3eb
+	default "sh4"		if BR2_sh4
+	default "sh4eb"		if BR2_sh4eb
+	default "sh4a"		if BR2_sh4a
+	default "sh4aeb"	if BR2_sh4aeb
+	default "sh64"		if BR2_sh64
+
+config BR2_ENDIAN
+	default "LITTLE"	if BR2_sh3 || BR2_sh4 || BR2_sh4a || \
+				   BR2_x86_64 || BR2_sh64
+	default "BIG"		if BR2_sh2 || BR2_sh2a || BR2_sh3eb || \
+				   BR2_sh4eb || BR2_sh4aeb
arch/Config.in.sparc +31 -0
index 85e0833..d810b75 100644
@@ -36,3 +36,34 @@ config BR2_sparc_sparclet
 config BR2_sparc_tsc701
 	bool "tsc701"
 endchoice
+
+config BR2_ARCH
+	default "sparc"	if BR2_sparc
+
+config BR2_ENDIAN
+	default "BIG"
+
+config BR2_GCC_TARGET_TUNE
+	default v7		if BR2_sparc_v7
+	default cypress		if BR2_sparc_cypress
+	default v8		if BR2_sparc_v8
+	default supersparc	if BR2_sparc_supersparc
+	default hypersparc	if BR2_sparc_hypersparc
+	default sparclite	if BR2_sparc_sparclite
+	default f930		if BR2_sparc_f930
+	default f934		if BR2_sparc_f934
+	default sparclite86x	if BR2_sparc_sparclite86x
+	default sparclet	if BR2_sparc_sparclet
+	default tsc701		if BR2_sparc_tsc701
+	default v9		if BR2_sparc_v9
+	default v9		if BR2_sparc_v9a
+	default v9		if BR2_sparc_v9b
+	default ultrasparc	if BR2_sparc_ultrasparc
+	default ultrasparc3	if BR2_sparc_ultrasparc3
+	default niagara		if BR2_sparc_niagara
+
+config BR2_GCC_TARGET_CPU
+	default sparchfleon	if BR2_sparc_sparchfleon
+	default sparchfleonv8	if BR2_sparc_sparchfleonv8
+	default sparcsfleon	if BR2_sparc_sparcsfleon
+	default sparcsfleonv8	if BR2_sparc_sparcsfleonv8
arch/Config.in.x86 +89 -0

92 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#8 lore raw

PATCH 3/3 arch: improve definition of gcc mtune, mcpu, etc.

Thomas, All,

Quoted 11 lines · On Monday 24 September 2012 08:34:31 Thomas Petazzoni wrote:

As suggested by Yann E. Morin, there is a better way than our current big Config.in.common to define the gcc mtune, mcpu, march, etc. values. We can split the setting of those values in each architecture file, which makes a lot more sense.

Therefore, the Config.in file now creates empty kconfig variables BR2_ARCH, BR2_ENDIAN, BR2_GCC_TARGET_TUNE, BR2_GCC_TARGET_ARCH, BR2_GCC_TARGET_ABI and BR2_GCC_TARGET_CPU. The values of those variables are set by the individual Config.in.<arch> files. This is possible because such files are now only conditionally included depending on the top-level architecture that has been selected.

[--SNIP--]

Quoted 8 lines
arch/Config.in.arm +0 -0
index 8d9db3c..2acedc4 100644
@@ -60,3 +60,55 @@ config BR2_ARM_OABI
 	depends on !BR2_GCC_VERSION_4_7_X
 endchoice

arch/Config.in.arm config BR2_ARM_OABI · line 72

Quoted 10 lines
arch/Config.in.arm +10 -0
+config BR2_ARCH
+	default "arm"	if BR2_arm
+	default "armeb"	if BR2_armeb
+
+config BR2_ENDIAN
+	default "LITTLE" if BR2_arm
+	default "BIG"	 if BR2_armeb
+
+config BR2_GCC_TARGET_TUNE
+	default arm600		if BR2_arm600

This is a 'string' option, so defaults should be enclosed between double-quotes:

	default "arm600"	if BR2_ARM600

Ditto for all archs.

Yep, that's how the code was prior to your changes, but why not clean it up in the process (either in this patch, or in a following patch)?

If you fix that in this patch, or in a following patch:

    Acked-by: "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'