diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 25 | ||||
| -rw-r--r-- | cmd/acpi.c | 59 | ||||
| -rw-r--r-- | cmd/blkmap.c | 9 | ||||
| -rw-r--r-- | cmd/bootflow.c | 10 | ||||
| -rw-r--r-- | cmd/fs.c | 28 | ||||
| -rw-r--r-- | cmd/fuse.c | 63 | ||||
| -rw-r--r-- | cmd/net-lwip.c | 2 | ||||
| -rw-r--r-- | cmd/net.c | 92 | ||||
| -rw-r--r-- | cmd/version.c | 1 | ||||
| -rw-r--r-- | cmd/x86/mtrr.c | 11 | ||||
| -rw-r--r-- | cmd/x86/zboot.c | 33 |
11 files changed, 192 insertions, 141 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index cd391d422ae..ecef664fcea 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1236,6 +1236,14 @@ config CMD_FUSE which control the behaviour of the device. The command uses the fuse_...() API. +config CMD_FUSE_WRITEBUFF + bool "Support for the fuse writebuff" + depends on CMD_FUSE + help + This allows programming fuses, which control the behaviour of + the device, using a structured buffer in memory. The command + uses the fuse_writebuff() API. + config CMD_GPIO bool "gpio" help @@ -1834,12 +1842,10 @@ menuconfig CMD_NET bool "Network commands" default y -endif +if CMD_NET if NET -if CMD_NET - config CMD_BOOTP bool "bootp" default y @@ -2062,7 +2068,7 @@ config CMD_SNTP config CMD_LINK_LOCAL bool "linklocal" - select LIB_RAND + depends on (LIB_RAND || LIB_HW_RAND) help Acquire a network IP address using the link-local protocol @@ -2080,7 +2086,6 @@ config IPV6_ROUTER_DISCOVERY help Will automatically perform router solicitation on first IPv6 network operation -endif # if CMD_NET config CMD_ETHSW bool "ethsw" @@ -2097,10 +2102,6 @@ config CMD_WOL endif # if NET -if NET || NET_LWIP - -if CMD_NET - config CMD_DHCP bool "dhcp" select PROT_DHCP_LWIP if NET_LWIP @@ -2198,8 +2199,6 @@ config WGET_BUILTIN_CACERT_PATH Certification Authority certificates, a.k.a. root certificates, for the purpose of authenticating HTTPS connections. -endif # if CMD_NET - config CMD_PXE bool "pxe" select PXE_UTILS @@ -2207,7 +2206,9 @@ config CMD_PXE help Boot image via network using PXE protocol -endif # if NET || NET_LWIP +endif # if CMD_NET + +endif # NET || NET_LWIP menu "Misc commands" diff --git a/cmd/acpi.c b/cmd/acpi.c index 094d9d4e858..bb243202009 100644 --- a/cmd/acpi.c +++ b/cmd/acpi.c @@ -7,6 +7,7 @@ #include <display_options.h> #include <log.h> #include <mapmem.h> +#include <tables_csum.h> #include <acpi/acpi_table.h> #include <asm/acpi_table.h> #include <asm/global_data.h> @@ -15,6 +16,17 @@ DECLARE_GLOBAL_DATA_PTR; +static const char *show_checksum(void *ptr, uint size, bool chksums) +{ + uint checksum; + + if (!chksums) + return ""; + checksum = table_compute_checksum(ptr, size); + + return checksum ? " bad" : " OK"; +} + /** * dump_hdr() - Dump an ACPI header * @@ -23,16 +35,17 @@ DECLARE_GLOBAL_DATA_PTR; * * @hdr: ACPI header to dump */ -static void dump_hdr(struct acpi_table_header *hdr) +static void dump_hdr(struct acpi_table_header *hdr, bool chksums) { bool has_hdr = memcmp(hdr->signature, "FACS", ACPI_NAME_LEN); printf("%.*s %16lx %5x", ACPI_NAME_LEN, hdr->signature, (ulong)map_to_sysmem(hdr), hdr->length); if (has_hdr) { - printf(" v%02d %.6s %.8s %x %.4s %x\n", hdr->revision, + printf(" v%02d %.6s %.8s %x %.4s %x%s\n", hdr->revision, hdr->oem_id, hdr->oem_table_id, hdr->oem_revision, - hdr->creator_id, hdr->creator_revision); + hdr->creator_id, hdr->creator_revision, + show_checksum(hdr, hdr->length, chksums)); } else { printf("\n"); } @@ -52,22 +65,22 @@ static int dump_table_name(const char *sig) return 0; } -static void list_fadt(struct acpi_fadt *fadt) +static void list_fadt(struct acpi_fadt *fadt, bool chksums) { if (fadt->header.revision >= 3 && fadt->x_dsdt) - dump_hdr(nomap_sysmem(fadt->x_dsdt, 0)); + dump_hdr(nomap_sysmem(fadt->x_dsdt, 0), chksums); else if (fadt->dsdt) - dump_hdr(nomap_sysmem(fadt->dsdt, 0)); - if (!IS_ENABLED(CONFIG_X86) && + dump_hdr(nomap_sysmem(fadt->dsdt, 0), chksums); + if (!IS_ENABLED(CONFIG_X86) && !IS_ENABLED(CONFIG_SANDBOX) && !(fadt->flags & ACPI_FADT_HW_REDUCED_ACPI)) log_err("FADT not ACPI-hardware-reduced-compliant\n"); if (fadt->header.revision >= 3 && fadt->x_firmware_ctrl) - dump_hdr(nomap_sysmem(fadt->x_firmware_ctrl, 0)); + dump_hdr(nomap_sysmem(fadt->x_firmware_ctrl, 0), chksums); else if (fadt->firmware_ctrl) - dump_hdr(nomap_sysmem(fadt->firmware_ctrl, 0)); + dump_hdr(nomap_sysmem(fadt->firmware_ctrl, 0), chksums); } -static void list_rsdt(struct acpi_rsdp *rsdp) +static void list_rsdt(struct acpi_rsdp *rsdp, bool chksums) { int len, i, count; struct acpi_rsdt *rsdt; @@ -75,11 +88,11 @@ static void list_rsdt(struct acpi_rsdp *rsdp) if (rsdp->rsdt_address) { rsdt = nomap_sysmem(rsdp->rsdt_address, 0); - dump_hdr(&rsdt->header); + dump_hdr(&rsdt->header, chksums); } if (rsdp->xsdt_address) { xsdt = nomap_sysmem(rsdp->xsdt_address, 0); - dump_hdr(&xsdt->header); + dump_hdr(&xsdt->header, chksums); len = xsdt->header.length - sizeof(xsdt->header); count = len / sizeof(u64); } else if (rsdp->rsdt_address) { @@ -100,24 +113,28 @@ static void list_rsdt(struct acpi_rsdp *rsdp) if (!entry) break; hdr = nomap_sysmem(entry, 0); - dump_hdr(hdr); + dump_hdr(hdr, chksums); if (!memcmp(hdr->signature, "FACP", ACPI_NAME_LEN)) - list_fadt((struct acpi_fadt *)hdr); + list_fadt((struct acpi_fadt *)hdr, chksums); } } -static void list_rsdp(struct acpi_rsdp *rsdp) +static void list_rsdp(struct acpi_rsdp *rsdp, bool chksums) { - printf("RSDP %16lx %5x v%02d %.6s\n", (ulong)map_to_sysmem(rsdp), - rsdp->length, rsdp->revision, rsdp->oem_id); - list_rsdt(rsdp); + printf("RSDP %16lx %5x v%02d %.6s%s%s\n", + (ulong)map_to_sysmem(rsdp), rsdp->length, rsdp->revision, + rsdp->oem_id, show_checksum(rsdp, 0x14, chksums), + show_checksum(rsdp, rsdp->length, chksums)); + list_rsdt(rsdp, chksums); } static int do_acpi_list(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct acpi_rsdp *rsdp; + bool chksums; + chksums = argc >= 2 && !strcmp("-c", argv[1]); rsdp = map_sysmem(gd_acpi_start(), 0); if (!rsdp) { printf("No ACPI tables present\n"); @@ -125,7 +142,7 @@ static int do_acpi_list(struct cmd_tbl *cmdtp, int flag, int argc, } printf("Name Base Size Detail\n" "---- ---------------- ----- ----------------------------\n"); - list_rsdp(rsdp); + list_rsdp(rsdp, chksums); return 0; } @@ -187,13 +204,13 @@ static int do_acpi_dump(struct cmd_tbl *cmdtp, int flag, int argc, } U_BOOT_LONGHELP(acpi, - "list - list ACPI tables\n" + "list [-c] - list ACPI tables [check checksums]\n" "acpi items [-d] - List/dump each piece of ACPI data from devices\n" "acpi set [<addr>] - Set or show address of ACPI tables\n" "acpi dump <name> - Dump ACPI table"); U_BOOT_CMD_WITH_SUBCMDS(acpi, "ACPI tables", acpi_help_text, - U_BOOT_SUBCMD_MKENT(list, 1, 1, do_acpi_list), + U_BOOT_SUBCMD_MKENT(list, 2, 1, do_acpi_list), U_BOOT_SUBCMD_MKENT(items, 2, 1, do_acpi_items), U_BOOT_SUBCMD_MKENT(set, 2, 1, do_acpi_set), U_BOOT_SUBCMD_MKENT(dump, 2, 1, do_acpi_dump)); diff --git a/cmd/blkmap.c b/cmd/blkmap.c index 164f80f1387..86a123b1cd3 100644 --- a/cmd/blkmap.c +++ b/cmd/blkmap.c @@ -62,13 +62,18 @@ static int do_blkmap_map_mem(struct map_ctx *ctx, int argc, char *const argv[]) { phys_addr_t addr; int err; + bool preserve = false; if (argc < 2) return CMD_RET_USAGE; addr = hextoul(argv[1], NULL); - err = blkmap_map_pmem(ctx->dev, ctx->blknr, ctx->blkcnt, addr); + if (argc == 3 && !strcmp(argv[2], "preserve")) + preserve = true; + + err = blkmap_map_pmem(ctx->dev, ctx->blknr, ctx->blkcnt, addr, + preserve); if (err) { printf("Unable to map %#llx at block 0x" LBAF ": %d\n", (unsigned long long)addr, ctx->blknr, err); @@ -221,7 +226,7 @@ U_BOOT_CMD_WITH_SUBCMDS( "blkmap create <label> - create device\n" "blkmap destroy <label> - destroy device\n" "blkmap map <label> <blk#> <cnt> linear <interface> <dev> <blk#> - device mapping\n" - "blkmap map <label> <blk#> <cnt> mem <addr> - memory mapping\n", + "blkmap map <label> <blk#> <cnt> mem <addr> [preserve] - memory mapping\n", U_BOOT_SUBCMD_MKENT(info, 2, 1, do_blkmap_common), U_BOOT_SUBCMD_MKENT(part, 2, 1, do_blkmap_common), U_BOOT_SUBCMD_MKENT(dev, 4, 1, do_blkmap_common), diff --git a/cmd/bootflow.c b/cmd/bootflow.c index 6d0be320bdb..a1fd59a69f4 100644 --- a/cmd/bootflow.c +++ b/cmd/bootflow.c @@ -173,7 +173,7 @@ static int do_bootflow_scan(struct cmd_tbl *cmdtp, int flag, int argc, std->cur_bootflow = NULL; - flags = 0; + flags = BOOTFLOWIF_ONLY_BOOTABLE; if (list) flags |= BOOTFLOWIF_SHOW; if (all) @@ -380,13 +380,7 @@ static int do_bootflow_info(struct cmd_tbl *cmdtp, int flag, int argc, bflow = std->cur_bootflow; if (IS_ENABLED(CONFIG_X86) && x86_setup) { - struct bootm_info bmi; - - bootm_init(&bmi); - /* we don't know this at present */ - bootm_x86_set(&bmi, bzimage_addr, 0); - bootm_x86_set(&bmi, base_ptr, bflow->x86_setup); - zimage_dump(&bmi, false); + zimage_dump(bflow->x86_setup, false); return 0; } @@ -85,6 +85,34 @@ U_BOOT_CMD( " device type 'interface' instance 'dev'." ); +static int do_mkdir_wrapper(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + return do_mkdir(cmdtp, flag, argc, argv, FS_TYPE_ANY); +} + +U_BOOT_CMD( + mkdir, 4, 1, do_mkdir_wrapper, + "create a directory", + "<interface> [<dev[:part]>] <directory>\n" + " - Create a directory 'directory' of partition 'part' on\n" + " device type 'interface' instance 'dev'." +); + +static int do_rm_wrapper(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + return do_rm(cmdtp, flag, argc, argv, FS_TYPE_ANY); +} + +U_BOOT_CMD( + rm, 4, 1, do_rm_wrapper, + "delete a file", + "<interface> [<dev[:part]>] <filename>\n" + " - delete a file with the name 'filename' on\n" + " device type 'interface' instance 'dev'." +); + static int do_fstype_wrapper(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { diff --git a/cmd/fuse.c b/cmd/fuse.c index 598ef496a43..6c42c096809 100644 --- a/cmd/fuse.c +++ b/cmd/fuse.c @@ -15,17 +15,6 @@ #include <vsprintf.h> #include <linux/errno.h> -static int strtou32(const char *str, unsigned int base, u32 *result) -{ - char *ep; - - *result = simple_strtoul(str, &ep, base); - if (ep == str || *ep != '\0') - return -EINVAL; - - return 0; -} - static int confirm_prog(void) { puts("Warning: Programming fuses is an irreversible operation!\n" @@ -54,14 +43,25 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc, argc -= 2 + confirmed; argv += 2 + confirmed; - if (argc < 2 || strtou32(argv[0], 0, &bank) || - strtou32(argv[1], 0, &word)) - return CMD_RET_USAGE; + if (IS_ENABLED(CONFIG_CMD_FUSE_WRITEBUFF) && !strcmp(op, "writebuff")) { + if (argc == 1) + addr = simple_strtoul(argv[0], NULL, 16); + else + return CMD_RET_USAGE; + } else { + if (argc < 2) + return CMD_RET_USAGE; + + bank = simple_strtoul(argv[0], NULL, 0); + word = simple_strtoul(argv[1], NULL, 0); + } if (!strcmp(op, "read")) { if (argc == 2) cnt = 1; - else if (argc != 3 || strtou32(argv[2], 0, &cnt)) + else if (argc == 3) + cnt = simple_strtoul(argv[2], NULL, 0); + else return CMD_RET_USAGE; printf("Reading bank %u:\n", bank); @@ -79,7 +79,9 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc, } else if (!strcmp(op, "readm")) { if (argc == 3) cnt = 1; - else if (argc != 4 || strtou32(argv[3], 0, &cnt)) + else if (argc == 4) + cnt = simple_strtoul(argv[3], NULL, 0); + else return CMD_RET_USAGE; addr = simple_strtoul(argv[2], NULL, 16); @@ -99,7 +101,9 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc, unmap_sysmem(start); } else if (!strcmp(op, "cmp")) { - if (argc != 3 || strtou32(argv[2], 0, &cmp)) + if (argc == 3) + cmp = simple_strtoul(argv[2], NULL, 0); + else return CMD_RET_USAGE; printf("Comparing bank %u:\n", bank); @@ -119,7 +123,9 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc, } else if (!strcmp(op, "sense")) { if (argc == 2) cnt = 1; - else if (argc != 3 || strtou32(argv[2], 0, &cnt)) + else if (argc == 3) + cnt = simple_strtoul(argv[2], NULL, 0); + else return CMD_RET_USAGE; printf("Sensing bank %u:\n", bank); @@ -139,8 +145,7 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_USAGE; for (i = 2; i < argc; i++, word++) { - if (strtou32(argv[i], 16, &val)) - return CMD_RET_USAGE; + val = simple_strtoul(argv[i], NULL, 16); printf("Programming bank %u word 0x%.8x to 0x%.8x...\n", bank, word, val); @@ -155,8 +160,7 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_USAGE; for (i = 2; i < argc; i++, word++) { - if (strtou32(argv[i], 16, &val)) - return CMD_RET_USAGE; + val = simple_strtoul(argv[i], NULL, 16); printf("Overriding bank %u word 0x%.8x with " "0x%.8x...\n", bank, word, val); @@ -164,6 +168,15 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc, if (ret) goto err; } + } else if (IS_ENABLED(CONFIG_CMD_FUSE_WRITEBUFF) && !strcmp(op, "writebuff")) { + printf("Programming fuses using a structured buffer in memory " + "starting at addr 0x%lx\n", addr); + if (!confirmed && !confirm_prog()) + return CMD_RET_FAILURE; + + ret = fuse_writebuff(addr); + if (ret) + goto err; } else { return CMD_RET_USAGE; } @@ -189,5 +202,9 @@ U_BOOT_CMD( "fuse prog [-y] <bank> <word> <hexval> [<hexval>...] - program 1 or\n" " several fuse words, starting at 'word' (PERMANENT)\n" "fuse override <bank> <word> <hexval> [<hexval>...] - override 1 or\n" - " several fuse words, starting at 'word'" + " several fuse words, starting at 'word'\n" +#ifdef CONFIG_CMD_FUSE_WRITEBUFF + "fuse writebuff [-y] <addr> - program fuse data\n" + " using a structured buffer in memory starting at 'addr'\n" +#endif /* CONFIG_CMD_FUSE_WRITEBUFF */ ); diff --git a/cmd/net-lwip.c b/cmd/net-lwip.c index 58c10fbec7d..cecf8d02555 100644 --- a/cmd/net-lwip.c +++ b/cmd/net-lwip.c @@ -17,7 +17,7 @@ U_BOOT_CMD(ping, 2, 1, do_ping, "send ICMP ECHO_REQUEST to network host", #if defined(CONFIG_CMD_TFTPBOOT) U_BOOT_CMD(tftpboot, 3, 0, do_tftpb, - "boot image via network using TFTP protocol\n", + "boot image via network using TFTP protocol", "[loadAddress] [[hostIPaddr:]bootfilename]"); #endif diff --git a/cmd/net.c b/cmd/net.c index 8f33c9f55d5..79525f73a51 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -297,15 +297,13 @@ static void netboot_update_env(void) /** * parse_addr_size() - parse address and size arguments for tftpput * - * @argv: command line arguments (argv[1] and argv[2] must be valid) - * @addrp: returns the address, on success - * @sizep: returns the size, on success + * @argv: command line arguments * Return: 0 on success */ -static int parse_addr_size(char * const argv[], ulong *addrp, ulong *sizep) +static int parse_addr_size(char * const argv[]) { - if (strict_strtoul(argv[1], 16, addrp) < 0 || - strict_strtoul(argv[2], 16, sizep) < 0) { + if (strict_strtoul(argv[1], 16, &image_save_addr) < 0 || + strict_strtoul(argv[2], 16, &image_save_size) < 0) { printf("Invalid address/size\n"); return CMD_RET_USAGE; } @@ -315,31 +313,24 @@ static int parse_addr_size(char * const argv[], ulong *addrp, ulong *sizep) /** * parse_args() - parse command line arguments * - * Sets: - * - image_save_addr and image_save_size, if proto == TFTPPUT - * * @proto: command prototype - * @argc: number of arguments, include the command, which has already been - * parsed - * @argv: command line arguments, with argv[0] being the command - * @fnamep: set to the filename, if provided, else NULL - * @addrp: returns the load/save address, if any is provided, else it is - * left unchanged - * @sizep: returns the save size, if any is provided, else it is left - * unchanged + * @argc: number of arguments + * @argv: command line arguments * Return: 0 on success */ -static int parse_args(enum proto_t proto, int argc, char *const argv[], - const char **fnamep, ulong *addrp, ulong *sizep) +static int parse_args(enum proto_t proto, int argc, char *const argv[]) { ulong addr; char *end; - *fnamep = NULL; switch (argc) { case 1: if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) return 1; + + /* refresh bootfile name from env */ + copy_filename(net_boot_file_name, env_get("bootfile"), + sizeof(net_boot_file_name)); break; case 2: @@ -352,42 +343,48 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[], * mis-interpreted as a valid number. */ addr = hextoul(argv[1], &end); - if (end == (argv[1] + strlen(argv[1]))) - *addrp = addr; - else - *fnamep = argv[1]; + if (end == (argv[1] + strlen(argv[1]))) { + image_load_addr = addr; + /* refresh bootfile name from env */ + copy_filename(net_boot_file_name, env_get("bootfile"), + sizeof(net_boot_file_name)); + } else { + net_boot_file_name_explicit = true; + copy_filename(net_boot_file_name, argv[1], + sizeof(net_boot_file_name)); + } break; case 3: if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) { - if (parse_addr_size(argv, addrp, sizep)) + if (parse_addr_size(argv)) return 1; } else { - *addrp = hextoul(argv[1], NULL); - *fnamep = argv[2]; + image_load_addr = hextoul(argv[1], NULL); + net_boot_file_name_explicit = true; + copy_filename(net_boot_file_name, argv[2], + sizeof(net_boot_file_name)); } break; +#ifdef CONFIG_CMD_TFTPPUT case 4: - if (IS_ENABLED(CONFIG_CMD_TFTPPUT)) { - if (parse_addr_size(argv, addrp, sizep)) - return 1; - *fnamep = argv[3]; - break; - } + if (parse_addr_size(argv)) + return 1; + net_boot_file_name_explicit = true; + copy_filename(net_boot_file_name, argv[3], + sizeof(net_boot_file_name)); + break; +#endif default: return 1; } - return 0; } static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc, char *const argv[]) { - ulong addr, save_size; - bool fname_explicit; - const char *fname; char *s; int rcode = 0; int size; @@ -395,10 +392,10 @@ static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc, net_boot_file_name_explicit = false; *net_boot_file_name = '\0'; - /* pre-set addr */ + /* pre-set image_load_addr */ s = env_get("loadaddr"); if (s != NULL) - addr = hextoul(s, NULL); + image_load_addr = hextoul(s, NULL); if (IS_ENABLED(CONFIG_IPV6)) { use_ip6 = false; @@ -411,17 +408,12 @@ static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc, } } - if (parse_args(proto, argc, argv, &fname, &addr, &save_size)) { + if (parse_args(proto, argc, argv)) { bootstage_error(BOOTSTAGE_ID_NET_START); return CMD_RET_USAGE; } - if (fname) { - fname_explicit = true; - } else { - fname_explicit = false; - fname = env_get("bootfile"); - } + bootstage_mark(BOOTSTAGE_ID_NET_START); if (IS_ENABLED(CONFIG_IPV6) && !use_ip6) { char *s, *e; @@ -436,10 +428,12 @@ static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc, } } - size = netboot_run_(proto, addr, fname, save_size, fname_explicit, - IS_ENABLED(CONFIG_IPV6) && use_ip6); - if (size < 0) + size = net_loop(proto); + if (size < 0) { + bootstage_error(BOOTSTAGE_ID_NET_NETLOOP_OK); return CMD_RET_FAILURE; + } + bootstage_mark(BOOTSTAGE_ID_NET_NETLOOP_OK); /* net_loop ok, update environment */ netboot_update_env(); diff --git a/cmd/version.c b/cmd/version.c index 53db1a0b6bd..62406608eb0 100644 --- a/cmd/version.c +++ b/cmd/version.c @@ -6,6 +6,7 @@ #include <command.h> #include <display_options.h> +#include <version.h> #include <version_string.h> #include <linux/compiler.h> #ifdef CONFIG_SYS_COREBOOT diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c index b2afb598c73..289865515ef 100644 --- a/cmd/x86/mtrr.c +++ b/cmd/x86/mtrr.c @@ -13,8 +13,8 @@ static int do_mtrr_set(int cpu_select, uint reg, int argc, char *const argv[]) { const char *typename = argv[0]; - uint32_t start, size; - uint64_t base, mask; + u64 start, size; + u64 base, mask; int type = -1; bool valid; int ret; @@ -26,13 +26,12 @@ static int do_mtrr_set(int cpu_select, uint reg, int argc, char *const argv[]) printf("Invalid type name %s\n", typename); return CMD_RET_USAGE; } - start = hextoul(argv[1], NULL); - size = hextoul(argv[2], NULL); + start = hextoull(argv[1], NULL); + size = hextoull(argv[2], NULL); base = start | type; valid = native_read_msr(MTRR_PHYS_MASK_MSR(reg)) & MTRR_PHYS_MASK_VALID; - mask = ~((uint64_t)size - 1); - mask &= (1ULL << CONFIG_CPU_ADDR_BITS) - 1; + mask = mtrr_to_mask(size); if (valid) mask |= MTRR_PHYS_MASK_VALID; diff --git a/cmd/x86/zboot.c b/cmd/x86/zboot.c index ee099ca041b..94e602b8a5b 100644 --- a/cmd/x86/zboot.c +++ b/cmd/x86/zboot.c @@ -7,15 +7,11 @@ #define LOG_CATEGORY LOGC_BOOT -#include <bootm.h> #include <command.h> #include <mapmem.h> #include <vsprintf.h> #include <asm/zimage.h> -/* Current state of the boot */ -static struct bootm_info bmi; - static int do_zboot_start(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -24,8 +20,6 @@ static int do_zboot_start(struct cmd_tbl *cmdtp, int flag, int argc, ulong base_addr; int i; - bootm_init(&bmi); - log_debug("argc %d:", argc); for (i = 0; i < argc; i++) log_debug(" %s", argv[i]); @@ -41,7 +35,7 @@ static int do_zboot_start(struct cmd_tbl *cmdtp, int flag, int argc, base_addr = argc > 5 ? hextoul(argv[5], NULL) : 0; cmdline = argc > 6 ? env_get(argv[6]) : NULL; - zboot_start(&bmi, bzimage_addr, bzimage_size, initrd_addr, initrd_size, + zboot_start(bzimage_addr, bzimage_size, initrd_addr, initrd_size, base_addr, cmdline); return 0; @@ -52,7 +46,7 @@ static int do_zboot_load(struct cmd_tbl *cmdtp, int flag, int argc, { int ret; - ret = zboot_load(&bmi); + ret = zboot_load(); if (ret) return ret; @@ -62,17 +56,16 @@ static int do_zboot_load(struct cmd_tbl *cmdtp, int flag, int argc, static int do_zboot_setup(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - if (!bmi.base_ptr) { + if (!state.base_ptr) { printf("base is not set: use 'zboot load' first\n"); return CMD_RET_FAILURE; } - - if (zboot_setup(&bmi)) { + if (zboot_setup()) { puts("Setting up boot parameters failed ...\n"); return CMD_RET_FAILURE; } - if (zboot_setup(&bmi)) + if (zboot_setup()) return CMD_RET_FAILURE; return 0; @@ -81,7 +74,7 @@ static int do_zboot_setup(struct cmd_tbl *cmdtp, int flag, int argc, static int do_zboot_info(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - zboot_info(&bmi); + zboot_info(); return 0; } @@ -91,7 +84,7 @@ static int do_zboot_go(struct cmd_tbl *cmdtp, int flag, int argc, { int ret; - ret = zboot_go(&bmi); + ret = zboot_go(); if (ret) { printf("Kernel returned! (err=%d)\n", ret); return CMD_RET_FAILURE; @@ -103,13 +96,15 @@ static int do_zboot_go(struct cmd_tbl *cmdtp, int flag, int argc, static int do_zboot_dump(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { + struct boot_params *base_ptr = state.base_ptr; + if (argc > 1) - bmi.base_ptr = (void *)hextoul(argv[1], NULL); - if (!bmi.base_ptr) { + base_ptr = (void *)hextoul(argv[1], NULL); + if (!base_ptr) { printf("No zboot setup_base\n"); return CMD_RET_FAILURE; } - zimage_dump(&bmi, true); + zimage_dump(base_ptr, true); return 0; } @@ -124,8 +119,8 @@ U_BOOT_SUBCMDS(zboot, U_BOOT_CMD_MKENT(dump, 2, 1, do_zboot_dump, "", ""), ) -static int do_zboot_states(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[], int state_mask) +int do_zboot_states(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[], int state_mask) { int ret = 0; |