On Tue, Apr 21, 2020 at 01:54:04PM +0530, Jagan Teki wrote: > Hi Tom, > > Please pull this PR. > > thanks, > Jagan. > > The following changes since commit 8d5d3bcf3c53d798bd7f3fe7092e994593bcc41c: > > Merge branch '2020-04-16-master-imports' (2020-04-17 11:17:29 -0400) > > are available in the Git repository at: > > https://gitlab.denx.de/u-boot/custodians/u-boot-spi master > > for you to fetch changes up to 48465bbc84d2f3824641b7627f417e36f515c896: > > mtd: spi-nor-ids: Add Spansion s25fs512s flash entry (2020-04-20 23:55:06 > +0530) >
NAK, a handful of boards fail like this:
+(firefly-px30) In file included from include/configs/px30_common.h:52,
+(firefly-px30) from include/configs/evb_px30.h:9,
+(firefly-px30) from include/config.h:5,
+(firefly-px30) from include/common.h:16,
+(firefly-px30) from env/common.c:10:
+(firefly-px30) include/config_distro_bootcmd.h:402:2: error: expected '}'
before 'BOOTENV_DEV_NAME_SF'
+(firefly-px30) 402 | BOOTENV_DEV_NAME_##devtypeu(devtypeu, devtypel,
instance)
+(firefly-px30) | ^~~~~~~~~~~~~~~~~
+(firefly-px30) include/configs/rockchip-common.h:45:31: note: in expansion of
macro 'BOOTENV_DEV_NAME'
+(firefly-px30) 45 | #define BOOT_TARGET_SF(func) func(SF, sf, 0)
+(firefly-px30) | ^~~~
+(firefly-px30) include/configs/rockchip-common.h:55:2: note: in expansion of
macro 'BOOT_TARGET_SF'
+(firefly-px30) 55 | BOOT_TARGET_SF(func)
+(firefly-px30) | ^~~~~~~~~~~~~~
+(firefly-px30) include/config_distro_bootcmd.h:404:18: note: in expansion of
macro 'BOOT_TARGET_DEVICES'
+(firefly-px30) 404 | "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME)
"\0"
+(firefly-px30) | ^~~~~~~~~~~~~~~~~~~
+(firefly-px30) include/config_distro_bootcmd.h:423:2: note: in expansion of
macro 'BOOTENV_BOOT_TARGETS'
+(firefly-px30) 423 | BOOTENV_BOOT_TARGETS \
+(firefly-px30) | ^~~~~~~~~~~~~~~~~~~~
+(firefly-px30) include/configs/px30_common.h:58:2: note: in expansion of macro
'BOOTENV'
+(firefly-px30) 58 | BOOTENV
+(firefly-px30) | ^~~~~~~
+(firefly-px30) include/env_default.h:111:2: note: in expansion of macro
'CONFIG_EXTRA_ENV_SETTINGS'
+(firefly-px30) 111 | CONFIG_EXTRA_ENV_SETTINGS
+(firefly-px30) | ^~~~~~~~~~~~~~~~~~~~~~~~~
+(firefly-px30) In file included from env/common.c:26:
+(firefly-px30) include/env_default.h:22:37: note: to match this '{'
+(firefly-px30) 22 | const uchar default_environment[] = {
+(firefly-px30) | ^
+(firefly-px30) make[2]: *** [env/common.o] Error 1
+(firefly-px30) make[1]: *** [env] Error 2
+(firefly-px30) make: *** [sub-make] Error 2
See https://gitlab.denx.de/u-boot/u-boot/-/jobs/80958 and
https://gitlab.denx.de/u-boot/u-boot/-/jobs/80910
--
Tom
signature.asc
Description: PGP signature
