January 2019 - U-Boot

[U-Boot] [PATCH 1/2] travis: Setup QEMU_VERSION as variable
by Michal Simek 16 Jan '19

16 Jan '19

This change enables setting up specific Qemu version or sha1 for new targets which are added after (current) v3.0.0 version. This changes is preparation step for adding new Xilinx Versal Virt platform which was merge after v3.0.0. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 321fd793a756..6e4b4ba0a34a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,6 +63,7 @@ env: - BUILD_DIR=build - HOSTCC="cc" - HOSTCXX="c++" + - QEMU_VERSION="v3.0.0" before_script: # install toolchains based on TOOLCHAIN} variable @@ -97,7 +98,7 @@ before_script: git clone git://git.qemu.org/qemu.git /tmp/qemu; pushd /tmp/qemu; git submodule update --init dtc && - git checkout v3.0.0 && + git checkout ${QEMU_VERSION} && ./configure --prefix=/tmp/qemu-install --target-list=${QEMU_TARGET} && make -j4 all install; popd; -- 1.9.1

5 24

[U-Boot] [PATCH 0/3] MSCC: Add Servalt SoC family
by Horatiu Vultur 16 Jan '19

16 Jan '19

This patch series adds support for MSCC Servalt SoC family. In this family there is only one board: Servalt(pcb116). This is based off the u-boot-mips/next repository Horatiu Vultur (3): pinctrl: mscc: Add gpio and pinctrl for Servalt SoC family. MSCC: Add support for Servalt SoC family. MSCC: Add board support for Servalt SoC family arch/mips/dts/Makefile | 1 + arch/mips/dts/mscc,servalt.dtsi | 149 ++++++++++ arch/mips/dts/servalt_pcb116.dts | 56 ++++ arch/mips/mach-mscc/Kconfig | 8 + arch/mips/mach-mscc/cpu.c | 2 +- arch/mips/mach-mscc/dram.c | 3 +- arch/mips/mach-mscc/include/mach/common.h | 5 + arch/mips/mach-mscc/include/mach/ddr.h | 22 +- arch/mips/mach-mscc/include/mach/servalt/servalt.h | 24 ++ .../include/mach/servalt/servalt_devcpu_gcb.h | 20 ++ .../mach/servalt/servalt_devcpu_gcb_miim_regs.h | 25 ++ .../include/mach/servalt/servalt_icpu_cfg.h | 319 +++++++++++++++++++++ arch/mips/mach-mscc/reset.c | 2 +- board/mscc/servalt/Kconfig | 14 + board/mscc/servalt/Makefile | 3 + board/mscc/servalt/servalt.c | 52 ++++ configs/mscc_servalt_defconfig | 60 ++++ drivers/pinctrl/mscc/Kconfig | 9 + drivers/pinctrl/mscc/Makefile | 1 + drivers/pinctrl/mscc/pinctrl-servalt.c | 269 +++++++++++++++++ 20 files changed, 1033 insertions(+), 11 deletions(-) create mode 100644 arch/mips/dts/mscc,servalt.dtsi create mode 100644 arch/mips/dts/servalt_pcb116.dts create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h create mode 100644 board/mscc/servalt/Kconfig create mode 100644 board/mscc/servalt/Makefile create mode 100644 board/mscc/servalt/servalt.c create mode 100644 configs/mscc_servalt_defconfig create mode 100644 drivers/pinctrl/mscc/pinctrl-servalt.c -- 2.7.4

2 6

[U-Boot] [PATCH 1/2] mips: mt7688: gardena-smart-gateway: Update mtdparts/mtdids for Kernel 4.19
by Stefan Roese 16 Jan '19

16 Jan '19

