28 Mar, 2015
2 commits
-
We have switched to the single .config configuration system,
the same one as used in Linux Kernel.The necessary glue code is small enough now, so move it to the
top-level Makefile and scripts/kconfig/Makefile, and then delete
scripts/multiconfig.sh.Signed-off-by: Masahiro Yamada
Reviewed-by: Simon Glass -
This target was added by commit cbdd9a9737cc (sunxi: kconfig: Add
%_felconfig rule to enable FEL build of sunxi platforms.).At that time, U-Boot used separate .config files for U-Boot proper
and SPL. I understood the pain to modify both .config and
spl/.config.Now, we have switched to single .config configuration.
It seems acceptable to run "make menuconfig" or friends to enable
CONFIG_SPL_FEL, as we do for other CONFIGs.Signed-off-by: Masahiro Yamada
Cc: Ian Campbell
Cc: Hans de Goede
Reviewed-by: Simon Glass
06 Mar, 2015
2 commits
-
Since commit e02ee2548afe (kconfig: switch to single .config
configuration), the ".*.cmd" files are not correctly created
for SPL/TPL. The U-Boot extension code in fixdep, which was
introduced to support the multiple .config, must be removed.Signed-off-by: Masahiro Yamada
Reviewed-by: Simon Glass -
Bring checkstack.pl up to date from its upstream Linux development.
Effectively, the following linux commits:208ad00 checkstack.pl: port to AArch64
fda9f99 scripts/checkstack.pl: automatically handle 32-bit and 64-bit mode for ARCH=x86
7eb6e34 kbuild: trivial - remove trailing empty lines
690998b scripts/checkstack.pl: Add metag supportReported-by: York Sun
Cc: Masahiro Yamada
Signed-off-by: Kim Phillips
02 Mar, 2015
1 commit
-
This code was introduced to support the multiple .config
configuration in U-Boot. We do not need it any more.Signed-off-by: Masahiro Yamada
25 Feb, 2015
2 commits
-
Now CONFIG_SPL_BUILD is not defined in Kconfig, so
"!depends on SPL_BUILD" and "if !SPL_BUILD" are redundant.Signed-off-by: Masahiro Yamada
-
When Kconfig for U-boot was examined, one of the biggest issues was
how to support multiple images (Normal, SPL, TPL). There were
actually two options, "single .config" and "multiple .config".
After some discussions and thought experiments, I chose the latter,
i.e. to create ".config", "spl/.config", "tpl/.config" for Normal,
SPL, TPL, respectively.It is true that the "multiple .config" strategy provided us the
maximum flexibility and helped to avoid duplicating CONFIGs among
Normal, SPL, TPL, but I have noticed some fatal problems:[1] It is impossible to share CONFIG options across the images.
If you change the configuration of Main image, you often have to
adjust some SPL configurations correspondingly. Currently, we
cannot handle the dependencies between them. It means one of the
biggest advantages of Kconfig is lost.[2] It is too painful to change both ".config" and "spl/.config".
Sunxi guys started to work around this problem by creating a new
configuration target. Commit cbdd9a9737cc (sunxi: kconfig: Add
%_felconfig rule to enable FEL build of sunxi platforms.) added
"make *_felconfig" to enable CONFIG_SPL_FEL on both images.
Changing the configuration of multiple images in one command is a
generic demand. The current implementation cannot propose any
good solution about this.[3] Kconfig files are getting ugly and difficult to understand.
Commit b724bd7d6349 (dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to
Kconfig) has sprinkled "if !SPL_BUILD" over the Kconfig files.[4] The build system got more complicated than it should be.
To adjust Linux-originated Kconfig to U-Boot, the helper script
"scripts/multiconfig.sh" was introduced. Writing a complicated
text processor is a shell script sometimes caused problems.Now I believe the "single .config" will serve us better. With it,
all the problems above would go away. Instead, we will have to add
some CONFIG_SPL_* (and CONFIG_TPL_*) options such as CONFIG_SPL_DM,
but we will not have much. Anyway, this is what we do now in
scripts/Makefile.spl.I admit my mistake with my apology and this commit switches to the
single .config configuration.It is not so difficult to do that:
- Remove unnecessary processings from scripts/multiconfig.sh
This file will remain for a while to support the current defconfig
format. It will be removed after more cleanups are done.- Adjust some makefiles and Kconfigs
- Add some entries to include/config_uncmd_spl.h and the new file
scripts/Makefile.uncmd_spl. Some CONFIG options that are not
supported on SPL must be disabled because one .config is shared
between SPL and U-Boot proper going forward. I know this is not
a beautiful solution and I think we can do better, but let's see
how much we will have to describe them.- update doc/README.kconfig
More cleaning up patches will follow this.
Signed-off-by: Masahiro Yamada
Reviewed-by: Simon Glass
21 Feb, 2015
1 commit
-
In U-Boot, SoC-specific headers are placed in
arch/$(ARCH)/include/asm/arch-$(SOC) and a symbolic link to that
directory is created at the early stage of the build process.Creating and removing a symbolic link during the build is not
preferred. In fact, Linux Kernel did away with include/asm-$(ARCH)
directories a long time time ago.As for ARM, now it is possible to collect SoC sources into
arch/arm/mach-$(SOC). It is also reasonable to move SoC headers
into arch/arm/mach-$(SOC)/include/mach.This commit prepares for that.
If the directory arch/$(ARCH)/mach-$(SOC)/include/mach exists,
a symbolic to that directory is created. Otherwise, a symbolic link
to arch/$(ARCH)/include/asm/arch-$(SOC) or arch-$(CPU) is created.Signed-off-by: Masahiro Yamada
17 Feb, 2015
1 commit
-
Make sunxi's FEL code fit with the normal U-Boot boot sequence instead of
creating its own. There are some #ifdefs required in start.S. Future work
will hopefully remove these.This series is available at u-boot-dm, branch sunxi-working.
Signed-off-by: Simon Glass
Acked-by: Hans de Goede
Signed-off-by: Hans de Goede
07 Feb, 2015
1 commit
-
Signed-off-by: Stefan Roese
Reviewed-by: Luka Perkov
14 Jan, 2015
2 commits
-
We are removing bunch of non-generic boards these days.
Updating doc/README.scrapyard is a really tedious task, but it can
be automated. I hope this tool will make our life easier.Signed-off-by: Masahiro Yamada
Reviewed-by: Simon Glass -
The CONFIG_UART0_PORT_F option has been supported since
http://git.denx.de/?p=u-boot.git;a=commit;h=ff2b47f6a9cc1025This option is primarily useful only for low level u-boot debugging
on tablets, where normal UART0 is difficult to access and requires
device disassembly and/or soldering.This patch now allows it to be selected from menuconfig. A dependency on
SPL_FEL is added because u-boot does not support booting from NAND yet
and also booting from SD card is impossible when a MicroSD breakout board
is plugged into the SD slot.Additionally a compilation problem is fixed:
common/spl/built-in.o: In function `spl_mmc_load_image':
/tmp/u-boot-sunxi/common/spl/spl_mmc.c:94: undefined reference to `mmc_initialize'
/tmp/u-boot-sunxi/common/spl/spl_mmc.c:96: undefined reference to `find_mmc_device'
/tmp/u-boot-sunxi/common/spl/spl_mmc.c:104: undefined reference to `mmc_init'
scripts/Makefile.spl:206: recipe for target 'spl/u-boot-spl' failedSigned-off-by: Siarhei Siamashka
Acked-by: Hans de Goede
Signed-off-by: Hans de Goede
09 Jan, 2015
1 commit
-
Commit 73c25753 fixed the common issue that binutil packages (tool/organization
that packaged or built the bin-utils) are included in brackets and this may
falsely be recognized as a version. However, some tools do not provide a
'package' and previously we add the 'Gnu assembler..' to the version.Strip out the '(package version text)' and then look for a ##.## string.
Signed-off-by: Bill Pringlemeir
Tested-by: Masahiro Yamada
Tested-by: Hans de Goede
30 Dec, 2014
1 commit
-
The current binutils-version.sh expects the version string at the end
of the first line. It turned out to not work with Linaro toolchain:
It has "Linaro 2014.09" at the back.To fix this issue, let's parse the word right after the close
parenthesis.Signed-off-by: Masahiro Yamada
Reported-by: York Sun
Acked-by: Dirk Behme
08 Dec, 2014
3 commits
-
Warning:
In file included from scripts/kconfig/zconf.tab.c:2537:0:
scripts/kconfig/menu.c: In function ‘get_symbol_str’:
scripts/kconfig/menu.c:590:18: warning: ‘jump’ may be used uninitialized in this function [-Wmaybe-uninitialized]
jump->offset = strlen(r->s);Simplifies the test logic because (head && local) means (jump != 0)
and makes GCC happy when checking if the jump pointer was initialized.Signed-off-by: Peter Kümmel
Signed-off-by: Michal Marek
[ imported from Linux Kernel, commit 2d5603060967 ]
Signed-off-by: Masahiro Yamada -
Introduce a Makefile under arch/$ARCH/ and include it in the
top Makefile (similar to Linux kernel). This allows further
refactoringi like moving architecture-specific code out of global
makefiles, deprecating config variables (CPU, CPUDIR, SOC) or
deprecating arch/$ARCH/config.mk.In contrary to Linux kernel, U-Boot defines the ARCH variable by
Kconfig, thus the arch Makefile can only included conditionally
after the top config.mk.Signed-off-by: Daniel Schwierzeck
Acked-by: Masahiro Yamada -
get_maintainer.pl always fails with following message:
./scripts/get_maintainer.pl: The current directory does not appear to be a linux kernel source tree.This was caused by commit:
commit 548b310c68ac99a0330d8b56c797c09ff0742d1e
Author: Masahiro Yamada
Date: Thu Oct 30 15:50:15 2014 +0900Remove the CREDITS file
This file is not maintained these days.
We use MAINTAINERS for the maintainership of the supported boards.
For dead boards, we have some clues in doc/README.scrapyard and
also imperishable history in git-log.Remove CREDITS from source tree detection to fix this.
Signed-off-by: Daniel Schwierzeck
Acked-by: Simon Glass
25 Nov, 2014
2 commits
-
Device trees must be aligned to a 4-byte boundary. This was dropped in the
Kbuild conversion. Bring it back, and use 16-byte alignment for good
measure.Signed-off-by: Simon Glass
-
Conflicts:
drivers/serial/serial-uclass.cSigned-off-by: Tom Rini
23 Nov, 2014
2 commits
-
SPL should not reference CONFIG_CMD_NAND to decide whether or not
it should build drivers/mtd/nand. CONFIG_CMD_NAND should be only
used to select the NAND utility command on the command parser.Signed-off-by: Masahiro Yamada
-
Some CPUs of some architectures have SOC directories.
At present, the build system directly descends into SOC directories
from the top Makefile, but it should generally descend into each
directory from its parent directory.Signed-off-by: Masahiro Yamada
21 Nov, 2014
1 commit
-
When enabled, set up driver model for SPL. This allows SPL to use the same
drivers as the main U-Boot.Signed-off-by: Simon Glass
Acked-by: Tom Rini
17 Nov, 2014
1 commit
-
generate the boot.bin file for all atmel SoC (arm920, arm926, armv7)
Signed-off-by: Heiko Schocher
Reviewed-by: Andreas Bießmann
Reviewed-by: Masahiro Yamada
[fix subject]
Signed-off-by: Andreas Bießmann
13 Nov, 2014
1 commit
-
The Makefiles call the respective interpreter explicitly, but this makes
it easier to use the scripts manually.(This commit follows commit 06ed5c2bfaca of Linux Kernel)
Signed-off-by: Michal Marek
Signed-off-by: Masahiro Yamada
08 Nov, 2014
5 commits
-
This commit imports some updates in misc scripts from Linux 3.18-rc1.
[1] commit cbb4d3e6510b99522719c5ef0 by Horia Geanta
scripts/kernel-doc: handle object-like macros[2] commit 164f0d2efaaef83 by Michal Marek
kbuild: Fix handling of backslashes in *.cmd files[3] commit 270a00963cd367214e by Randy Dunlap
scripts/kernel-doc: recognize __meminit[4] commit a4954fd7724c0f55361eb5 by Masahiro Yamada
kbuild: remove obj-n and lib-n handling[5] commit 5b2389b45d1a9c12b9f by Masahiro Yamada
kbuild: simplify build, clean, modbuiltin shorthandsSigned-off-by: Horia Geanta
Signed-off-by: Michal Marek
Signed-off-by: Randy Dunlap
Signed-off-by: Masahiro Yamada -
This commit imports Kconfig updates from Linux 3.18-rc1.
'kvmconfig' and 'tinyconfig' help message have been commented out
since they are unavailable at least now; in the future perhaps
we can implement 'tinyconfig' to disable most of CONFIG_CMD_* to
create a very small U-Boot image.[1] commit 3aaefce10351 by Josh Triplett
x86, platform, kconfig: move kvmconfig functionality to a helper[2] commit 0da1d4a0b951 by Josh Triplett
x86: Add "make tinyconfig" to configure the tiniest possible kernel[3] commit c40724d3f381 by Brian Norris
kconfig: lxdialog: fix spelling[4] commit 7285996aa000 by Brian Norris
kconfig: nconfig: fix multi-byte UTF handlingSigned-off-by: Josh Triplett
Signed-off-by: Brian Norris
Signed-off-by: Masahiro Yamada -
Since Linux 3.15, relative path feature and related fixes,
cleanups have been merged to the top Makefile.The relative path feature looks stable enough, so let's import it
to U-Boot along with various cleanups.Commits imported from Linux (some need adjustment) are:
[1] commit 7e1c04779efd by Michal Marek
kbuild: Use relative path for $(objtree)[2] commit 890676c65d69 by Michal Marek
kbuild: Use relative path when building in the source tree[3] commit 9da0763bdd82 by Michal Marek
kbuild: Use relative path when building in a subdir of the source tree[4] commit c2e28dc975ea by Michal Marek
kbuild: Print the name of the build directory[5] commit 066b7ed95580 by Michal Marek
kbuild: Do not print the build directory with make -s[6] commit 3f1d9a6cec01 by Michal Marek
kbuild: make -s should be used with kernelrelease/kernelversion/image_name[7] commit 7ff525712acf by Masahiro Yamada
kbuild: fake the "Entering directory ..." message more simply[8] commit 745a254322c8 by Masahiro Yamada
kbuild: use $(Q) for sub-make target[9] commit aa55c8e2f7a3 by Masahiro Yamada
kbuild: handle C=... and M=... after entering into build directory[10] commit ab7474ea5361 by Borislav Petkov
Kbuild: Ignore GREP_OPTIONS env variableTo use relative path feature, tools/Makefile and scripts/Makefile.autoconf
must be tweaked.Signed-off-by: Michal Marek
Signed-off-by: Borislav Petkov
Signed-off-by: Masahiro Yamada -
Since Linux 3.18-rc1, Kbuild is able to handle multi-objs
dependency correctly, which also allows us futher cleanups
of some makefiles.This commit imports those commits:
[1] commit c8589d1e9e01 by Masahiro Yamada
kbuild: handle multi-objs dependency appropriately[2] commit 97e3226e6e98 by Masahiro Yamada
kbuild: handle the dependency of multi-objs hostprogs appropriately[3] commit 022af62d0190 by Masahiro Yamada
kbuild: refactor script/kconfig/Makefile[4] commit 221ecca6cafe by Masahiro Yamada
kbuild: remove redundant clean-files from scripts/kconfig/MakefileSigned-off-by: Masahiro Yamada
-
This commit imports updates of scripts/Makefile.host
from Linux 3.18-rc1.Imported commits are:
[1] commit d8d9efe22709 by Masahiro Yamada
kbuild: fix a typo in scripts/Makefile.host[2] commit edb950c17de0 by Masahiro Yamada
kbuild: fix a bug of C++ host program handling[3] commit 62e2210798ed by Masahiro Yamada
kbuild: drop shared library support from Makefile.host[4] commit 663935593915 by Masahiro Yamada
kbuild: clean up scripts/Makefile.host[5] commit 1791ff7179f6 by Masahiro Yamada
kbuild: clean-up and bug fix of scripts/Makefile.hostSigned-off-by: Masahiro Yamada
05 Nov, 2014
2 commits
-
$ make BOARD_felconfig
is more convenient than
$ make BOARD_defconfig
$ echo CONFIG_SPL_FEL=y >> .config
$ echo CONFIG_SPL_FEL=y >> spl/.configSigned-off-by: Ian Campbell
Reviewed-by: Hans de Goede
Signed-off-by: Hans de Goede -
These lines originate in Linux; it looks like Linux folks chose to
hide bunch of warnings reported by clang rather than fixing C code.In U-boot, warnings are being fixed thanks to Jeroen's great efforts.
Let's stop suppressing clang warnings.Signed-off-by: Masahiro Yamada
Cc: Jeroen Hofstee
28 Oct, 2014
1 commit
-
Signed-off-by: Robert P. J. Day
24 Oct, 2014
2 commits
-
When spl/.config is updated by "make spl/menuconfig" or friends,
spl/include/config/auto.conf, spl/include/generated/autoconf.h
and some other files must be updated by "make silentoldconfig".There is no hook for SPL in the top Makefile, so this commit
touches .config when spl/.config is updated to invoke silentoldconfig.
Likewise for TPL.Signed-off-by: Masahiro Yamada
-
cmd_u-boot-spl includes $(PLATFORM_LIBS) which changes
when CONFIG_USE_PRIVATE_GCC is updated. The u-boot-spl image
should be re-linked if any prerequisite is newer than it
or the command line has changed.
$(call, if_changed,...) should be used instead of $(call cmd,...).Signed-off-by: Masahiro Yamada
10 Oct, 2014
3 commits
-
Fix the spelling of "configs".
Signed-off-by: York Sun
CC: Masahiro Yamada
Acked-by: Masahiro Yamada -
A SPL/TPL enabled target would was not recognized as
such by BSD sed, since it relies on a GNU extension.
Instead of or-ing just spell out both matches.Cc: Masahiro Yamada
Signed-off-by: Jeroen Hofstee
Acked-by: Masahiro Yamada -
In some cases, the last lines of SPL or TPL are not output to a file.
The entries remaining in the "unmatched" variable must be flushed.Signed-off-by: Masahiro Yamada
Acked-by: Simon Glass
25 Sep, 2014
2 commits
-
Pick the following commit from Linux kernel:
commit 66cb4ee0e52ca721f609fd5eec16187189ae5fda
Author: Joe Perches
Date: Wed Sep 10 09:40:47 2014 +1000checkpatch: remove unnecessary + after {8,8}
There's a useless "+" use that needs to be removed as perl 5.20 emits a
"Useless use of greediness modifier '+'" message each time it's hit.Signed-off-by: Marek Vasut
Cc: Tom Rini -
Now config_cmd_defaults.h is empty so it can be deleted safely.
Signed-off-by: Masahiro Yamada
Acked-by: Simon Glass
17 Sep, 2014
1 commit
-
For the SPL configuration, "make /" is used.
Here,
is either "spl" or "tpl"
is one of "config", "menuconfig", "xconfig", etc.This commit adds two checks:
[1] If is given an unsupported subimage, the configuration
should error out like this:$ make qpl/menuconfig
***
*** "make qpl/menuconfig" is not supported.
***[2] Make sure that "CONFIG_SPL" is enabled in the ".config" before
running "make spl/menuconfig. Otherwise, the SPL image
is not built at all. Having "spl/.config" makes no sense.
In such a case, the configuration should exit with a message:$ make spl/menuconfig
***
*** Create ".config" with "CONFIG_SPL" enabled
*** before "make spl/menuconfig".
***Signed-off-by: Masahiro Yamada
Suggested-by: Simon Glass