diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/atsha204a-i2c.h | 2 | ||||
| -rw-r--r-- | include/btrfs.h | 2 | ||||
| -rw-r--r-- | include/configs/mvebu_armada-37xx.h | 49 | ||||
| -rw-r--r-- | include/configs/turris_mox.h | 2 | ||||
| -rw-r--r-- | include/configs/turris_omnia.h | 2 | ||||
| -rw-r--r-- | include/fs_internal.h | 2 | ||||
| -rw-r--r-- | include/u-boot/variadic-macro.h | 2 |
7 files changed, 49 insertions, 12 deletions
diff --git a/include/atsha204a-i2c.h b/include/atsha204a-i2c.h index 39fc0e9ca72..c35f5992e2f 100644 --- a/include/atsha204a-i2c.h +++ b/include/atsha204a-i2c.h @@ -3,7 +3,7 @@ * * Copyright (C) 2014 Josh Datko, Cryptotronix, jbd@cryptotronix.com * 2016 Tomas Hlavacek, CZ.NIC, tmshlvck@gmail.com - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff --git a/include/btrfs.h b/include/btrfs.h index a7605e15897..2d73add18e0 100644 --- a/include/btrfs.h +++ b/include/btrfs.h @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #ifndef __U_BOOT_BTRFS_H__ diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 51f7e16ece1..6d3cb99b2df 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -32,13 +32,50 @@ */ #define DEFAULT_ENV_IS_RW /* required for configuring default fdtfile= */ +#ifdef CONFIG_MMC +#define BOOT_TARGET_DEVICES_MMC(func, i) func(MMC, mmc, i) +#else +#define BOOT_TARGET_DEVICES_MMC(func, i) +#endif + +#ifdef CONFIG_USB_STORAGE +#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) +#else +#define BOOT_TARGET_DEVICES_USB(func) +#endif + +#ifdef CONFIG_SCSI +#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) +#else +#define BOOT_TARGET_DEVICES_SCSI(func) +#endif + +#ifdef CONFIG_NVME +#define BOOT_TARGET_DEVICES_NVME(func) func(NVME, nvme, 0) +#else +#define BOOT_TARGET_DEVICES_NVME(func) +#endif + +#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE) +#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na) +#else +#define BOOT_TARGET_DEVICES_PXE(func) +#endif + +#ifdef CONFIG_CMD_DHCP +#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na) +#else +#define BOOT_TARGET_DEVICES_DHCP(func) +#endif + #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 0) \ - func(USB, usb, 0) \ - func(SCSI, scsi, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_DEVICES_MMC(func, 1) \ + BOOT_TARGET_DEVICES_MMC(func, 0) \ + BOOT_TARGET_DEVICES_USB(func) \ + BOOT_TARGET_DEVICES_NVME(func) \ + BOOT_TARGET_DEVICES_SCSI(func) \ + BOOT_TARGET_DEVICES_PXE(func) \ + BOOT_TARGET_DEVICES_DHCP(func) #include <config_distro_bootcmd.h> diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 401627a47a2..b8ff705ac92 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2018 Marek Behún <kabel@kernel.org> * * Based on mvebu_armada-37xx.h by Stefan Roese <sr@denx.de> */ diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 9013d9a6932..52de4cdc789 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (C) 2017 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2017 Marek Behún <kabel@kernel.org> * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek@nic.cz> */ diff --git a/include/fs_internal.h b/include/fs_internal.h index 3d4d25da960..07f6bc5ea40 100644 --- a/include/fs_internal.h +++ b/include/fs_internal.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * 2017 by Marek Behun <marek.behun@nic.cz> + * 2017 by Marek Behún <kabel@kernel.org> * * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c */ diff --git a/include/u-boot/variadic-macro.h b/include/u-boot/variadic-macro.h index cb815d0fee6..c5fa1b80e38 100644 --- a/include/u-boot/variadic-macro.h +++ b/include/u-boot/variadic-macro.h @@ -2,7 +2,7 @@ /* * Helper for work with variadic macros * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #ifndef __VARIADIC_MACRO_H__ |