With the new SPI NOR framework in v4.19, we need to adapt the MTD parts so that the kernel cmdline parameter "mtdparts=" uses the correct naming for the devices. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- configs/gardena-smart-gateway-mt7688-ram_defconfig | 4 ++-- configs/gardena-smart-gateway-mt7688_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/gardena-smart-gateway-mt7688-ram_defconfig b/configs/gardena-smart-gateway-mt7688-ram_defconfig index ae8bf2981f..bfd9bada2a 100644 --- a/configs/gardena-smart-gateway-mt7688-ram_defconfig +++ b/configs/gardena-smart-gateway-mt7688-ram_defconfig @@ -33,8 +33,8 @@ CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_TIME=y CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="spi-nand0=gd5f,nor0=spi0.0" -CONFIG_MTDPARTS_DEFAULT="spi0.0:640k(uboot),64k(uboot_env0),64k(uboot_env1),64k(factory),-(unused);gd5f:-(nand)" +CONFIG_MTDIDS_DEFAULT="spi-nand0=spi0.1,nor0=spi0.0" +CONFIG_MTDPARTS_DEFAULT="spi0.0:640k(uboot),64k(uboot_env0),64k(uboot_env1),64k(factory),-(unused);spi0.1:-(nand)" CONFIG_CMD_UBI=y CONFIG_DEFAULT_DEVICE_TREE="gardena-smart-gateway-mt7688" CONFIG_ENV_IS_IN_SPI_FLASH=y diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig index b7024e3dec..d844932c33 100644 --- a/configs/gardena-smart-gateway-mt7688_defconfig +++ b/configs/gardena-smart-gateway-mt7688_defconfig @@ -36,8 +36,8 @@ CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_TIME=y CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="spi-nand0=gd5f,nor0=spi0.0" -CONFIG_MTDPARTS_DEFAULT="spi0.0:640k(uboot),64k(uboot_env0),64k(uboot_env1),64k(factory),-(unused);gd5f:-(nand)" +CONFIG_MTDIDS_DEFAULT="spi-nand0=spi0.1,nor0=spi0.0" +CONFIG_MTDPARTS_DEFAULT="spi0.0:640k(uboot),64k(uboot_env0),64k(uboot_env1),64k(factory),-(unused);spi0.1:-(nand)" CONFIG_CMD_UBI=y CONFIG_DEFAULT_DEVICE_TREE="gardena-smart-gateway-mt7688" CONFIG_ENV_IS_IN_SPI_FLASH=y -- 2.20.1

2 3

[U-Boot] [PATCH v1 00/21] imx: vybrid: Update BK4 and PCM052 boards to only use DM/DTS
by Lukasz Majewski 16 Jan '19

16 Jan '19

This patch series converts PCM052 and BK4 to use Driver Model and Device Tree. Some notable changes: - The way how MAC address is read from fuses can now be adjusted - DTS improvement/sync with kernel - Using generic code instead of one from board The output of u-boot boot: U-Boot 2019.01-rc3-00076-gc149229be0 (Jan 14 2019 - 08:38:48 +0100) CPU: Freescale Vybrid VF610 at 396 MHz Reset cause: POWER ON RESET Model: Liebherr (LVF) BK4 Vybrid Board Board: BK4r1 (L333) DRAM: 512 MiB NAND: 1024 MiB MMC: FSL_SDHC: 0 Loading Environment from NAND... OK In: serial@40028000 Out: serial@40028000 Err: serial@40028000 Net: eth0: fec@400d0000, eth1: fec@400d1000 Enter passphrase to stop autoboot, booting in 3 seconds Buildman CI: ./tools/buildman/buildman.py --branch=HEAD~3 vf610 mx6 vybrid --detail --verbose --show_errors --force-build --count=21 --output-dir=../BUILD/ Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/jobs/479284276 [omitting test_efi_selftest failure - as PCM052/BK4 is not supporting EFI] U-boot master branch: SHA1: b3a69c246915bd704d6073bcf4614d6881c0da04 Lukasz Majewski (21): ARM: DTS: vybrid: Add vf-u-boot.dtsi to set 'u-boot,dm-pre-reloc' in soc net: FEC: Add compatible for vybrid (vf610) to reuse fec_mxc.c driver net: Kconfig: FEC: Add dependency on VF610 vybrid: ddr: Extend vf610-pinfunc.h with DDR pads definitions vybrid: clock: Provide enable_i2c_clk() function for Vybrid vybrid: Define the imx_get_mac_from_fuse() as a __weak function pcm052: board: Remove "m4go" command as it is superseded by "bootaux" pcm052: board: vybrid: Update the board name for BK4 device ARM: DTS: vybrid: Update vf.dtsi file to descibe more vf610 hardware pcm052: board: cosmetic: Add copyright notice to pcm052.c ARM: DTS: Update pcm052 based dts files (bk4r1/pcm052.dts) defconfig: bk4/pcm052: Update bk4r1|pcm052_defconfig to support DM/DT config: pcm052: Use SZ_X{MK} from linux/sizes.h for include/configs/pcm052.h config: bk4: Update include/configs/bk4r1.h file pcm052: board: Remove in-board setup code (it is now replaced by DM setup) config: bk4: Update u-boot script to support recovery via SD card config: bk4: Update u-boot envs to support NOR memories initial setup pcm052: bk4: sdcard: Add support for SD card booting/recovery pcm052: board: Add code to setup LED default states pcm052: mac: Provide board specific imx_get_mac_from_fuse() function pcm052: bk4: Add board_phy_config() for BK4 to setup ksz8081 phy arch/arm/cpu/armv7/vf610/Kconfig | 1 + arch/arm/cpu/armv7/vf610/generic.c | 21 +- arch/arm/dts/bk4r1.dts | 108 +++++--- arch/arm/dts/pcm052.dts | 6 +- arch/arm/dts/vf-u-boot.dtsi | 11 + arch/arm/dts/vf.dtsi | 63 +++++ arch/arm/dts/vf610-pcm052.dtsi | 266 ++++++++++++++++++++ arch/arm/dts/vf610-pinfunc.h | 50 ++++ arch/arm/include/asm/arch-vf610/clock.h | 3 + arch/arm/include/asm/arch-vf610/imx-regs.h | 2 + board/phytec/pcm052/pcm052.c | 386 +++++++---------------------- configs/bk4r1_defconfig | 46 +++- configs/pcm052_defconfig | 32 ++- drivers/net/Kconfig | 2 +- drivers/net/fec_mxc.c | 1 + include/configs/bk4r1.h | 263 +++++++++++++++++++- include/configs/pcm052.h | 51 +--- 17 files changed, 925 insertions(+), 387 deletions(-) create mode 100644 arch/arm/dts/vf-u-boot.dtsi create mode 100644 arch/arm/dts/vf610-pcm052.dtsi -- 2.11.0

