summaryrefslogtreecommitdiffstats
path: root/Kconfig
Commit message (Collapse)AuthorAgeFilesLines
* spl: Add full fitImage supportMarek Vasut2018-05-231-0/+11
| | | | | | | | | | | | | | Add support for loading U-Boot and optionally FDT from a fitImage in SPL by using the full fitImage support from U-Boot. While we do have limited SPL loading support in SPL with a small footprint, it is missing a lot of important features, like checking signatures. This support has all the fitImage features, while the footprint is obviously larger. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
* fit: Fix CONFIG_FIT_SPL_PRINTMarek Vasut2018-05-231-0/+6
| | | | | | | | | | Rename CONFIG_FIT_SPL_PRINT to CONFIG_SPL_FIT_PRINT and add Kconfig entry for it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
* Kconfig: Add dependency on HASH to verified bootKelvin Cheung2018-05-061-0/+1
| | | | | | | | | | | | | | | | Building with verified boot support requires hash, add that dependency here. Otherwise the following build error will come out without crc command. LD u-boot lib/built-in.o: In function `hash_calculate': lib/rsa/rsa-checksum.c:29: undefined reference to `hash_progressive_lookup_algo' ... make[1]: *** [u-boot] Error 1 Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
* distro: select CMD_ENV_EXISTSMasahiro Yamada2018-04-281-0/+1
| | | | | | | | 'env exists' is used for scripting in include/config_distro_bootcmd.h This command is available only when CONFIG_CMD_ENV_EXISTS is enabled. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Alexander Graf <agraf@suse.de>
* distro: use imply to enable DISTRO_DEFAULTS as SoC defaultMasahiro Yamada2018-04-281-5/+0
| | | | | | | The default of DISTRO_DEFAULTS is messy. Using the 'imply' keyword is equivalent and cleaner. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* Migrate IMAGE_FORMAT_LEGACY to KconfigAlex Kiernan2018-04-281-0/+10
| | | | | | | This converts IMAGE_FORMAT_LEGACY to Kconfig Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* Kconfig: Enlarge default SYS_MALLOC_F_LEN for AM33XXSjoerd Simons2018-04-161-0/+1
| | | | | | | | | | | | | Since commit 8e14ba7bd524 ("gpio: omap_gpio: Add DM_FLAG_PRE_RELOC flag") omap GPIO gets bound before relocation. Unfortunately due to this, on at least the beaglebone black, the pre-relocation memory pool gets exhausted before probing the serial port. This then causes u-boot to panic as CONFIG_REQUIRE_SERIAL_CONSOLE is set... Resolve this by resizing the default size of the pre-relocation malloc pool for AM335X platforms. Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
* Merge git://git.denx.de/u-boot-netTom Rini2018-04-151-9/+3
|\
| * Revert "Kconfig: cmd: Make networking command dependent on NET"Joe Hershberger2018-04-131-1/+1
| | | | | | | | | | | | | | | | | | This reverts the parts of commit 3b3ea2c56ec4bc5588281fd103c744e608f8b25c where it changed the EFI dependency on NET. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Duncan Hare <dh@synoia.com>
| * net: Make the BOOTP options defaultJoe Hershberger2018-04-131-6/+0
| | | | | | | | | | | | | | | | | | | | The BOOTP options used to be and should still be default for all boards with CMD_NET enabled. One should not be forced to use DISTRO_DEFAULTS to get them. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Duncan Hare <dh@synoia.com>
| * net: Fix distro default dependenciesJoe Hershberger2018-04-131-2/+2
| | | | | | | | | | | | | | | | PING requires CMD_NET, not NET. Also, CMD_NET already depends on NET, so no need to directly depend on it. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* | kconfig: add CONFIG_CC_COVERAGEChristian Gmeiner2018-04-131-0/+7
|/ | | | | | | | | | | Make it possible to use gcc code coverage analysis. v1 -> v2: - Kconfig: remove not needed 'default n' - Makefile: use consistent spacing Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* sunxi: move CONFIG_SYS_TEXT_BASE out of defconfigsAndre Przywara2018-03-141-0/+3
| | | | | | | | | | | | | | | | | Commit 278b90ce786f ("configs: Migrate CONFIG_SYS_TEXT_BASE") made CONFIG_SYS_TEXT_BASE a proper Kconfig variable, with the consequence of moving the common definition shared by almost every sunxi board into 123 individual defconfig files. But the U-Boot start address for Allwinner boards is a platform decision which has been around for ages, so defining it in each *board* config file seems a bit over the top. Define the standard values (160MB into DRAM for most SoCs, with two SoC exceptions) if ARCH_SUNXI is selected, and delete the lines from the individual defconfigs. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
* Kconfig: cmd: Make networking command dependent on NETMichal Simek2018-02-271-9/+9
| | | | | | | | Enable networking command only when NET is enabled. And remove selecting NET for CMD_NET Signed-off-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_BOOTP_BOOTPATH et al to KconfigAdam Ford2018-02-231-0/+24
| | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_BOOTP_BOOTPATH CONFIG_BOOTP_DNS CONFIG_BOOTP_GATEWAY CONFIG_BOOTP_HOSTNAME CONFIG_BOOTP_PXE CONFIG_BOOTP_SUBNETMASK CONFIG_CMDLINE_EDITING CONFIG_AUTO_COMPLETE CONFIG_SYS_LONGHELP CONFIG_SUPPORT_RAW_INITRD CONFIG_ENV_VARS_UBOOT_CONFIG Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Re-run the migration] Signed-off-by: Tom Rini <trini@konsulko.com>
* configs: Re-sync with CONFIG_DISTRO_DEFAULTSTom Rini2018-02-231-1/+1
| | | | | | | | A number of platforms include config_distro_defaults.h but do not enable CONFIG_DISTRO_DEFAULTS. As they plainly intended to, set that flag and re-sync config files. Signed-off-by: Tom Rini <trini@konsulko.com>
* configs: Migrate CONFIG_SYS_TEXT_BASETom Rini2018-02-111-5/+3
| | | | | | | | | | | On the NIOS2 and Xtensa architectures, we do not have CONFIG_SYS_TEXT_BASE set. This is a strict migration of the current values into the defconfig and removing them from the headers. I did not attempt to add more default values in and for now will leave that to maintainers. Signed-off-by: Tom Rini <trini@konsulko.com>
* Kconfig: Select networking commands only when NET is enabledMichal Simek2018-02-081-4/+4
| | | | | | | There is no reason to unconditially select network commands as distro defaults without networking enable. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* Convert CONFIG_SYS_BOOT_GET_{CMDLINE, KBD} to KconfigDerald D. Woods2018-01-301-0/+12
| | | | | | | | This converts the following to Kconfig: CONFIG_SYS_BOOT_GET_CMDLINE CONFIG_SYS_BOOT_GET_KBD Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
* Kconfig: Introduce USE_BOOTCOMMAND and migrate BOOTCOMMANDTom Rini2017-11-171-0/+1
| | | | | | | | | | | We first introduce CONFIG_USE_BOOTCOMMAND, similar to CONFIG_USE_BOOTARGS. We then migrate CONFIG_BOOTCOMMAND for most CONFIG_DISTRO_DEFAULT users. In some cases platforms have a complex scheme around this usage, and these have been defered for the moment so that platform maintainers can work on a migration plan. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Lukasz Majewski <lukma@denx.de>
* Kconfig: add CONFIG_BROKENHeinrich Schuchardt2017-10-231-0/+6
| | | | | | | | | | | | Provide a Kconfig option that we can use as dependency for features that are broken. This allows to easily disable them without removing the code. As no short text is supplied the option will not appear in menuconfig. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
* x86: provide CONFIG_BUILD_ROMHeinrich Schuchardt2017-10-191-0/+9
| | | | | | | | | | | | | | | | Up to now we depended on an exported variable to build u-boot.rom. We should be able to specify it in the configuration file, too. With this patch this becomes possible using the new Kconfig option CONFIG_BUILD_ROM. This option depends on CONFIG_X86 and is selected in qemu-x86_defconfig and qemu-x86_64_defconfig. Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* SPL: FIT: Kconfig: Change SPL_FIT_IMAGE_POST_PROCESS entryext-vasily.gurevich@vaisala.com2017-10-161-1/+1
| | | | | | Remove depends on TI_SECURE_DEVICE for other platforms. Signed-off-by: Vasily Gurevich <ext-vasily.gurevich@vaisala.com>
* scripts: Move Kconfig contents to cmd/KconfigSam Protsenko2017-10-081-2/+0
| | | | | | | | | On case-insensitive file systems we have collision between scripts/kconfig/ directory and scripts/Kconfig file. This patch moves scripts/Kcofnig contents to cmd/Kconfig to fix that. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* Kconfig: Migrate all of cmd/fastboot/Kconfig to defconfigsTom Rini2017-09-011-0/+7
| | | | | | | | | | - Move ANDROID_IMAGE_SUPPORT to top level Kconfig under images as it's not strictly part of fastboot. - Add some defaults for the fastboot buffer location and size - Migrate all options listed in cmd/fastboot/Kconfig - Cleanup the README Signed-off-by: Tom Rini <trini@konsulko.com>
* Move environment files from common/ to env/Simon Glass2017-08-151-0/+2
| | | | | | | | | About a quarter of the files in common/ relate to the environment. It seems better to put these into their own subdirectory and remove the prefix. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* spl: use TPL_SYS_MALLOC_F_LEN for TPLPhilipp Tomsich2017-08-131-1/+11
| | | | | | | | | | | | | | The (upstream) changes to break up SYS_MALLOC_F_LEN for the full U-Boot and the SPL stage, break TPL (if simple malloc is enabled in TPL). This adds support for a TPL-variant of SYS_MALLOC_F_LEN: - adds TPL_SYS_MALLOC_F_LEN - rewrites a test for CONFIG_SPL_SYS_MALLOC_F_LEN to access CONFIG_VAL(SYS_MALLOC_F_LEN) Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* Convert ARCH_OMAP2PLUS boards' CONFIG_SYS_TEXT_BASE to KconfigAdam Ford2017-08-041-1/+3
| | | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_TEXT_BASE The includes, whitelist, etc. were left for now but I don't get any build errors or warnings on the omap3_logic_defconfig or am3517_evm_defconfig builds I tried. Signed-off-by: Adam Ford <aford173@gmail.com>
* spl: make SPL and normal u-boot stage use independent SYS_MALLOC_F_LENAndy Yan2017-07-271-0/+10
| | | | | | | | | | | | | | | | | Some platforms have very limited SRAM to run SPL code, so there may not be the same amount space for a malloc pool before relocation in the SPL stage as the normal U-Boot stage. Make SPL and (the full) U-Boot stage use independent SYS_MALLOC_F_LEN, so the size of pre-relocation malloc pool can be configured memory space independently. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [fixed up commit-message:] Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Merge git://git.denx.de/u-boot-sunxiTom Rini2017-05-221-1/+25
|\ | | | | | | | | | | | | trini: Make Kconfig SPL_xxx entires only show if SPL, so that we don't get Kconfig errors on platforms without SPL, ie sandbox (without SPL). Signed-off-by: Tom Rini <trini@konsulko.com>
| * sunxi: enable automatic FIT build for 64-bit SoCsAndre Przywara2017-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The Allwinner SoCs with 64-bit cores use an ARM Trusted Firmware binary, which needs to be loaded alongside U-Boot proper. Set the respective Kconfig options to let them select this feature and also automatically build the FIT image. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> [Rename Kconfig path to arch/arm/mach-sunxi/Kconfig] Signed-off-by: Jagan Teki <jagan@openedev.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * Makefile: add rules to generate SPL FIT imagesAndre Przywara2017-05-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some platforms require more complex U-Boot images than we can easily generate via the mkimage command line, for instance to load additional image files. Introduce a CONFIG_SPL_FIT_SOURCE and CONFIG_SPL_FIT_GENERATOR symbol, which can either hold an .its source file describing the image layout, or, in the second case, a generator tool (script) to create such a source file. This script gets passed the list of device tree files from the CONFIG_OF_LIST variable. A platform or board can define either of those in their defconfig file to allow an easy building of such an image. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * Kconfig: fix SPL_FIT dependencyAndre Przywara2017-05-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SPL_FIT obviously requires libfdt in SPL, so let Kconfig express that by selecting SPL_OF_LIBFDT. Also make the actual options that users want (SPL signature and SPL FIT loading) visible in the menu and let them select the SPL_FIT as a requirement. Also remove the now redundant SPL_OF_LIBFDT from those Kconfigs that had it in for the SPL FIT loading feature. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Simon Glass <sjg@chromium.org> [Remove change from configs/evb-rk3399_defconfig] Signed-off-by: Jagan Teki <jagan@openedev.com>
* | lib: move hash CONFIG options to KconfigTom Rini2017-05-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 94e3c8c4fd7b ("crypto/fsl - Add progressive hashing support using hardware acceleration.") created entries for CONFIG_SHA1, CONFIG_SHA256, CONFIG_SHA_HW_ACCEL, and CONFIG_SHA_PROG_HW_ACCEL. However, no defconfig has migrated to it. Complete the move by first adding additional logic to various Kconfig files to select this when required and then use the moveconfig tool. In many cases we can select these because they are required to implement other drivers. We also correct how we include the various hashing algorithms in SPL. This commit was generated as follows (after Kconfig additions): [1] tools/moveconfig.py -y SHA1 SHA256 SHA_HW_ACCEL [2] tools/moveconfig.py -y SHA_PROG_HW_ACCEL Note: We cannot move SHA_HW_ACCEL and SHA_PROG_HW_ACCEL simultaneously because there is dependency between them. Cc: Poonam Aggrwal <poonam.aggrwal@freescale.com> Cc: Naveen Burmi <NaveenBurmi@freescale.com> Cc: Po Liu <po.liu@freescale.com> Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com> Cc: Priyanka Jain <Priyanka.Jain@freescale.com> Cc: Shaohui Xie <Shaohui.Xie@freescale.com> Cc: Chunhe Lan <Chunhe.Lan@freescale.com> Cc: Chander Kashyap <k.chander@samsung.com> Cc: Steve Rae <steve.rae@raedomain.com> Cc: Dirk Eibach <eibach@gdsys.de> Cc: Feng Li <feng.li_2@nxp.com> Cc: Alison Wang <alison.wang@freescale.com> Cc: Sumit Garg <sumit.garg@nxp.com> Cc: Mingkai Hu <Mingkai.Hu@freescale.com> Cc: York Sun <york.sun@nxp.com> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Cc: Jaehoon Chung <jh80.chung@samsung.com> Cc: Akshay Saraswat <akshay.s@samsung.com> Cc: Heiko Schocher <hs@denx.de> Cc: Jagan Teki <jagan@amarulasolutions.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com>
* | FIT: Rename FIT_DISABLE_SHA256 to FIT_ENABLE_SHA256_SUPPORTTom Rini2017-05-221-0/+13
|/ | | | | | | | | | | | We rename CONFIG_FIT_DISABLE_SHA256 to CONFIG_FIT_ENABLE_SHA256_SUPPORT which is enabled by default and now a positive option. Convert the handful of boards that were disabling it before to save space. Cc: Dirk Eibach <eibach@gdsys.de> Cc: Lukasz Dalek <luk0104@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
* Kconfig: Adds SYS_TEXT_BASE config option for Keystone2Madan Srinivas2017-04-081-1/+1
| | | | | | | | | | | This patch makes SYS_TEXT_BASE a config option for Keystone2 so that it can be used to load u-boot at different addresses on secure and non-secure Keystone2 devices. Signed-off-by: Madan Srinivas <madans@ti.com> Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
* SPARC: RemoveTom Rini2017-04-051-1/+1
| | | | | | | The SPARC architecture is currently unmaintained, remove. Cc: Francois Retief <fgretief@spaceteq.co.za> Signed-off-by: Tom Rini <trini@konsulko.com>
* Kconfig: define MD5 dependency for FIT supportAndre Przywara2017-03-171-0/+1
| | | | | | | | | FIT images require MD5 support to verify image checksums. So far this was expressed by defining a CPP symbol in image.h. Since MD5 is now a first class Kconfig citizen, express that in Kconfig instead. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* kconfig: Add API kconfig fileEmmanuel Vadot2017-02-081-0/+2
| | | | | | | | Add kconfig file to enable API support Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* cmd: add a new command "config" to show .config contentsMasahiro Yamada2017-02-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature is inspired by /proc/config.gz of Linux. In Linux, if CONFIG_IKCONFIG is enabled, the ".config" file contents are embedded in the kernel image. If CONFIG_IKCONFIG_PROC is also enabled, the ".config" contents are exposed to /proc/config.gz. Users can do "zcat /proc/config.gz" to check which config options are enabled on the running kernel image. The idea is almost the same here; if CONFIG_CMD_CONFIG is enabled, the ".config" contents are compressed and saved in the U-Boot image, then printed by the new command "config". The usage is quite simple. Enable CONFIG_CMD_CONFIG, then run > config from the command line interface. The ".config" contents will be printed on the console. This feature increases the U-Boot image size by about 4KB (this is mostly due to the gzip-compressed .config file). By default, it is enabled only for Sandbox because we do not care about the memory footprint on it. Of course, this feature is architecture agnostic, so you can enable it on any board if the image size increase is acceptable for you. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* cmd, disk: convert CONFIG_PARTITION_UUIDS, CMD_PART and CMD_GPTPatrick Delaunay2017-01-281-0/+1
| | | | | | | | | | | We convert CONFIG_PARTITION_UUIDS to Kconfig first. But in order to cleanly update all of the config files we must also update CMD_PART and CMD_GPT to also be in Kconfig in order to avoid complex logic elsewhere to update all of the config files. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* disk: convert CONFIG_PARTITIONS to KconfigPatrick Delaunay2017-01-281-0/+2
| | | | | Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
* odroid-c2: Enable distro bootAndreas Färber2017-01-201-0/+1
| | | | | | | | | | | Use the generic "distro" boot framework to enable automatic DHCP boot. MMC and USB are not yet implemented, so this is the only boot option. The fdt and kernel addresses are adopted from downstream; ramdisk and scriptaddr addresses were chosen arbitrarily. Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Alexander Graf <agraf@suse.de>
* Kconfig: Refactoring of top-level Kconfig fileRobert P. J. Day2017-01-141-65/+60
| | | | | | | | | | | | Some refactoring of the top-level Kconfig file which includes: * using "if" to remove numerous identical dependency tests * reordering config entries to group related ones * spelling and grammar fixes There should be no functional changes, only aesthetic ones. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* Enable DISTRO_DEFAULTS for Rockchip platformsRomain Perier2017-01-111-0/+1
| | | | | | | | | This enables suitable commands needed for booting general purpose Linux distribution. This is required for example if we want to use PXE or DHCP as default boot targets, symbols no longer enabled by config_distro_defaults.h . Signed-off-by: Romain Perier <romain.perier@collabora.com>
* ARM: zynq: Move CONFIG_SYS_TEXT_BASE to KconfigMichal Simek2017-01-101-1/+2
| | | | | | Enable CONFIG_SYS_TEXT_BASE via Kconfig. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-dmTom Rini2016-12-031-3/+2
|\
| * libfdt: replace ARCH_FIXUP_FDT with ARCH_FIXUP_FDT_MEMORYMasahiro Yamada2016-12-021-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit e2f88dfd2d96 ("libfdt: Introduce new ARCH_FIXUP_FDT option") allows us to skip memory setup of DTB, but a problem for ARM is that spin_table_update_dt() and psci_update_dt() are skipped as well if CONFIG_ARCH_FIXUP_FDT is disabled. This commit allows us to skip only fdt_fixup_memory_banks() instead of the whole of arch_fixup_fdt(). It will be useful when we want to use a memory node from a kernel DTB as is, but need some fixups for Spin-Table/PSCI. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Alexey Brodkin <abrodkin@synopsys.com> Acked-by: Simon Glass <sjg@chromium.org> Fixed build error for x86: Signed-off-by: Simon Glass <sjg@chromium.org>
* | cmd: move CMD_PXE to KconfigYann E. MORIN2016-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, CMD_PXE is forcibly enabled in config_distro_defaults.h, so that general purpose distributions can rely on it being defined. This header is included, under conditions or not, by various archs or famillies of archs / SoCs. However, it is very possible that boards based on those SoCs will not have a physical ethernet connector at all, even if the have a MAC; for example, the Nanopi Neo AIR (sunxi H3) does not. It is also possible that network booting is absolutely not necessary for a device. However, it is not possible to disable the PXE command, as it is forcibly enabled and is non-configurable. But it turns out we already have a config option to build a distro-ready image, in the name of DISTRO_DEFAULTS. Move CMD_PXE out of the hard-coded config_distro_defaults.h into a Kconfig option, that gets selected by DISTRO_DEFAULTS when it is set. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Joe Hershberger <joe.hershberger@ni.com> [trini: Make it select MENU, run moveconfig.py] Signed-off-by: Tom Rini <trini@konsulko.com>
* | Enable DISTRO_DEFAULT on platforms that missed it beforeTom Rini2016-12-031-1/+1
|/ | | | | | | | | A number of platforms had been using the distro default feature before it was moved to Kconfig but did not enable the new Kconfig option when it was enabled. This caused a regression in terms of features and this introduces breakage when more things move to Kconfig. Signed-off-by: Tom Rini <trini@konsulko.com>