diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Makefile | 11 | ||||
| -rw-r--r-- | cmd/eficonfig.c | 2 | ||||
| -rw-r--r-- | cmd/fat.c | 2 | ||||
| -rw-r--r-- | cmd/riscv/sbi.c | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/cmd/Makefile b/cmd/Makefile index b4668eb73e5..d1f369deec0 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -127,13 +127,10 @@ obj-y += legacy-mtd-utils.o endif obj-$(CONFIG_CMD_MUX) += mux.o obj-$(CONFIG_CMD_NAND) += nand.o -ifdef CONFIG_CMD_NET -obj-$(CONFIG_NET) += net.o -obj-$(CONFIG_NET_LWIP) += net-lwip.o -obj-$(filter y,$(CONFIG_CMD_NET) $(CONFIG_CMD_NET_LWIP)) += net-common.o -lwip-includes := -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot -CFLAGS_net-lwip.o := $(lwip-includes) -CFLAGS_net-common.o := $(lwip-includes) +ifdef CONFIG_NET +obj-$(CONFIG_CMD_NET) += net.o net-common.o +else ifdef CONFIG_NET_LWIP +obj-$(CONFIG_CMD_NET) += net-lwip.o net-common.o endif obj-$(CONFIG_ENV_SUPPORT) += nvedit.o obj-$(CONFIG_CMD_NVEDIT_EFI) += nvedit_efi.o diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index bea09e4ecc7..029180250f0 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -963,7 +963,7 @@ static efi_status_t eficonfig_boot_add_enter_description(void *data) return handle_user_input(bo->description, EFICONFIG_DESCRIPTION_MAX, 22, "\n ** Edit Description **\n" "\n" - " enter description: "); + " Enter description: "); } /** diff --git a/cmd/fat.c b/cmd/fat.c index 1655e80e945..5b7484dc1af 100644 --- a/cmd/fat.c +++ b/cmd/fat.c @@ -14,7 +14,7 @@ #include <part.h> #include <asm/cache.h> -int do_fat_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +static int do_fat_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { return do_size(cmdtp, flag, argc, argv, FS_TYPE_FAT); } diff --git a/cmd/riscv/sbi.c b/cmd/riscv/sbi.c index a231604e492..5ecf56781c1 100644 --- a/cmd/riscv/sbi.c +++ b/cmd/riscv/sbi.c @@ -54,8 +54,10 @@ static struct sbi_ext extensions[] = { { SBI_EXT_CPPC, "Collaborative Processor Performance Control Extension" }, { SBI_EXT_NACL, "Nested Acceleration Extension" }, { SBI_EXT_STA, "Steal-time Accounting Extension" }, - { SBI_EXT_DBTR, "Debug Trigger Extension" }, { SBI_EXT_SSE, "Supervisor Software Events" }, + { SBI_EXT_FWFT, "Firmware Features Extension" }, + { SBI_EXT_DBTR, "Debug Triggers Extension" }, + { SBI_EXT_MPXY, "Message Proxy Extension" }, }; static int do_sbi(struct cmd_tbl *cmdtp, int flag, int argc, |