2 30

[U-Boot] [PATCH 1/3] tools: zynqimage: Align image_size/image_stored_size
by Michal Simek 16 Jan '19

16 Jan '19

Bootrom is not capable to work with non aligned bootloader sizes. SPL with OF_SEPARATE generates non-align images quite often that's why this change is required before OF_SEPARATE enableding. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- tools/zynqmpbif.c | 4 ++-- tools/zynqmpimage.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c index a33c15e1f018..8c47107c7b94 100644 --- a/tools/zynqmpbif.c +++ b/tools/zynqmpbif.c @@ -425,8 +425,8 @@ static int bif_add_part(struct bif_entry *bf, const char *data, size_t len) if (!bif_output.header->image_offset) bif_output.header->image_offset = cpu_to_le32(bf->offset); - bif_output.header->image_size = cpu_to_le32(len); - bif_output.header->image_stored_size = cpu_to_le32(len); + bif_output.header->image_size = cpu_to_le32(len_padded); + bif_output.header->image_stored_size = cpu_to_le32(len_padded); bif_output.header->image_attributes &= ~HEADER_CPU_SELECT_MASK; switch (bf->dest_cpu) { diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c index 19b2f02ff150..67032aa7b23c 100644 --- a/tools/zynqmpimage.c +++ b/tools/zynqmpimage.c @@ -411,6 +411,7 @@ static void zynqmpimage_set_header(void *ptr, struct stat *sbuf, int ifd, cpu_to_le32((uint32_t)sizeof(struct zynqmp_header)); zynqhdr->image_size = cpu_to_le32(params->file_size - sizeof(struct zynqmp_header)); + zynqhdr->image_size = ROUND(zynqhdr->image_size, 4); zynqhdr->image_stored_size = zynqhdr->image_size; zynqhdr->image_load = 0xfffc0000; if (params->eflag) -- 1.9.1

2 3

[U-Boot] Proposed fastboot changes
by Douglas Zobel 16 Jan '19

16 Jan '19

