arm: mvebu: Espressobin: Add NVMe to boot targets
PATCH 1/1 arm: mvebu: Espressobin: Add NVMe to boot targets
NVMe support is already enabled, so add it into boot targets.
--- include/configs/mvebu_armada-37xx.h | 1 + 1 file changed, 1 insertion(+)
include/configs/mvebu_armada-37xx.h +1 -0
@@ -50,6 +50,7 @@ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ + func(NVME, nvme, 0) \ func(SCSI, scsi, 0) \ func(PXE, pxe, na) \func (DHCP , dhcp, na)
Signature · 1 line
2.20.1
Quoted 3 lines · Pali Rohár
NVMe support is already enabled, so add it into boot targets.
Signed-off-by Pali Rohár <[email protected]>
Thanks,
Stefan
Quoted 9 lines
--- include/configs/mvebu_armada-37xx.h | 1 + 1 file changed, 1 insertion(+)include/configs/mvebu_armada-37xx.h +0
-0
include/configs/mvebu_armada-37xx.h line 56
Quoted 7 lines
include/configs/mvebu_armada-37xx.h +1
-0@@ -50,6 +50,7 @@ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ + func(NVME, nvme, 0) \ func(SCSI, scsi, 0) \ func(PXE, pxe, na) \func (DHCP , dhcp, na)
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Hi Pali,
Quoted 12 lines · Pali Rohár
NVMe support is already enabled, so add it into boot targets.
Signed-off-by Pali Rohár <[email protected]>--- include/configs/mvebu_armada-37xx.h | 1 + 1 file changed, 1 insertion(+)include/configs/mvebu_armada-37xx.h +0
-0
include/configs/mvebu_armada-37xx.h line 56
Quoted 7 lines
include/configs/mvebu_armada-37xx.h +1
-0@@ -50,6 +50,7 @@ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ + func(NVME, nvme, 0) \ func(SCSI, scsi, 0) \ func(PXE, pxe, na) \func (DHCP , dhcp, na)
This patch generates build issues. E.g. on mvebu_db-88f3720_defconfig and most likely other platforms as well:
$ make -s -j20
In file included from include/configs/mvebu_armada-37xx.h:60,
from include/config.h:4,
from include/common.h:16,
from env/common.c:10:
include/config_distro_bootcmd.h:215:9: error: expected '}' before 'BOOT_TARGET_DEVICES_references_NVME_without_CONFIG_NVME'
215 | BOOT_TARGET_DEVICES_references_NVME_without_CONFIG_NVME
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/config_distro_bootcmd.h:215:9: note: in definition of macro 'BOOTENV_DEV_NAME_NVME'
215 | BOOT_TARGET_DEVICES_references_NVME_without_CONFIG_NVME
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/configs/mvebu_armada-37xx.h:55:9: note: in expansion of macro 'BOOTENV_DEV_NAME'
55 | func(NVME, nvme, 0) \
| ^~~~
include/config_distro_bootcmd.h:417:25: note: in expansion of macro 'BOOT_TARGET_DEVICES'
417 | "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
| ^~~~~~~~~~~~~~~~~~~
include/config_distro_bootcmd.h:436:9: note: in expansion of macro 'BOOTENV_BOOT_TARGETS'
436 | BOOTENV_BOOT_TARGETS \
| ^~~~~~~~~~~~~~~~~~~~
include/configs/mvebu_armada-37xx.h:80:9: note: in expansion of macro 'BOOTENV'
80 | BOOTENV \
| ^~~~~~~
include/env_default.h:119:9: note: in expansion of macro 'CONFIG_EXTRA_ENV_SETTINGS'
119 | CONFIG_EXTRA_ENV_SETTINGS
| ^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from env/common.c:32:
include/env_default.h:27:30: note: to match this '{'
27 | char default_environment[] = {
| ^
make[1]: *** [scripts/Makefile.build:257: env/common.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1906: env] Error 2
make: *** Waiting for unfinished jobs....Please check and resubmit once it builds "world" without problems.
Thanks,
Stefan
Quoted 10 lines · On Monday 16 May 2022 11:30:54 Stefan Roese wrote:
Hi Pali,
Quoted 7 lines · Pali Rohár
NVMe support is already enabled, so add it into boot targets.
Signed-off-by Pali Rohár <[email protected]>--- include/configs/mvebu_armada-37xx.h | 1 + 1 file changed, 1 insertion(+)
Quoted 15 lines
include/configs/mvebu_armada-37xx.h line 56
Quoted 12 lines
include/configs/mvebu_armada-37xx.h +1
-0@@ -50,6 +50,7 @@ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ + func(NVME, nvme, 0) \ func(SCSI, scsi, 0) \ func(PXE, pxe, na) \func (DHCP , dhcp, na)This patch generates build issues. E.g. on mvebu_db-88f3720_defconfig and most likely other platforms as well:
I see. This file is used by more A3720 boards and therefore it needs different approach to enable NVMe support in distroboot.
Here is a new patch series which do it:
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
Quoted 46 lines
$ make -s -j20 In file included from include/configs/mvebu_armada-37xx.h:60, from include/config.h:4, from include/common.h:16, from env/common.c:10: include/config_distro_bootcmd.h:215:9: error: expected '}' before 'BOOT_TARGET_DEVICES_references_NVME_without_CONFIG_NVME' 215 | BOOT_TARGET_DEVICES_references_NVME_without_CONFIG_NVME | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/config_distro_bootcmd.h:215:9: note: in definition of macro 'BOOTENV_DEV_NAME_NVME' 215 | BOOT_TARGET_DEVICES_references_NVME_without_CONFIG_NVME | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/configs/mvebu_armada-37xx.h:55:9: note: in expansion of macro 'BOOTENV_DEV_NAME' 55 | func(NVME, nvme, 0) \ | ^~~~ include/config_distro_bootcmd.h:417:25: note: in expansion of macro 'BOOT_TARGET_DEVICES' 417 | "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0" | ^~~~~~~~~~~~~~~~~~~ include/config_distro_bootcmd.h:436:9: note: in expansion of macro 'BOOTENV_BOOT_TARGETS' 436 | BOOTENV_BOOT_TARGETS \ | ^~~~~~~~~~~~~~~~~~~~ include/configs/mvebu_armada-37xx.h:80:9: note: in expansion of macro 'BOOTENV' 80 | BOOTENV \ | ^~~~~~~ include/env_default.h:119:9: note: in expansion of macro 'CONFIG_EXTRA_ENV_SETTINGS' 119 | CONFIG_EXTRA_ENV_SETTINGS | ^~~~~~~~~~~~~~~~~~~~~~~~~ In file included from env/common.c:32: include/env_default.h:27:30: note: to match this '{' 27 | char default_environment[] = { | ^ make[1]: *** [scripts/Makefile.build:257: env/common.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1906: env] Error 2 make: *** Waiting for unfinished jobs....Please check and resubmit once it builds "world" without problems.
Thanks,
Stefan