Pull request for branch remove-target-dir

GIT PULL New Thomas Petazzoni 4 participants 8 messages Nov 3, 2012 – Nov 4, 2012 Kbuild

lore

Share & tools

lore

Thomas Petazzoni

author

2012-11-03 18:27 UTC #0 lore raw

Changes since last posting:

* Rebase on current master (mostly take into account the arrival of aarch64)

* Add Arnout's Acked-by on the first patch

Thomas

The following changes since commit 51f3425e3d6c69758c071b9327eecaa14b5e053a:

use avr32linux.org mirror (2012-11-03 18:11:49 +0100)

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 9b972f2db74b874534b3548249241f5bccc1d7cf:

arch: improve definition of gcc mtune, mcpu, etc. (2012-11-03 19:27:02 +0100)

----------------------------------------------------------------
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                                     |  212 +++++
 arch/Config.in.aarch64                             |    5 +
 arch/Config.in.arm                                 |  114 +++
 arch/Config.in.avr32                               |    5 +
 arch/Config.in.bfin                                |   16 +
 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
 {fs => system}/skeleton/bin/.empty                 |    0
 {fs => system}/skeleton/dev/log                    |    0
 {fs => system}/skeleton/dev/pts/.empty             |    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/Config.in.arch                              |  830 --------------------
 target/Makefile.in                                 |    3 -
 75 files changed, 939 insertions(+), 837 deletions(-)
 create mode 100644 arch/Config.in
 create mode 100644 arch/Config.in.aarch64
 create mode 100644 arch/Config.in.arm
 create mode 100644 arch/Config.in.avr32
 create mode 100644 arch/Config.in.bfin
 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 => 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/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/Config.in.arch
 delete mode 100644 target/Makefile.in

Thanks,

Signature · 1 line

Thomas Petazzoni

Thomas Petazzoni

author

2012-11-03 18:27 UTC #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]>

Acked-by Arnout Vandecappelle (Essensium/Mind) <[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/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 ---
 62 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/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 dff6aeb..9e24013 100644
@@ -310,7 +310,6 @@ endif
 include package/*/*.mk
 
 include boot/common.mk
-include target/Makefile.in
 include linux/linux.mk
 
 TARGETS+=target-finalize

@@ -325,6 +324,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/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

Peter Korsgaard

2012-11-04 11:30 UTC #2 lore raw

PATCH 1/3 New top-level directory: system

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> This directory groups the following elements:

 Thomas>  * the default root filesystem skeleton
 Thomas>  * the default device tables
 Thomas>  * the Config.in options for system configuration (UART port for

Thomas> getty, system hostname, etc.)
Thomas> * the make rules to apply the system configuration options

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

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Peter Korsgaard

2012-11-04 11:53 UTC #3 lore raw

PATCH 1/3 New top-level directory: system

Quoted 3 lines

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
"Peter" == Peter Korsgaard <[email protected]> writes:
"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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

Peter> Committed, thanks.

I take that back. You forgot to change TARGET_SKELETON and the documentation to point to the new location, so I fixed that up.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2012-11-03 18:27 UTC #4 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         |  161 ++++++++++
 arch/Config.in.arm     |   62 ++++
 arch/Config.in.bfin    |   10 +
 arch/Config.in.common  |  245 ++++++++++++++
 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  |  830 ------------------------------------------------
 11 files changed, 824 insertions(+), 831 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 +161 -0

161 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 +245 -0

245 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 ~~-830~~

830 lines not on this page · raw message

Signature · 1 line

1.7.9.5

Peter Korsgaard

2012-11-04 11:52 UTC #5 lore raw

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

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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

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

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

Committed with the issues noted by Arnout fixed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2012-11-03 18:28 UTC #6 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            |   59 ++++++++++-
 arch/Config.in.aarch64    |    5 +
 arch/Config.in.arm        |   52 ++++++++++
 arch/Config.in.avr32      |    5 +
 arch/Config.in.bfin       |    6 ++
 arch/Config.in.common     |  245 ---------------------------------------------
 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 ++++++++++++++++
 13 files changed, 361 insertions(+), 249 deletions(-)
 create mode 100644 arch/Config.in.aarch64
 create mode 100644 arch/Config.in.avr32
 delete mode 100644 arch/Config.in.common
 create mode 100644 arch/Config.in.m68k
 create mode 100644 arch/Config.in.microblaze

arch/Config.in +55 -4

index 98830f8..b493401 100644
@@ -147,15 +147,66 @@ 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_aarch64
+source "arch/Config.in.aarch64"
+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.aarch64 new file +5 -0

new file mode 100644
index 0000000..4c68a37
@@ -0,0 +1,5 @@
+config BR2_ARCH
+	default "aarch64"	if BR2_aarch64
+
+config BR2_ENDIAN
+	default "LITTLE"

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 deleted +0 ~~-245~~

245 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

Arnout Vandecappelle

2012-11-04 03:08 UTC #7 lore raw

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

Quoted 5 lines · 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.

Quoted 8 lines

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]>

Barring a few details:

Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

(untested)

Checked by sorting everything and taking the diff with the original. Also checked completeness of BR2_ENDIAN (which is now much easier).

[snip]

arch/Config.in.aarch64 line 2

Quoted 8 lines

arch/Config.in.aarch64 new file +2 -0

new file mode 100644
index 0000000..4c68a37
@@ -0,0 +1,5 @@
+config BR2_ARCH
+	default "aarch64"	if BR2_aarch64

Isn't this condition redundant?

Quoted 11 lines

arch/Config.in.aarch64 new file +3 -0

+
+config BR2_ENDIAN
+	default "LITTLE"

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

Yann suggested to add quotes here.

[snip]

arch/Config.in.avr32 line 5

Quoted 11 lines

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"

spaces -> tab

Quoted 5 lines

arch/Config.in.bfin +0 -0
index 1823bde..0b137ae 100644

arch/Config.in.bfin config BR2_BFIN_FLAT · line 16

Quoted 9 lines

arch/Config.in.bfin +6 -0

@@ -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"

spaces -> tab

[snip]

Quoted 6 lines

arch/Config.in.microblaze new file +0 -0
new file mode 100644
index 0000000..dbdd99a

arch/Config.in.microblaze line 10

Quoted 10 lines

arch/Config.in.microblaze new file +10 -0

@@ -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

Isn't this condition redundant now? I.e., use def_bool.

[snip]

arch/Config.in.powerpc config BR2_powerpc_SPE · line 86

Quoted 11 lines

arch/Config.in.powerpc +3 -0

index 20b0b06..55c1651 100644
@@ -81,3 +81,48 @@ config BR2_powerpc_SPE
  	bool "SPE"
  	depends on BR2_powerpc_8540 || BR2_powerpc_8548
  endchoice
+
+config BR2_ARCH
+	default "powerpc"	if BR2_powerpc

Isn't this condition redundant now?

[snip]

Quoted 13 lines

arch/Config.in.sh +5 -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

arch/Config.in.sh config BR2_sh4a · line 39

Quoted 10 lines

arch/Config.in.sh +10 -0

+	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

That x86_64 must be a mistake...

arch/Config.in.sh config BR2_sh4a · line 41

Quoted 2 lines

arch/Config.in.sh +2 -0

+	default "BIG"		if BR2_sh2 || BR2_sh2a || BR2_sh3eb || \
+				   BR2_sh4eb || BR2_sh4aeb

[snip]

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