08 Aug, 2015
2 commits
-
Add build target for generating boot partition images recognised by
the SoCFPGA BootROM. The SoCFPGA BootROM expects four copies of the
u-boot-spl-dtb.sfp at the beginning of boot partition. Those are
u-boot-spl-dtb.bin augmented by a header with which the BootROM can
work. The u-boot-dtb.img uImage is appended to this to produce a
full boot partition image, the u-boot-with-spl-dtb.sfp . This is
the name of the final target.Signed-off-by: Marek Vasut
-
This patch enables the SDRAM controller that is used on Altera's SoCFPGA
family. This patch configures the SDRAM controller based on a configuration
file that is generated from the Quartus tool, sdram_config.h.Signed-off-by: Dinh Nguyen
05 Aug, 2015
1 commit
-
The CFLAGS_REMOVE_ feature allows default C compiler flags to be
removed for particular files. Add the same feature for assembler, using
AFLAGS_REMOVE_.Signed-off-by: Simon Glass
Reviewed-by: Bin Meng
Reviewed-by: Tom Rini
28 Jul, 2015
3 commits
-
The symbolic link to SoC/CPU specific header directory is created
during the build, while it is only necessary for ARM, AVR32, SPARC,
x86, and some CPUs of PowerPC. For the other architectures, it just
results in a broken symbolic link.Introduce CONFIG_CREATE_ARCH_SYMLINK to not create unneeded symbolic
links.Signed-off-by: Masahiro Yamada
Reviewed-by: Simon Glass -
Update some build scripts to match Linux 4.1. Commit-based syncing
was done so as not to break U-Boot specific changes.
The previous big sync was from Linux 3.18-rc1 by commit 176d09827725
(kbuild: sync misc scripts with Linux 3.18-rc1).The commits imported from Linux (some with adjustments) are:
[1] commit 9fb5e5372208973984a23ee6f5f025c05d364633
Author: Robert Richter
dts, kbuild: Factor out dtbs install rules to Makefile.dtbinst[2] commit 371fdc77af44f4cb32475fd499e1d912ccc30890
Author: Masahiro Yamada
kbuild: collect shorthands into scripts/Kbuild.include[3] commit a29b82326ed4eb5567b03c85b52c6891578d5a03
Author: Michal Marek
kbuild: Remove duplicate $(cmd) definition in Makefile.clean[4] commit 1846dfbde3e8a53f3673dcb1c1b79fd9b3f8d40d
Author: Masahiro Yamada
kbuild: remove redundant -rR flag of hdr-inst[5] commit 34948e0bbf98640fc1821751b01d2f0cd17d84d5
Author: Michal Marek
kbuild: Drop support for clean-rule[6] commit a16c5f99a28c9945165c46da27fff8e6f26f8736
Author: Michal Marek
kbuild: Fix removal of the debian/ directory[7] commit d0d38cd9e853db11e0242b3df4c9c3c4a663fbb4
Author: Masahiro Yamada
kbuild: use mixed-targets when two or more config targets are given[8] commit dd33c03b18b3f2db791eb6a17c37d2de66e4de18
Author: Masahiro Yamada
kbuild: fix cc-ifversion macro[9] commit 665d92e38f65d70796aad2b8e49e42e80815d4a4
Author: Masahiro Yamada
kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion[10] commit 6dcb4e5edf39e3b65a75ca76f087b2fdbee8a808
Author: Masahiro Yamada
kbuild: allow cc-ifversion to have the argument for false condition[11] commit c0a80c0c27e5e65b180a25e6c4c2f7ef9e386cd3
Author: Heiko Carstens
ftrace: allow architectures to specify ftrace compile options[12] commit 0b24becc810dc3be6e3f94103a866f214c282394
Author: Andrey Ryabinin
kasan: add kernel address sanitizer infrastructure[13] commit 4218affdf57f938c04e3a916a9685ee27079f377
Author: Masahiro Yamada
kbuild: remove warning about "make depend"[14] commit 77479b38e2f58890eb221a0418357502a5b41cd6
Author: Nathan Rossi
kbuild: Create directory for target DTBSigned-off-by: Masahiro Yamada
Signed-off-by: Robert Richter
Signed-off-by: Heiko Carstens
Signed-off-by: Martin Schwidefsky
Signed-off-by: Andrey Ryabinin
Signed-off-by: Nathan Rossi
Signed-off-by: Michal Simek
Signed-off-by: Olof Johansson
Signed-off-by: Michal Marek
Signed-off-by: Masahiro Yamada -
Update the files under scripts/kconfig/ to match Linux 4.1.
Some Kconfig sources have diverged from those in the kernel,
so commit-base syncing was done not to lose U-Boot specific updates.The commits cherry-picked from Linux are:
[1] commit be8af2d54a66911693eddc556e4f7a866670082b
Author: Bjørn Forsman
kconfig/lxdialog: get ncurses CFLAGS with pkg-config[2] commit 3943f42c11896ce82ad3da132c8a5630313bdd0e
Author: Andrey Utkin
Replace mentions of "list_struct" to "list_head"[3] commit e4e458b45c5861808674eebfea94cee2258bb2ea
Author: Arjun Sreedharan
calloc/xcalloc: Fix argument order[4] commit 09950bc256e3628d275f90e016e6f5a039fbdcab
Author: Olof Johansson
merge_config.sh: Display usage if given too few arguments[5] commit b6a2ab2cd4739a9573ed41677e53171987b8da34
Author: Colin Ian King
kconfig: use va_end to match corresponding va_start[6] commit 70529b1a1784503169416df19ce3d68746401340
Author: Michal Marek
kconfig: Get rid of the P() macro in headers[7] commit 463157444e377bf9b279101b1f16a94c4648c03a
Author: Michal Marek
kconfig: Remove dead code[8] commit ad8d40cda3ad22ad9e8863d55a5c88f85c0173f0
Author: Michal Marek
kconfig: Remove unnecessary prototypes from headers[9] commit de4619937229378e81f95e99c9866acc8e207d34
Author: Masahiro Yamada
kbuild: mergeconfig: fix "jobserver unavailable" warning[10] commit b9fe99c5b994c6ddc57780993966b18899526c0b
Author: Masahiro Yamada
kbuild: mergeconfig: move an error check to merge_config.sh[11] commit 371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d
Author: Masahiro Yamada
kbuild: mergeconfig: remove redundant $(objtree)[12] commit 3a975b8cfcbe026b535f83bde9a3c009bae214f9
Author: Masahiro Yamada
merge_config.sh: improve indentation[13] commit bc8f8f5fc47cd02c2c5f3580dac2fe6695af1edd
Author: Masahiro Yamada
merge_config.sh: rename MAKE to RUNMAKE[14] commit 63a91033d52e64a22e571fe84924c0b7f21c280d
Author: Masahiro Yamada
kbuild: add generic mergeconfig target, %.config[15] commit 1cba0c305758c3c1786ecaceb03e142c95a4edc9
Author: Michal Marek
kconfig: Simplify Makefile[16] commit 0a1f00a1c86421cc07cec87011c7cf4df68ee54b
Author: Michal Marek
kconfig: Do not print status messages in make -s modeSigned-off-by: Masahiro Yamada
Signed-off-by: Bjørn Forsman
Signed-off-by: Andrey Utkin
Signed-off-by: Jiri Kosina
Signed-off-by: Arjun Sreedharan
Signed-off-by: Arnaldo Carvalho de Melo
Signed-off-by: Olof Johansson
Signed-off-by: Colin Ian King
Signed-off-by: Michal Marek
23 Jul, 2015
3 commits
-
This patch adds the DDR3 setup and training code taken from the Marvell
U-Boot repository. This code used to be included as a binary (bin_hdr)
into the Armada A38x boot image. Not linked with the main U-Boot. With this
code addition and the serdes/PHY setup code, the Armada A38x support
in mainline U-Boot is finally self-contained. So the complete image
for booting can be built from mainline U-Boot. Without any additional
external inclusion.Note:
This code has undergone many hours (days!) of coding-style cleanup and
refactoring. It still is not checkpatch clean though, I'm afraid. As the
factoring of the code has so many levels of indentation that many lines
are longer than 80 chars.Signed-off-by: Stefan Roese
-
With the upcoming addition of the Armada 38x DDR support, which is not
compatible to the Armada XP DDR init code, we need to introduce a new
directory infrastructure. To support multiple Marvell DDR controller.This will be the new structure:
drivers/ddr/marvell/axp
Supporting Armada XP (AXP) devices (and perhaps Armada 370)drivers/ddr/marvell/a38x
Supporting Armada 38x devices (and perhaps Armada 39x)Signed-off-by: Stefan Roese
22 Jul, 2015
5 commits
-
Clocks are an important feature of platforms and have become increasing
complex with time. Most modern SoCs have multiple PLLs and dozens of clock
dividers which distribute clocks to on-chip peripherals.Some SoC implementations have a clock API which is private to that SoC family,
e.g. Tegra and Exynos. This is useful but it would be better to have a
common API that can be understood and used throughout U-Boot.Add a simple clock API as a starting point. It supports querying and setting
the rate of a clock. Each clock is a device. To reduce memory and processing
overhead the concept of peripheral clocks is provided. These do not need to
be explicit devices - it is possible to write a driver that can adjust the
I2C clock (for example) without an explicit I2C clock device. This can
dramatically reduce the number of devices (and associated overhead) in a
complex SoC.Clocks are referenced by a number, and it is expected that SoCs will define
that numbering themselves via an enum.Signed-off-by: Simon Glass
-
Add support for a driver which sets up DRAM and can return information about
the amount of RAM available. This is a first step towards moving RAM init
to driver model.Signed-off-by: Simon Glass
-
This functionality may be useful for setting up regulators early during
boot.Signed-off-by: Simon Glass
-
Add a simple uclass for LEDs, so that these can be controlled by the device
tree and activated when needed. LEDs are referred to by their label.This implementation requires a driver for each type of LED (e.g GPIO, I2C).
Signed-off-by: Simon Glass
-
The SPL device tree size must be minimised to save memory. Only include
properties that are needed by SPL - this is determined by the presence
of the "u-boot,dm-pre-reloc" property. Also remove a predefined list of
unused properties from the nodes that remain.Signed-off-by: Simon Glass
11 Jun, 2015
1 commit
-
Allow SPL to be built with this option so that we can support device tree
control. Disable the simple bus for now in SPL. It may be needed later.Signed-off-by: Simon Glass
08 Jun, 2015
1 commit
-
I might have missed something, but I failed to use the escape char '\'
in strings. To pass a printf format string like "foo %d bar\n" via
Kconfig to the code.Right now its not possible to use the escape character '\' in Kconfig
string values correctly to e.g. set this string value "test output\n".
The '\n' will be converted to 'n'.The current implementation removes some of the '\' chars from the input
string in conf_set_sym_val(). Examples:'\' -> ''
'\\' -> '\'
'\\\' -> '\'
'\\\\' -> '\\'
...And then doubles the backslash chars in the output string in
sym_escape_string_value(). Example:'\' -> '' -> ''
'\\' -> '\' -> '\\'
'\\\' -> '\' -> '\\'
'\\\\' -> '\\' -> '\\\\'
...As you see in these examples, its impossible to generate a single '\'
charater in the output string as its needed for something like '\n'.This patch now changes this behavior to not drop some backslashes in
conf_set_sym_val() and to not add new backslashes in the resulting
output string. Removing the function sym_escape_string_value()
completely as its not needed anymore.Signed-off-by: Stefan Roese
Cc: Masahiro Yamada
Reviewed-by: Simon Glass
Cc: Tom Rini
28 May, 2015
1 commit
-
Since 741e58e0fc8e (Create a .cfg file containing the CONFIG options
used to build), all the Blackfin boards fail to build if the parallel
(-j) option is passed.$ make -s bf506f-ezkit_defconfig
#
# configuration written to .config
#
$ make -j8 CROSS_COMPILE=bfin-elf-
scripts/kconfig/conf --silentoldconfig Kconfig
CHK include/config.h
UPD include/config.h
GEN include/autoconf.mk
GEN include/autoconf.mk.dep
CHK include/config/uboot.release
CHK include/generated/timestamp_autogenerated.h
UPD include/generated/timestamp_autogenerated.h
CFG u-boot.cfg
include/asm-offsets.h:3:43: fatal error:
generated/generic-asm-offsets.h: No such file or directory
compilation terminated.
make: *** [u-boot.cfg] Error 1When parsing header files for defined CONFIG options, DO_DEPS_ONLY
must be defined to exclude generated headers that might not have
been available yet.Signed-off-by: Masahiro Yamada
Reviewed-by: Simon Glass
27 May, 2015
1 commit
-
When moving configs, it is important to know what was defined in the
config header even if it duplicates the configs coming from Kconfig.This is specifically needed for the case where a config is set to
default 'y' in the Kconfig. This would previously cause the actual value
from the include config to be filtered out, and moveconfig.py would
think that it was 'n'... This means that the value that should be 'y'
is now (in every defconfig) set to 'not set'.tools/moveconfig.py now defines KCONFIG_IGNORE_DUPLICATES to prevent the
filtering from happening and selecting wrong values for the defconfig.Signed-off-by: Joe Hershberger
Acked-by: Masahiro Yamada
19 Apr, 2015
1 commit
-
At present CONFIG options are split across Kconfig and board config headers
files. Also we have multiple files containing these CONFIG options.In order to see exactly what is being used for building, create a .cfg
file which holds these options as reported by the C preprocessor.Signed-off-by: Simon Glass
07 Apr, 2015
1 commit
-
Top-level Makefile has option to select dtc binary, but it is ignored
due to bug in Makefile.lib. Fix it.Signed-off-by: Pavel Machek
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
1 commit
-
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