I've made some changes to the fastboot handlers to meet my needs. If there is interest, I can prepare patches and submit them upstream. The changes are: BUGFIX: Currently the 'fastboot format [partition]' command (run from PC) formats the partition smaller than expected. Change getvar_partition_size() to return partition size in # of bytes instead of the current behavior of # of blocks. The 'fastboot format [partition]' command expect u-boot to return the size in number of bytes in order to format the partition correctly. Make the a fastboot oem command handler with a dynamic lookup like the base fastboot command handler currently is. This would allow easily adding new oem commands in the baseline software (such as below). It would also allow for board files to extend the oem handler to handle OEM specific cases. I would use a weakly defined default oem command handler (empty function) which a board file can optionally override to handle board specific commands. Currently the 'fastboot oem format' command (gpt write mmc # $partitions) is supported. I'd like to add a 'fastboot oem verify' (gpt verify mmc # $partitions) to help the flashing PC detect when a board needs to be re-formatted. -Doug -- This email and any attachments are for the exclusive use of the intended recipient(s) and may contain confidential and/or privileged information. Inadvertent disclosure of this message does not constitute a waiver of any privilege, right or remedy. If you are not the intended recipient, please do not directly or indirectly use, disclose or distribute this message, and please contact the sender and delete this email, any attachments and all copies. Climate and its affiliates may use, read or archive email communications (including attachments) through its computer network, as permitted by applicable law. Climate and its affiliates (or an external service provider) may also scan emails and attachments on its computer network to ensure systems operate efficiently and to minimize security risks. Thank you.

2 3

[U-Boot] [PATCH v2] adding saveenv-command for bananapi r2
by Frank Wunderlich 16 Jan '19

16 Jan '19

changes since v1: fixed bracket-style in if-else statement >From 47701fbea478ce09a5ef43d914261bf00eb50544 Mon Sep 17 00:00:00 2001 From: Frank Wunderlich <frank-w(a)public-files.de> Date: Mon, 3 Dec 2018 15:32:58 +0100 Subject: [PATCH] adding saveenv-command for bananapi r2 bananapi r2 can be booted from sd-card and emmc saving the environment have to choose the storage from which the device has booted also the offset is set to 1MB to make sure env is written to block "user data area" between uboot and first partition https://www.fw-web.de/dokuwiki/lib/exe/fetch.php?cache=&media=bpi-r2:boot-s… Signed-off-by: Frank Wunderlich <frank-w(a)public-files.de> --- board/mediatek/mt7623/mt7623_rfb.c | 19 +++++++++++++++++++ configs/mt7623n_bpir2_defconfig | 3 +++ include/configs/mt7623.h | 3 +++ 3 files changed, 25 insertions(+) diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c index 08468b50ea..4ec2764976 100644 --- a/board/mediatek/mt7623/mt7623_rfb.c +++ b/board/mediatek/mt7623/mt7623_rfb.c @@ -14,3 +14,22 @@ int board_init(void) return 0; } + +int mmc_get_boot_dev(void) +{ + int g_mmc_devid = -1; + char *uflag = (char *)0x81DFFFF0; + if (strncmp(uflag,"eMMC",4)==0) { + g_mmc_devid = 0; + printf("Boot From Emmc(id:%d)\n\n", g_mmc_devid); + } else { + g_mmc_devid = 1; + printf("Boot From SD(id:%d)\n\n", g_mmc_devid); + } + return g_mmc_devid; +} + +int mmc_get_env_dev(void) +{ + return mmc_get_boot_dev(); +} diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig index 3a4de72e23..640c881ce9 100644 --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig @@ -52,3 +52,6 @@ CONFIG_MTK_TIMER=y CONFIG_WDT_MTK=y CONFIG_LZMA=y # CONFIG_EFI_LOADER is not set + +#enables savenenv-command +CONFIG_ENV_IS_IN_MMC=y diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 68da920e30..91d6369dd2 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -53,4 +53,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ FDT_HIGH +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_ENV_OFFSET 0x100000 + #endif -- 2.17.1

2 3

[U-Boot] [PATCH 0/4] Add network support for Ocelots SoCs
by Gregory CLEMENT 16 Jan '19

16 Jan '19

Hello, this series allows to use the switch component of the Ocelots SoC as a network interface. The binding used is exactly the same of the one already used by Linux. There is also a patch adding a workaround needed on the Ocelot based boards: indeed the pin connected to the DDR reset is part of the switch subsystem. So we need ensure that the DDR is not reset during the switch reset. Gregory Gregory CLEMENT (4): MIPS: mscc: ocelot: Add ethernet nodes for Ocelot net: add MSCC Ocelot switch support MIPS: mscc: ocelot: add switch reset support configs: mscc_ocelot: add network support MAINTAINERS | 1 + arch/mips/dts/mscc,ocelot.dtsi | 97 ++++ arch/mips/dts/ocelot_pcb123.dts | 20 + board/mscc/ocelot/ocelot.c | 28 ++ configs/mscc_ocelot_defconfig | 1 + drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/ocelot_switch.c | 837 ++++++++++++++++++++++++++++++++ 8 files changed, 992 insertions(+) create mode 100644 drivers/net/ocelot_switch.c -- 2.20.1

2 5

[U-Boot] [PATCH] common: Break USB_STORAGE dependency between SPL and u-boot proper
by Abel Vesa 16 Jan '19

16 Jan '19

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL. Signed-off-by: Abel Vesa <abel.vesa(a)nxp.com> --- common/Makefile | 2 +- configs/apalis_imx6_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + drivers/usb/Kconfig | 8 ++++++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/common/Makefile b/common/Makefile index 0de60b3..34931f3 100644 --- a/common/Makefile +++ b/common/Makefile @@ -77,7 +77,7 @@ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o ifdef CONFIG_SPL_USB_HOST_SUPPORT obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o -obj-$(CONFIG_USB_STORAGE) += usb_storage.o +obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o else obj-$(CONFIG_USB_MUSB_HOST) += usb.o endif diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index e02d9bc..c4916ad 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Apalis iMX6 # " CONFIG_CMD_BOOTZ=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 68f0746..441a4e7 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Colibri iMX6 # " CONFIG_CMD_BOOTZ=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 1857c18..3532fce 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 3b53bf2..4185e16 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -89,6 +89,14 @@ config USB_STORAGE Say Y here if you want to connect USB mass storage devices to your board's USB port. +config SPL_USB_STORAGE + bool "SPL USB Mass Storage support" + depends on !(SPL_BLK && !SPL_DM_USB) + ---help--- + Say Y here if you want to connect USB mass storage devices to your + board's USB port in SPL. + + config USB_KEYBOARD bool "USB Keyboard support" select SYS_STDIO_DEREGISTER -- 2.7.4

4 9

[U-Boot] [PATCH v2] kbuild: fix parallel build race caused by u-boot.cfg regeneration
by Masahiro Yamada 16 Jan '19

16 Jan '19

Multiple people have reported intermittent build failure in parallel building. Kever Yang reported this issue some time ago [1], but I could not get enough clue at that time. This time, Richard Purdie provided a full build log [2], which was very helpful for me to root-cause it. The cause of the problem is commit 0d982c585330 ("Makefile: add dependencies to regenerate u-boot.cfg when lost"). That commit added the 'cfg' as the prerequisite of the 'all' target, so the parallel build tries to run it simultaneously, then regenerates a symlink while building objects. When u-boot.cfg is accidentally lost, let's rebuild it before descending into any subdirectories. Also, what is annoying is u-boot.cfg is currently regenerated every time since it depends on FORCE. We can get rid of all the prerequisites of u-boot.cfg because u-boot.cfg is rebuilt anyway as the byproduct of auto.conf when a user updates the .config file. [1] https://lists.denx.de/pipermail/u-boot/2018-June/330341.html [2] https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/160/steps… Fixes: 0d982c585330 ("Makefile: add dependencies to regenerate u-boot.cfg when lost") Reported-by: Kever Yang <kever.yang(a)rock-chips.com> Reported-by: Richard Purdie <richard.purdie(a)linuxfoundation.org> Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Move 'cfg' before 'prepare0' to avoid a race between them Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index eeb299f..c6eb727 100644 --- a/Makefile +++ b/Makefile @@ -534,7 +534,7 @@ include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd @# Otherwise, 'make silentoldconfig' would be invoked twice. $(Q)touch include/config/auto.conf -u-boot.cfg spl/u-boot.cfg tpl/u-boot.cfg: include/config.h FORCE +u-boot.cfg spl/u-boot.cfg tpl/u-boot.cfg: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.autoconf $(@) -include include/autoconf.mk @@ -910,7 +910,7 @@ quiet_cmd_cfgcheck = CFGCHK $2 cmd_cfgcheck = $(srctree)/scripts/check-config.sh $2 \ $(srctree)/scripts/config_whitelist.txt $(srctree) -all: $(ALL-y) cfg +all: $(ALL-y) ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y) @echo >&2 "===================== WARNING ======================" @echo >&2 "This board uses CONFIG_DM_I2C_COMPAT. Please remove" @@ -1530,7 +1530,7 @@ ifneq ($(KBUILD_SRC),) endif # prepare2 creates a makefile if using a separate output directory -prepare2: prepare3 outputmakefile +prepare2: prepare3 outputmakefile cfg prepare1: prepare2 $(version_h) $(timestamp_h) \ include/config/auto.conf -- 2.7.4

2 1