2007-04-01 00:22:10 +08:00
|
|
|
/*
|
|
|
|
* (C) Copyright 2007
|
|
|
|
* Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
|
|
|
|
* Based on code written by:
|
|
|
|
* Pantelis Antoniou <pantelis.antoniou@gmail.com> and
|
|
|
|
* Matthew McClintock <msm@freescale.com>
|
|
|
|
*
|
2013-07-08 15:37:19 +08:00
|
|
|
* SPDX-License-Identifier: GPL-2.0+
|
2007-04-01 00:22:10 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
|
|
|
#include <linux/ctype.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/global_data.h>
|
|
|
|
#include <libfdt.h>
|
2007-04-07 02:19:43 +08:00
|
|
|
#include <fdt_support.h>
|
2013-04-20 16:42:45 +08:00
|
|
|
#include <asm/io.h>
|
2007-04-01 00:22:10 +08:00
|
|
|
|
|
|
|
#define MAX_LEVEL 32 /* how deeply nested we will go */
|
2007-06-26 11:25:28 +08:00
|
|
|
#define SCRATCHPAD 1024 /* bytes of scratchpad memory */
|
2012-08-17 18:34:36 +08:00
|
|
|
#ifndef CONFIG_CMD_FDT_MAX_DUMP
|
|
|
|
#define CONFIG_CMD_FDT_MAX_DUMP 64
|
|
|
|
#endif
|
2007-04-01 00:22:10 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Global data (for the gd->bd)
|
|
|
|
*/
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
2013-04-20 16:42:42 +08:00
|
|
|
static int fdt_valid(struct fdt_header **blobp);
|
2010-06-29 04:00:46 +08:00
|
|
|
static int fdt_parse_prop(char *const*newval, int count, char *data, int *len);
|
2007-11-22 04:07:46 +08:00
|
|
|
static int fdt_print(const char *pathp, char *prop, int depth);
|
2012-08-17 18:34:37 +08:00
|
|
|
static int is_printable_string(const void *data, int len);
|
2007-04-01 00:22:10 +08:00
|
|
|
|
2008-06-11 10:15:58 +08:00
|
|
|
/*
|
|
|
|
* The working_fdt points to our working flattened device tree.
|
|
|
|
*/
|
|
|
|
struct fdt_header *working_fdt;
|
|
|
|
|
2008-08-15 21:24:39 +08:00
|
|
|
void set_working_fdt_addr(void *addr)
|
|
|
|
{
|
2013-04-20 16:42:45 +08:00
|
|
|
void *buf;
|
|
|
|
|
|
|
|
buf = map_sysmem((ulong)addr, 0);
|
|
|
|
working_fdt = buf;
|
2013-02-25 01:33:21 +08:00
|
|
|
setenv_addr("fdtaddr", addr);
|
2008-08-15 21:24:39 +08:00
|
|
|
}
|
|
|
|
|
2012-08-17 18:34:37 +08:00
|
|
|
/*
|
|
|
|
* Get a value from the fdt and format it to be set in the environment
|
|
|
|
*/
|
|
|
|
static int fdt_value_setenv(const void *nodep, int len, const char *var)
|
|
|
|
{
|
|
|
|
if (is_printable_string(nodep, len))
|
|
|
|
setenv(var, (void *)nodep);
|
|
|
|
else if (len == 4) {
|
|
|
|
char buf[11];
|
|
|
|
|
|
|
|
sprintf(buf, "0x%08X", *(uint32_t *)nodep);
|
|
|
|
setenv(var, buf);
|
|
|
|
} else if (len%4 == 0 && len <= 20) {
|
|
|
|
/* Needed to print things like sha1 hashes. */
|
|
|
|
char buf[41];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i += sizeof(unsigned int))
|
|
|
|
sprintf(buf + (i * 2), "%08x",
|
|
|
|
*(unsigned int *)(nodep + i));
|
|
|
|
setenv(var, buf);
|
|
|
|
} else {
|
|
|
|
printf("error: unprintable value\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-04-01 00:22:10 +08:00
|
|
|
/*
|
|
|
|
* Flattened Device Tree command, see the help for parameter definitions.
|
|
|
|
*/
|
2012-10-29 21:34:31 +08:00
|
|
|
static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
2007-04-01 00:22:10 +08:00
|
|
|
{
|
2010-07-17 07:06:04 +08:00
|
|
|
if (argc < 2)
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2007-04-01 00:22:10 +08:00
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2007-04-01 00:22:10 +08:00
|
|
|
* Set the address of the fdt
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2007-05-12 21:47:25 +08:00
|
|
|
if (argv[1][0] == 'a') {
|
2008-08-15 21:24:39 +08:00
|
|
|
unsigned long addr;
|
2013-04-20 16:42:44 +08:00
|
|
|
int control = 0;
|
|
|
|
struct fdt_header *blob;
|
2007-04-01 00:22:10 +08:00
|
|
|
/*
|
|
|
|
* Set the address [and length] of the fdt.
|
|
|
|
*/
|
2013-04-20 16:42:44 +08:00
|
|
|
argc -= 2;
|
|
|
|
argv += 2;
|
|
|
|
/* Temporary #ifdef - some archs don't have fdt_blob yet */
|
|
|
|
#ifdef CONFIG_OF_CONTROL
|
|
|
|
if (argc && !strcmp(*argv, "-c")) {
|
|
|
|
control = 1;
|
|
|
|
argc--;
|
|
|
|
argv++;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (argc == 0) {
|
|
|
|
if (control)
|
|
|
|
blob = (struct fdt_header *)gd->fdt_blob;
|
|
|
|
else
|
|
|
|
blob = working_fdt;
|
|
|
|
if (!blob || !fdt_valid(&blob))
|
2008-08-15 21:24:35 +08:00
|
|
|
return 1;
|
2013-04-20 16:42:44 +08:00
|
|
|
printf("The address of the fdt is %#08lx\n",
|
|
|
|
control ? (ulong)blob :
|
|
|
|
getenv_hex("fdtaddr", 0));
|
2008-08-15 21:24:35 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-04-20 16:42:44 +08:00
|
|
|
addr = simple_strtoul(argv[0], NULL, 16);
|
2013-04-20 16:42:45 +08:00
|
|
|
blob = map_sysmem(addr, 0);
|
2013-04-20 16:42:44 +08:00
|
|
|
if (!fdt_valid(&blob))
|
2007-04-01 00:22:10 +08:00
|
|
|
return 1;
|
2013-04-20 16:42:44 +08:00
|
|
|
if (control)
|
|
|
|
gd->fdt_blob = blob;
|
|
|
|
else
|
2013-04-20 16:42:45 +08:00
|
|
|
set_working_fdt_addr(blob);
|
2007-04-01 00:22:10 +08:00
|
|
|
|
2013-04-20 16:42:44 +08:00
|
|
|
if (argc >= 2) {
|
2007-04-01 00:22:10 +08:00
|
|
|
int len;
|
|
|
|
int err;
|
|
|
|
/*
|
|
|
|
* Optional new length
|
|
|
|
*/
|
2013-04-20 16:42:44 +08:00
|
|
|
len = simple_strtoul(argv[1], NULL, 16);
|
|
|
|
if (len < fdt_totalsize(blob)) {
|
2007-05-17 10:39:59 +08:00
|
|
|
printf ("New length %d < existing length %d, "
|
|
|
|
"ignoring.\n",
|
2013-04-20 16:42:44 +08:00
|
|
|
len, fdt_totalsize(blob));
|
2007-04-01 00:22:10 +08:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Open in place with a new length.
|
|
|
|
*/
|
2013-04-20 16:42:44 +08:00
|
|
|
err = fdt_open_into(blob, blob, len);
|
2007-04-01 00:22:10 +08:00
|
|
|
if (err != 0) {
|
2007-05-17 10:39:59 +08:00
|
|
|
printf ("libfdt fdt_open_into(): %s\n",
|
|
|
|
fdt_strerror(err));
|
2007-04-01 00:22:10 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-05 14:34:44 +08:00
|
|
|
return CMD_RET_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!working_fdt) {
|
|
|
|
puts(
|
|
|
|
"No FDT memory address configured. Please configure\n"
|
|
|
|
"the FDT address via \"fdt addr <address>\" command.\n"
|
|
|
|
"Aborting!\n");
|
|
|
|
return CMD_RET_FAILURE;
|
|
|
|
}
|
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2008-06-11 00:06:17 +08:00
|
|
|
* Move the working_fdt
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2012-09-05 14:34:44 +08:00
|
|
|
if (strncmp(argv[1], "mo", 2) == 0) {
|
2007-04-01 00:22:10 +08:00
|
|
|
struct fdt_header *newaddr;
|
|
|
|
int len;
|
|
|
|
int err;
|
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
if (argc < 4)
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2007-04-01 00:22:10 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the address and length of the fdt.
|
|
|
|
*/
|
2008-06-11 00:06:17 +08:00
|
|
|
working_fdt = (struct fdt_header *)simple_strtoul(argv[2], NULL, 16);
|
2013-04-20 16:42:42 +08:00
|
|
|
if (!fdt_valid(&working_fdt))
|
2007-04-01 00:22:10 +08:00
|
|
|
return 1;
|
|
|
|
|
2007-05-17 10:39:59 +08:00
|
|
|
newaddr = (struct fdt_header *)simple_strtoul(argv[3],NULL,16);
|
2007-04-26 10:47:15 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the user specifies a length, use that. Otherwise use the
|
|
|
|
* current length.
|
|
|
|
*/
|
|
|
|
if (argc <= 4) {
|
2008-06-11 00:06:17 +08:00
|
|
|
len = fdt_totalsize(working_fdt);
|
2007-04-26 10:47:15 +08:00
|
|
|
} else {
|
|
|
|
len = simple_strtoul(argv[4], NULL, 16);
|
2008-06-11 00:06:17 +08:00
|
|
|
if (len < fdt_totalsize(working_fdt)) {
|
2007-05-17 10:39:59 +08:00
|
|
|
printf ("New length 0x%X < existing length "
|
|
|
|
"0x%X, aborting.\n",
|
2008-06-11 00:06:17 +08:00
|
|
|
len, fdt_totalsize(working_fdt));
|
2007-04-26 10:47:15 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2007-04-01 00:22:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy to the new location.
|
|
|
|
*/
|
2008-06-11 00:06:17 +08:00
|
|
|
err = fdt_open_into(working_fdt, newaddr, len);
|
2007-04-01 00:22:10 +08:00
|
|
|
if (err != 0) {
|
2007-05-17 10:39:59 +08:00
|
|
|
printf ("libfdt fdt_open_into(): %s\n",
|
|
|
|
fdt_strerror(err));
|
2007-04-01 00:22:10 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2008-06-11 00:06:17 +08:00
|
|
|
working_fdt = newaddr;
|
2007-04-01 00:22:10 +08:00
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2007-05-12 21:47:25 +08:00
|
|
|
* Make a new node
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2008-06-10 09:02:17 +08:00
|
|
|
} else if (strncmp(argv[1], "mk", 2) == 0) {
|
2007-05-12 21:47:25 +08:00
|
|
|
char *pathp; /* path */
|
|
|
|
char *nodep; /* new node to add */
|
|
|
|
int nodeoffset; /* node offset from libfdt */
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parameters: Node path, new node to be appended to the path.
|
|
|
|
*/
|
2010-07-17 07:06:04 +08:00
|
|
|
if (argc < 4)
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2007-05-12 21:47:25 +08:00
|
|
|
|
|
|
|
pathp = argv[2];
|
|
|
|
nodep = argv[3];
|
|
|
|
|
2008-06-11 00:06:17 +08:00
|
|
|
nodeoffset = fdt_path_offset (working_fdt, pathp);
|
2007-05-12 21:47:25 +08:00
|
|
|
if (nodeoffset < 0) {
|
|
|
|
/*
|
|
|
|
* Not found or something else bad happened.
|
|
|
|
*/
|
2007-10-25 00:04:22 +08:00
|
|
|
printf ("libfdt fdt_path_offset() returned %s\n",
|
2007-05-22 11:27:16 +08:00
|
|
|
fdt_strerror(nodeoffset));
|
2007-05-12 21:47:25 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2008-06-11 00:06:17 +08:00
|
|
|
err = fdt_add_subnode(working_fdt, nodeoffset, nodep);
|
2007-05-12 21:47:25 +08:00
|
|
|
if (err < 0) {
|
2007-05-17 10:39:59 +08:00
|
|
|
printf ("libfdt fdt_add_subnode(): %s\n",
|
|
|
|
fdt_strerror(err));
|
2007-05-12 21:47:25 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2008-06-11 00:06:17 +08:00
|
|
|
* Set the value of a property in the working_fdt.
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2007-05-12 21:47:25 +08:00
|
|
|
} else if (argv[1][0] == 's') {
|
2007-04-01 00:22:10 +08:00
|
|
|
char *pathp; /* path */
|
2007-05-17 10:39:59 +08:00
|
|
|
char *prop; /* property */
|
2007-04-01 00:22:10 +08:00
|
|
|
int nodeoffset; /* node offset from libfdt */
|
2007-05-17 10:39:59 +08:00
|
|
|
static char data[SCRATCHPAD]; /* storage for the property */
|
|
|
|
int len; /* new length of the property */
|
|
|
|
int ret; /* return value */
|
2007-04-01 00:22:10 +08:00
|
|
|
|
|
|
|
/*
|
2008-01-06 03:52:04 +08:00
|
|
|
* Parameters: Node path, property, optional value.
|
2007-04-01 00:22:10 +08:00
|
|
|
*/
|
2010-07-17 07:06:04 +08:00
|
|
|
if (argc < 4)
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2007-04-01 00:22:10 +08:00
|
|
|
|
|
|
|
pathp = argv[2];
|
|
|
|
prop = argv[3];
|
2008-01-06 03:52:04 +08:00
|
|
|
if (argc == 4) {
|
|
|
|
len = 0;
|
|
|
|
} else {
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
ret = fdt_parse_prop(&argv[4], argc - 4, data, &len);
|
2008-01-06 03:52:04 +08:00
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
|
|
|
}
|
2007-04-01 00:22:10 +08:00
|
|
|
|
2008-06-11 00:06:17 +08:00
|
|
|
nodeoffset = fdt_path_offset (working_fdt, pathp);
|
2007-05-12 21:47:25 +08:00
|
|
|
if (nodeoffset < 0) {
|
2007-04-01 00:22:10 +08:00
|
|
|
/*
|
2007-05-12 21:47:25 +08:00
|
|
|
* Not found or something else bad happened.
|
2007-04-01 00:22:10 +08:00
|
|
|
*/
|
2007-10-25 00:04:22 +08:00
|
|
|
printf ("libfdt fdt_path_offset() returned %s\n",
|
2007-05-22 11:27:16 +08:00
|
|
|
fdt_strerror(nodeoffset));
|
2007-04-01 00:22:10 +08:00
|
|
|
return 1;
|
2007-05-12 21:47:25 +08:00
|
|
|
}
|
|
|
|
|
2008-06-11 00:06:17 +08:00
|
|
|
ret = fdt_setprop(working_fdt, nodeoffset, prop, data, len);
|
2007-05-12 21:47:25 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
printf ("libfdt fdt_setprop(): %s\n", fdt_strerror(ret));
|
|
|
|
return 1;
|
2007-04-01 00:22:10 +08:00
|
|
|
}
|
|
|
|
|
2012-08-17 18:34:37 +08:00
|
|
|
/********************************************************************
|
|
|
|
* Get the value of a property in the working_fdt.
|
|
|
|
********************************************************************/
|
|
|
|
} else if (argv[1][0] == 'g') {
|
|
|
|
char *subcmd; /* sub-command */
|
|
|
|
char *pathp; /* path */
|
|
|
|
char *prop; /* property */
|
|
|
|
char *var; /* variable to store result */
|
|
|
|
int nodeoffset; /* node offset from libfdt */
|
|
|
|
const void *nodep; /* property node pointer */
|
|
|
|
int len = 0; /* new length of the property */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parameters: Node path, property, optional value.
|
|
|
|
*/
|
|
|
|
if (argc < 5)
|
|
|
|
return CMD_RET_USAGE;
|
|
|
|
|
|
|
|
subcmd = argv[2];
|
|
|
|
|
|
|
|
if (argc < 6 && subcmd[0] != 's')
|
|
|
|
return CMD_RET_USAGE;
|
|
|
|
|
|
|
|
var = argv[3];
|
|
|
|
pathp = argv[4];
|
|
|
|
prop = argv[5];
|
|
|
|
|
|
|
|
nodeoffset = fdt_path_offset(working_fdt, pathp);
|
|
|
|
if (nodeoffset < 0) {
|
|
|
|
/*
|
|
|
|
* Not found or something else bad happened.
|
|
|
|
*/
|
|
|
|
printf("libfdt fdt_path_offset() returned %s\n",
|
|
|
|
fdt_strerror(nodeoffset));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (subcmd[0] == 'n' || (subcmd[0] == 's' && argc == 5)) {
|
|
|
|
int reqIndex = -1;
|
|
|
|
int startDepth = fdt_node_depth(
|
|
|
|
working_fdt, nodeoffset);
|
|
|
|
int curDepth = startDepth;
|
|
|
|
int curIndex = -1;
|
|
|
|
int nextNodeOffset = fdt_next_node(
|
|
|
|
working_fdt, nodeoffset, &curDepth);
|
|
|
|
|
|
|
|
if (subcmd[0] == 'n')
|
|
|
|
reqIndex = simple_strtoul(argv[5], NULL, 16);
|
|
|
|
|
|
|
|
while (curDepth > startDepth) {
|
|
|
|
if (curDepth == startDepth + 1)
|
|
|
|
curIndex++;
|
|
|
|
if (subcmd[0] == 'n' && curIndex == reqIndex) {
|
|
|
|
const char *nodeName = fdt_get_name(
|
|
|
|
working_fdt, nextNodeOffset, NULL);
|
|
|
|
|
|
|
|
setenv(var, (char *)nodeName);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
nextNodeOffset = fdt_next_node(
|
|
|
|
working_fdt, nextNodeOffset, &curDepth);
|
|
|
|
if (nextNodeOffset < 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (subcmd[0] == 's') {
|
|
|
|
/* get the num nodes at this level */
|
2013-02-25 01:33:21 +08:00
|
|
|
setenv_ulong(var, curIndex + 1);
|
2012-08-17 18:34:37 +08:00
|
|
|
} else {
|
|
|
|
/* node index not found */
|
|
|
|
printf("libfdt node not found\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
nodep = fdt_getprop(
|
|
|
|
working_fdt, nodeoffset, prop, &len);
|
|
|
|
if (len == 0) {
|
|
|
|
/* no property value */
|
|
|
|
setenv(var, "");
|
|
|
|
return 0;
|
|
|
|
} else if (len > 0) {
|
|
|
|
if (subcmd[0] == 'v') {
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = fdt_value_setenv(nodep, len, var);
|
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
|
|
|
} else if (subcmd[0] == 'a') {
|
|
|
|
/* Get address */
|
|
|
|
char buf[11];
|
|
|
|
|
2012-10-29 22:53:18 +08:00
|
|
|
sprintf(buf, "0x%p", nodep);
|
2012-08-17 18:34:37 +08:00
|
|
|
setenv(var, buf);
|
|
|
|
} else if (subcmd[0] == 's') {
|
|
|
|
/* Get size */
|
|
|
|
char buf[11];
|
|
|
|
|
|
|
|
sprintf(buf, "0x%08X", len);
|
|
|
|
setenv(var, buf);
|
|
|
|
} else
|
|
|
|
return CMD_RET_USAGE;
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
printf("libfdt fdt_getprop(): %s\n",
|
|
|
|
fdt_strerror(len));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2007-04-01 00:22:10 +08:00
|
|
|
* Print (recursive) / List (single level)
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2007-05-12 21:47:25 +08:00
|
|
|
} else if ((argv[1][0] == 'p') || (argv[1][0] == 'l')) {
|
2007-04-01 00:22:10 +08:00
|
|
|
int depth = MAX_LEVEL; /* how deep to print */
|
|
|
|
char *pathp; /* path */
|
2007-05-17 10:39:59 +08:00
|
|
|
char *prop; /* property */
|
|
|
|
int ret; /* return value */
|
2007-10-26 05:15:07 +08:00
|
|
|
static char root[2] = "/";
|
2007-04-01 00:22:10 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* list is an alias for print, but limited to 1 level
|
|
|
|
*/
|
2007-05-12 21:47:25 +08:00
|
|
|
if (argv[1][0] == 'l') {
|
2007-04-01 00:22:10 +08:00
|
|
|
depth = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get the starting path. The root node is an oddball,
|
|
|
|
* the offset is zero and has no name.
|
|
|
|
*/
|
2007-10-26 05:15:07 +08:00
|
|
|
if (argc == 2)
|
|
|
|
pathp = root;
|
|
|
|
else
|
|
|
|
pathp = argv[2];
|
2007-04-01 00:22:10 +08:00
|
|
|
if (argc > 3)
|
|
|
|
prop = argv[3];
|
|
|
|
else
|
|
|
|
prop = NULL;
|
|
|
|
|
2007-05-17 10:39:59 +08:00
|
|
|
ret = fdt_print(pathp, prop, depth);
|
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
2007-04-01 00:22:10 +08:00
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2007-04-01 00:22:10 +08:00
|
|
|
* Remove a property/node
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2008-06-10 09:02:17 +08:00
|
|
|
} else if (strncmp(argv[1], "rm", 2) == 0) {
|
2007-04-01 00:22:10 +08:00
|
|
|
int nodeoffset; /* node offset from libfdt */
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get the path. The root node is an oddball, the offset
|
|
|
|
* is zero and has no name.
|
|
|
|
*/
|
2008-06-11 00:06:17 +08:00
|
|
|
nodeoffset = fdt_path_offset (working_fdt, argv[2]);
|
2007-05-12 21:47:25 +08:00
|
|
|
if (nodeoffset < 0) {
|
|
|
|
/*
|
|
|
|
* Not found or something else bad happened.
|
|
|
|
*/
|
2007-10-25 00:04:22 +08:00
|
|
|
printf ("libfdt fdt_path_offset() returned %s\n",
|
2007-05-22 11:27:16 +08:00
|
|
|
fdt_strerror(nodeoffset));
|
2007-05-12 21:47:25 +08:00
|
|
|
return 1;
|
2007-04-01 00:22:10 +08:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Do the delete. A fourth parameter means delete a property,
|
|
|
|
* otherwise delete the node.
|
|
|
|
*/
|
|
|
|
if (argc > 3) {
|
2008-06-11 00:06:17 +08:00
|
|
|
err = fdt_delprop(working_fdt, nodeoffset, argv[3]);
|
2007-04-01 00:22:10 +08:00
|
|
|
if (err < 0) {
|
2007-05-17 10:39:59 +08:00
|
|
|
printf("libfdt fdt_delprop(): %s\n",
|
|
|
|
fdt_strerror(err));
|
2007-04-01 00:22:10 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
} else {
|
2008-06-11 00:06:17 +08:00
|
|
|
err = fdt_del_node(working_fdt, nodeoffset);
|
2007-04-01 00:22:10 +08:00
|
|
|
if (err < 0) {
|
2007-05-17 10:39:59 +08:00
|
|
|
printf("libfdt fdt_del_node(): %s\n",
|
|
|
|
fdt_strerror(err));
|
2007-04-01 00:22:10 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
2008-02-15 17:34:36 +08:00
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2008-02-15 17:34:36 +08:00
|
|
|
* Display header info
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2008-02-15 17:34:36 +08:00
|
|
|
} else if (argv[1][0] == 'h') {
|
2008-06-11 00:06:17 +08:00
|
|
|
u32 version = fdt_version(working_fdt);
|
|
|
|
printf("magic:\t\t\t0x%x\n", fdt_magic(working_fdt));
|
|
|
|
printf("totalsize:\t\t0x%x (%d)\n", fdt_totalsize(working_fdt),
|
|
|
|
fdt_totalsize(working_fdt));
|
|
|
|
printf("off_dt_struct:\t\t0x%x\n",
|
|
|
|
fdt_off_dt_struct(working_fdt));
|
|
|
|
printf("off_dt_strings:\t\t0x%x\n",
|
|
|
|
fdt_off_dt_strings(working_fdt));
|
|
|
|
printf("off_mem_rsvmap:\t\t0x%x\n",
|
|
|
|
fdt_off_mem_rsvmap(working_fdt));
|
2008-02-15 17:34:36 +08:00
|
|
|
printf("version:\t\t%d\n", version);
|
2008-06-11 00:06:17 +08:00
|
|
|
printf("last_comp_version:\t%d\n",
|
|
|
|
fdt_last_comp_version(working_fdt));
|
2008-02-15 17:34:36 +08:00
|
|
|
if (version >= 2)
|
|
|
|
printf("boot_cpuid_phys:\t0x%x\n",
|
2008-06-11 00:06:17 +08:00
|
|
|
fdt_boot_cpuid_phys(working_fdt));
|
2008-02-15 17:34:36 +08:00
|
|
|
if (version >= 3)
|
|
|
|
printf("size_dt_strings:\t0x%x\n",
|
2008-06-11 00:06:17 +08:00
|
|
|
fdt_size_dt_strings(working_fdt));
|
2008-02-15 17:34:36 +08:00
|
|
|
if (version >= 17)
|
|
|
|
printf("size_dt_struct:\t\t0x%x\n",
|
2008-06-11 00:06:17 +08:00
|
|
|
fdt_size_dt_struct(working_fdt));
|
|
|
|
printf("number mem_rsv:\t\t0x%x\n",
|
|
|
|
fdt_num_mem_rsv(working_fdt));
|
2008-02-15 17:34:36 +08:00
|
|
|
printf("\n");
|
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2008-02-15 17:34:36 +08:00
|
|
|
* Set boot cpu id
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2008-06-10 09:02:17 +08:00
|
|
|
} else if (strncmp(argv[1], "boo", 3) == 0) {
|
2008-02-15 17:34:36 +08:00
|
|
|
unsigned long tmp = simple_strtoul(argv[2], NULL, 16);
|
2008-06-11 00:06:17 +08:00
|
|
|
fdt_set_boot_cpuid_phys(working_fdt, tmp);
|
2008-02-15 17:34:36 +08:00
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2008-02-15 17:34:36 +08:00
|
|
|
* memory command
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2008-06-10 09:02:17 +08:00
|
|
|
} else if (strncmp(argv[1], "me", 2) == 0) {
|
2008-02-15 17:34:36 +08:00
|
|
|
uint64_t addr, size;
|
|
|
|
int err;
|
2009-12-03 18:21:21 +08:00
|
|
|
addr = simple_strtoull(argv[2], NULL, 16);
|
|
|
|
size = simple_strtoull(argv[3], NULL, 16);
|
2008-06-11 00:06:17 +08:00
|
|
|
err = fdt_fixup_memory(working_fdt, addr, size);
|
2008-02-15 17:34:36 +08:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
/*
|
2008-02-15 17:34:36 +08:00
|
|
|
* mem reserve commands
|
2010-07-17 07:06:04 +08:00
|
|
|
*/
|
2008-06-10 09:02:17 +08:00
|
|
|
} else if (strncmp(argv[1], "rs", 2) == 0) {
|
2008-02-15 17:34:36 +08:00
|
|
|
if (argv[2][0] == 'p') {
|
|
|
|
uint64_t addr, size;
|
2008-06-11 00:06:17 +08:00
|
|
|
int total = fdt_num_mem_rsv(working_fdt);
|
2008-02-15 17:34:36 +08:00
|
|
|
int j, err;
|
|
|
|
printf("index\t\t start\t\t size\n");
|
|
|
|
printf("-------------------------------"
|
|
|
|
"-----------------\n");
|
|
|
|
for (j = 0; j < total; j++) {
|
2008-06-11 00:06:17 +08:00
|
|
|
err = fdt_get_mem_rsv(working_fdt, j, &addr, &size);
|
2008-02-15 17:34:36 +08:00
|
|
|
if (err < 0) {
|
|
|
|
printf("libfdt fdt_get_mem_rsv(): %s\n",
|
|
|
|
fdt_strerror(err));
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
printf(" %x\t%08x%08x\t%08x%08x\n", j,
|
|
|
|
(u32)(addr >> 32),
|
|
|
|
(u32)(addr & 0xffffffff),
|
|
|
|
(u32)(size >> 32),
|
|
|
|
(u32)(size & 0xffffffff));
|
|
|
|
}
|
|
|
|
} else if (argv[2][0] == 'a') {
|
|
|
|
uint64_t addr, size;
|
|
|
|
int err;
|
|
|
|
addr = simple_strtoull(argv[3], NULL, 16);
|
|
|
|
size = simple_strtoull(argv[4], NULL, 16);
|
2008-06-11 00:06:17 +08:00
|
|
|
err = fdt_add_mem_rsv(working_fdt, addr, size);
|
2008-02-15 17:34:36 +08:00
|
|
|
|
|
|
|
if (err < 0) {
|
|
|
|
printf("libfdt fdt_add_mem_rsv(): %s\n",
|
|
|
|
fdt_strerror(err));
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
} else if (argv[2][0] == 'd') {
|
|
|
|
unsigned long idx = simple_strtoul(argv[3], NULL, 16);
|
2008-06-11 00:06:17 +08:00
|
|
|
int err = fdt_del_mem_rsv(working_fdt, idx);
|
2008-02-15 17:34:36 +08:00
|
|
|
|
|
|
|
if (err < 0) {
|
|
|
|
printf("libfdt fdt_del_mem_rsv(): %s\n",
|
|
|
|
fdt_strerror(err));
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Unrecognized command */
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2008-02-15 17:34:36 +08:00
|
|
|
}
|
2007-07-18 02:57:04 +08:00
|
|
|
}
|
2007-06-26 11:25:28 +08:00
|
|
|
#ifdef CONFIG_OF_BOARD_SETUP
|
2007-07-18 02:57:04 +08:00
|
|
|
/* Call the board-specific fixup routine */
|
2008-06-10 09:02:17 +08:00
|
|
|
else if (strncmp(argv[1], "boa", 3) == 0)
|
2008-06-11 00:06:17 +08:00
|
|
|
ft_board_setup(working_fdt, gd->bd);
|
2007-06-26 11:25:28 +08:00
|
|
|
#endif
|
2007-07-18 02:57:04 +08:00
|
|
|
/* Create a chosen node */
|
2014-03-03 19:19:24 +08:00
|
|
|
else if (strncmp(argv[1], "cho", 3) == 0) {
|
2008-08-15 21:24:34 +08:00
|
|
|
unsigned long initrd_start = 0, initrd_end = 0;
|
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
if ((argc != 2) && (argc != 4))
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2008-08-15 21:24:34 +08:00
|
|
|
|
|
|
|
if (argc == 4) {
|
|
|
|
initrd_start = simple_strtoul(argv[2], NULL, 16);
|
|
|
|
initrd_end = simple_strtoul(argv[3], NULL, 16);
|
|
|
|
}
|
|
|
|
|
2014-04-18 16:41:00 +08:00
|
|
|
fdt_chosen(working_fdt);
|
2014-04-18 16:40:59 +08:00
|
|
|
fdt_initrd(working_fdt, initrd_start, initrd_end);
|
2014-03-03 19:19:24 +08:00
|
|
|
|
|
|
|
#if defined(CONFIG_FIT_SIGNATURE)
|
|
|
|
} else if (strncmp(argv[1], "che", 3) == 0) {
|
|
|
|
int cfg_noffset;
|
|
|
|
int ret;
|
|
|
|
unsigned long addr;
|
|
|
|
struct fdt_header *blob;
|
|
|
|
|
|
|
|
if (!working_fdt)
|
|
|
|
return CMD_RET_FAILURE;
|
|
|
|
|
|
|
|
if (argc > 2) {
|
|
|
|
addr = simple_strtoul(argv[2], NULL, 16);
|
|
|
|
blob = map_sysmem(addr, 0);
|
|
|
|
} else {
|
|
|
|
blob = (struct fdt_header *)gd->fdt_blob;
|
|
|
|
}
|
|
|
|
if (!fdt_valid(&blob))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
gd->fdt_blob = blob;
|
|
|
|
cfg_noffset = fit_conf_get_node(working_fdt, NULL);
|
|
|
|
if (!cfg_noffset) {
|
|
|
|
printf("Could not find configuration node: %s\n",
|
|
|
|
fdt_strerror(cfg_noffset));
|
|
|
|
return CMD_RET_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = fit_config_verify(working_fdt, cfg_noffset);
|
2014-06-12 21:24:45 +08:00
|
|
|
if (ret == 0)
|
2014-03-03 19:19:24 +08:00
|
|
|
return CMD_RET_SUCCESS;
|
|
|
|
else
|
|
|
|
return CMD_RET_FAILURE;
|
|
|
|
#endif
|
|
|
|
|
2008-08-15 21:24:44 +08:00
|
|
|
}
|
|
|
|
/* resize the fdt */
|
|
|
|
else if (strncmp(argv[1], "re", 2) == 0) {
|
|
|
|
fdt_resize(working_fdt);
|
|
|
|
}
|
|
|
|
else {
|
2007-07-18 02:57:04 +08:00
|
|
|
/* Unrecognized command */
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2007-04-01 00:22:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-05-17 10:39:59 +08:00
|
|
|
/****************************************************************************/
|
2007-04-01 00:22:10 +08:00
|
|
|
|
2013-04-20 16:42:42 +08:00
|
|
|
/**
|
|
|
|
* fdt_valid() - Check if an FDT is valid. If not, change it to NULL
|
|
|
|
*
|
|
|
|
* @blobp: Pointer to FDT pointer
|
|
|
|
* @return 1 if OK, 0 if bad (in which case *blobp is set to NULL)
|
|
|
|
*/
|
|
|
|
static int fdt_valid(struct fdt_header **blobp)
|
2007-04-01 00:22:10 +08:00
|
|
|
{
|
2013-04-20 16:42:42 +08:00
|
|
|
const void *blob = *blobp;
|
|
|
|
int err;
|
2007-04-07 02:19:43 +08:00
|
|
|
|
2013-04-20 16:42:42 +08:00
|
|
|
if (blob == NULL) {
|
2007-04-07 02:19:43 +08:00
|
|
|
printf ("The address of the fdt is invalid (NULL).\n");
|
2007-04-01 00:22:10 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2007-04-07 02:19:43 +08:00
|
|
|
|
2013-04-20 16:42:42 +08:00
|
|
|
err = fdt_check_header(blob);
|
2007-04-07 02:19:43 +08:00
|
|
|
if (err == 0)
|
|
|
|
return 1; /* valid */
|
|
|
|
|
|
|
|
if (err < 0) {
|
2007-05-12 21:47:25 +08:00
|
|
|
printf("libfdt fdt_check_header(): %s", fdt_strerror(err));
|
2007-04-07 02:19:43 +08:00
|
|
|
/*
|
|
|
|
* Be more informative on bad version.
|
|
|
|
*/
|
|
|
|
if (err == -FDT_ERR_BADVERSION) {
|
2013-04-20 16:42:42 +08:00
|
|
|
if (fdt_version(blob) <
|
2008-06-11 00:06:17 +08:00
|
|
|
FDT_FIRST_SUPPORTED_VERSION) {
|
2008-07-07 21:41:14 +08:00
|
|
|
printf (" - too old, fdt %d < %d",
|
2013-04-20 16:42:42 +08:00
|
|
|
fdt_version(blob),
|
2007-05-17 10:39:59 +08:00
|
|
|
FDT_FIRST_SUPPORTED_VERSION);
|
2007-04-07 02:19:43 +08:00
|
|
|
}
|
2013-04-20 16:42:42 +08:00
|
|
|
if (fdt_last_comp_version(blob) >
|
2008-06-11 00:06:17 +08:00
|
|
|
FDT_LAST_SUPPORTED_VERSION) {
|
2008-07-07 21:41:14 +08:00
|
|
|
printf (" - too new, fdt %d > %d",
|
2013-04-20 16:42:42 +08:00
|
|
|
fdt_version(blob),
|
2007-05-17 10:39:59 +08:00
|
|
|
FDT_LAST_SUPPORTED_VERSION);
|
2007-04-07 02:19:43 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
printf("\n");
|
2013-04-20 16:42:42 +08:00
|
|
|
*blobp = NULL;
|
2007-04-01 00:22:10 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-05-17 10:39:59 +08:00
|
|
|
/****************************************************************************/
|
2007-04-01 00:22:10 +08:00
|
|
|
|
|
|
|
/*
|
2007-05-17 10:39:59 +08:00
|
|
|
* Parse the user's input, partially heuristic. Valid formats:
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
* <0x00112233 4 05> - an array of cells. Numbers follow standard
|
2008-05-20 22:00:29 +08:00
|
|
|
* C conventions.
|
2007-05-17 10:39:59 +08:00
|
|
|
* [00 11 22 .. nn] - byte stream
|
|
|
|
* "string" - If the the value doesn't start with "<" or "[", it is
|
|
|
|
* treated as a string. Note that the quotes are
|
|
|
|
* stripped by the parser before we get the string.
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
* newval: An array of strings containing the new property as specified
|
2008-05-20 22:00:29 +08:00
|
|
|
* on the command line
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
* count: The number of strings in the array
|
|
|
|
* data: A bytestream to be placed in the property
|
|
|
|
* len: The length of the resulting bytestream
|
2007-05-17 10:39:59 +08:00
|
|
|
*/
|
2010-06-29 04:00:46 +08:00
|
|
|
static int fdt_parse_prop(char * const *newval, int count, char *data, int *len)
|
2007-05-17 10:39:59 +08:00
|
|
|
{
|
|
|
|
char *cp; /* temporary char pointer */
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
char *newp; /* temporary newval char pointer */
|
2007-05-17 10:39:59 +08:00
|
|
|
unsigned long tmp; /* holds converted values */
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
int stridx = 0;
|
2007-05-17 10:39:59 +08:00
|
|
|
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
*len = 0;
|
|
|
|
newp = newval[0];
|
|
|
|
|
|
|
|
/* An array of cells */
|
|
|
|
if (*newp == '<') {
|
|
|
|
newp++;
|
|
|
|
while ((*newp != '>') && (stridx < count)) {
|
|
|
|
/*
|
|
|
|
* Keep searching until we find that last ">"
|
|
|
|
* That way users don't have to escape the spaces
|
|
|
|
*/
|
|
|
|
if (*newp == '\0') {
|
|
|
|
newp = newval[++stridx];
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
cp = newp;
|
|
|
|
tmp = simple_strtoul(cp, &newp, 0);
|
2012-10-29 21:34:31 +08:00
|
|
|
*(__be32 *)data = __cpu_to_be32(tmp);
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
data += 4;
|
|
|
|
*len += 4;
|
|
|
|
|
|
|
|
/* If the ptr didn't advance, something went wrong */
|
|
|
|
if ((newp - cp) <= 0) {
|
2007-05-17 10:39:59 +08:00
|
|
|
printf("Sorry, I could not convert \"%s\"\n",
|
|
|
|
cp);
|
|
|
|
return 1;
|
|
|
|
}
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
|
|
|
|
while (*newp == ' ')
|
|
|
|
newp++;
|
2007-05-17 10:39:59 +08:00
|
|
|
}
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
|
|
|
|
if (*newp != '>') {
|
|
|
|
printf("Unexpected character '%c'\n", *newp);
|
2007-05-17 10:39:59 +08:00
|
|
|
return 1;
|
|
|
|
}
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
} else if (*newp == '[') {
|
2007-05-17 10:39:59 +08:00
|
|
|
/*
|
|
|
|
* Byte stream. Convert the values.
|
|
|
|
*/
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
newp++;
|
2009-09-12 04:16:18 +08:00
|
|
|
while ((stridx < count) && (*newp != ']')) {
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
while (*newp == ' ')
|
|
|
|
newp++;
|
2009-09-12 04:16:18 +08:00
|
|
|
if (*newp == '\0') {
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
newp = newval[++stridx];
|
2009-09-12 04:16:18 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!isxdigit(*newp))
|
|
|
|
break;
|
|
|
|
tmp = simple_strtoul(newp, &newp, 16);
|
|
|
|
*data++ = tmp & 0xFF;
|
|
|
|
*len = *len + 1;
|
2007-05-17 10:39:59 +08:00
|
|
|
}
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
if (*newp != ']') {
|
2008-07-07 21:41:14 +08:00
|
|
|
printf("Unexpected character '%c'\n", *newp);
|
2007-05-17 10:39:59 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/*
|
2009-09-12 04:16:18 +08:00
|
|
|
* Assume it is one or more strings. Copy it into our
|
|
|
|
* data area for convenience (including the
|
|
|
|
* terminating '\0's).
|
2007-05-17 10:39:59 +08:00
|
|
|
*/
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
while (stridx < count) {
|
2009-09-12 04:16:18 +08:00
|
|
|
size_t length = strlen(newp) + 1;
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
strcpy(data, newp);
|
2009-09-12 04:16:18 +08:00
|
|
|
data += length;
|
|
|
|
*len += length;
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
newp = newval[++stridx];
|
|
|
|
}
|
2007-05-17 10:39:59 +08:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Heuristic to guess if this is a string or concatenated strings.
|
2007-04-01 00:22:10 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
static int is_printable_string(const void *data, int len)
|
|
|
|
{
|
|
|
|
const char *s = data;
|
|
|
|
|
|
|
|
/* zero length is not */
|
|
|
|
if (len == 0)
|
|
|
|
return 0;
|
|
|
|
|
2012-08-17 18:34:38 +08:00
|
|
|
/* must terminate with zero or '\n' */
|
|
|
|
if (s[len - 1] != '\0' && s[len - 1] != '\n')
|
2007-04-01 00:22:10 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* printable or a null byte (concatenated strings) */
|
2012-08-17 18:34:38 +08:00
|
|
|
while (((*s == '\0') || isprint(*s) || isspace(*s)) && (len > 0)) {
|
2007-04-01 00:22:10 +08:00
|
|
|
/*
|
|
|
|
* If we see a null, there are three possibilities:
|
|
|
|
* 1) If len == 1, it is the end of the string, printable
|
|
|
|
* 2) Next character also a null, not printable.
|
|
|
|
* 3) Next character not a null, continue to check.
|
|
|
|
*/
|
|
|
|
if (s[0] == '\0') {
|
|
|
|
if (len == 1)
|
|
|
|
return 1;
|
|
|
|
if (s[1] == '\0')
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
s++;
|
|
|
|
len--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Not the null termination, or not done yet: not printable */
|
|
|
|
if (*s != '\0' || (len != 0))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-05-17 10:39:59 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Print the property in the best format, a heuristic guess. Print as
|
|
|
|
* a string, concatenated strings, a byte, word, double word, or (if all
|
|
|
|
* else fails) it is printed as a stream of bytes.
|
|
|
|
*/
|
2007-04-01 00:22:10 +08:00
|
|
|
static void print_data(const void *data, int len)
|
|
|
|
{
|
|
|
|
int j;
|
|
|
|
|
|
|
|
/* no data, don't print */
|
|
|
|
if (len == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* It is a string, but it may have multiple strings (embedded '\0's).
|
|
|
|
*/
|
|
|
|
if (is_printable_string(data, len)) {
|
|
|
|
puts("\"");
|
|
|
|
j = 0;
|
|
|
|
while (j < len) {
|
|
|
|
if (j > 0)
|
|
|
|
puts("\", \"");
|
|
|
|
puts(data);
|
|
|
|
j += strlen(data) + 1;
|
|
|
|
data += strlen(data) + 1;
|
|
|
|
}
|
|
|
|
puts("\"");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
if ((len %4) == 0) {
|
2012-08-17 18:34:36 +08:00
|
|
|
if (len > CONFIG_CMD_FDT_MAX_DUMP)
|
2012-10-29 22:53:18 +08:00
|
|
|
printf("* 0x%p [0x%08x]", data, len);
|
2012-08-17 18:34:36 +08:00
|
|
|
else {
|
2012-10-29 21:34:31 +08:00
|
|
|
const __be32 *p;
|
2012-08-17 18:34:36 +08:00
|
|
|
|
|
|
|
printf("<");
|
|
|
|
for (j = 0, p = data; j < len/4; j++)
|
|
|
|
printf("0x%08x%s", fdt32_to_cpu(p[j]),
|
|
|
|
j < (len/4 - 1) ? " " : "");
|
|
|
|
printf(">");
|
|
|
|
}
|
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
2008-04-01 09:45:56 +08:00
|
|
|
} else { /* anything else... hexdump */
|
2012-08-17 18:34:36 +08:00
|
|
|
if (len > CONFIG_CMD_FDT_MAX_DUMP)
|
2012-10-29 22:53:18 +08:00
|
|
|
printf("* 0x%p [0x%08x]", data, len);
|
2012-08-17 18:34:36 +08:00
|
|
|
else {
|
|
|
|
const u8 *s;
|
|
|
|
|
|
|
|
printf("[");
|
|
|
|
for (j = 0, s = data; j < len; j++)
|
|
|
|
printf("%02x%s", s[j], j < len - 1 ? " " : "");
|
|
|
|
printf("]");
|
|
|
|
}
|
2007-04-01 00:22:10 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-05-17 10:39:59 +08:00
|
|
|
/****************************************************************************/
|
|
|
|
|
|
|
|
/*
|
2008-06-11 00:06:17 +08:00
|
|
|
* Recursively print (a portion of) the working_fdt. The depth parameter
|
2007-05-17 10:39:59 +08:00
|
|
|
* determines how deeply nested the fdt is printed.
|
|
|
|
*/
|
2007-11-22 04:07:46 +08:00
|
|
|
static int fdt_print(const char *pathp, char *prop, int depth)
|
2007-05-17 10:39:59 +08:00
|
|
|
{
|
|
|
|
static char tabs[MAX_LEVEL+1] =
|
|
|
|
"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"
|
|
|
|
"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
|
2007-11-22 04:07:46 +08:00
|
|
|
const void *nodep; /* property node pointer */
|
2007-05-17 10:39:59 +08:00
|
|
|
int nodeoffset; /* node offset from libfdt */
|
|
|
|
int nextoffset; /* next node offset from libfdt */
|
|
|
|
uint32_t tag; /* tag */
|
|
|
|
int len; /* length of the property */
|
|
|
|
int level = 0; /* keep track of nesting level */
|
2007-11-23 06:23:23 +08:00
|
|
|
const struct fdt_property *fdt_prop;
|
2007-05-17 10:39:59 +08:00
|
|
|
|
2008-06-11 00:06:17 +08:00
|
|
|
nodeoffset = fdt_path_offset (working_fdt, pathp);
|
2007-05-17 10:39:59 +08:00
|
|
|
if (nodeoffset < 0) {
|
|
|
|
/*
|
|
|
|
* Not found or something else bad happened.
|
|
|
|
*/
|
2007-10-25 00:04:22 +08:00
|
|
|
printf ("libfdt fdt_path_offset() returned %s\n",
|
2007-05-22 11:27:16 +08:00
|
|
|
fdt_strerror(nodeoffset));
|
2007-05-17 10:39:59 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* The user passed in a property as well as node path.
|
|
|
|
* Print only the given property and then return.
|
|
|
|
*/
|
|
|
|
if (prop) {
|
2008-06-11 00:06:17 +08:00
|
|
|
nodep = fdt_getprop (working_fdt, nodeoffset, prop, &len);
|
2007-05-17 10:39:59 +08:00
|
|
|
if (len == 0) {
|
|
|
|
/* no property value */
|
|
|
|
printf("%s %s\n", pathp, prop);
|
|
|
|
return 0;
|
|
|
|
} else if (len > 0) {
|
2007-11-24 08:43:20 +08:00
|
|
|
printf("%s = ", prop);
|
2007-05-17 10:39:59 +08:00
|
|
|
print_data (nodep, len);
|
|
|
|
printf("\n");
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
printf ("libfdt fdt_getprop(): %s\n",
|
|
|
|
fdt_strerror(len));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The user passed in a node path and no property,
|
|
|
|
* print the node and all subnodes.
|
|
|
|
*/
|
|
|
|
while(level >= 0) {
|
2008-06-11 00:06:17 +08:00
|
|
|
tag = fdt_next_tag(working_fdt, nodeoffset, &nextoffset);
|
2007-05-17 10:39:59 +08:00
|
|
|
switch(tag) {
|
|
|
|
case FDT_BEGIN_NODE:
|
2008-06-11 00:06:17 +08:00
|
|
|
pathp = fdt_get_name(working_fdt, nodeoffset, NULL);
|
2007-11-23 06:23:23 +08:00
|
|
|
if (level <= depth) {
|
|
|
|
if (pathp == NULL)
|
|
|
|
pathp = "/* NULL pointer error */";
|
|
|
|
if (*pathp == '\0')
|
|
|
|
pathp = "/"; /* root is nameless */
|
2007-05-17 10:39:59 +08:00
|
|
|
printf("%s%s {\n",
|
|
|
|
&tabs[MAX_LEVEL - level], pathp);
|
2007-11-23 06:23:23 +08:00
|
|
|
}
|
2007-05-17 10:39:59 +08:00
|
|
|
level++;
|
|
|
|
if (level >= MAX_LEVEL) {
|
2007-11-23 06:23:23 +08:00
|
|
|
printf("Nested too deep, aborting.\n");
|
2007-05-17 10:39:59 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case FDT_END_NODE:
|
|
|
|
level--;
|
2007-11-23 06:23:23 +08:00
|
|
|
if (level <= depth)
|
2007-05-17 10:39:59 +08:00
|
|
|
printf("%s};\n", &tabs[MAX_LEVEL - level]);
|
|
|
|
if (level == 0) {
|
|
|
|
level = -1; /* exit the loop */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case FDT_PROP:
|
2008-06-11 00:06:17 +08:00
|
|
|
fdt_prop = fdt_offset_ptr(working_fdt, nodeoffset,
|
2007-11-23 06:23:23 +08:00
|
|
|
sizeof(*fdt_prop));
|
2008-06-11 00:06:17 +08:00
|
|
|
pathp = fdt_string(working_fdt,
|
2007-11-23 06:23:23 +08:00
|
|
|
fdt32_to_cpu(fdt_prop->nameoff));
|
|
|
|
len = fdt32_to_cpu(fdt_prop->len);
|
|
|
|
nodep = fdt_prop->data;
|
2007-05-17 10:39:59 +08:00
|
|
|
if (len < 0) {
|
|
|
|
printf ("libfdt fdt_getprop(): %s\n",
|
|
|
|
fdt_strerror(len));
|
|
|
|
return 1;
|
|
|
|
} else if (len == 0) {
|
|
|
|
/* the property has no value */
|
2007-11-23 06:23:23 +08:00
|
|
|
if (level <= depth)
|
2007-05-17 10:39:59 +08:00
|
|
|
printf("%s%s;\n",
|
|
|
|
&tabs[MAX_LEVEL - level],
|
|
|
|
pathp);
|
|
|
|
} else {
|
2007-11-23 06:23:23 +08:00
|
|
|
if (level <= depth) {
|
2007-11-24 08:43:20 +08:00
|
|
|
printf("%s%s = ",
|
2007-05-17 10:39:59 +08:00
|
|
|
&tabs[MAX_LEVEL - level],
|
|
|
|
pathp);
|
|
|
|
print_data (nodep, len);
|
|
|
|
printf(";\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case FDT_NOP:
|
2008-07-07 21:41:14 +08:00
|
|
|
printf("%s/* NOP */\n", &tabs[MAX_LEVEL - level]);
|
2007-05-17 10:39:59 +08:00
|
|
|
break;
|
|
|
|
case FDT_END:
|
|
|
|
return 1;
|
|
|
|
default:
|
2007-11-23 06:23:23 +08:00
|
|
|
if (level <= depth)
|
2007-05-17 10:39:59 +08:00
|
|
|
printf("Unknown tag 0x%08X\n", tag);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
nodeoffset = nextoffset;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-04-01 00:22:10 +08:00
|
|
|
/********************************************************************/
|
2012-10-29 21:34:31 +08:00
|
|
|
#ifdef CONFIG_SYS_LONGHELP
|
|
|
|
static char fdt_help_text[] =
|
2013-04-20 16:42:44 +08:00
|
|
|
"addr [-c] <addr> [<length>] - Set the [control] fdt location to <addr>\n"
|
2007-06-26 11:25:28 +08:00
|
|
|
#ifdef CONFIG_OF_BOARD_SETUP
|
|
|
|
"fdt boardsetup - Do board-specific set up\n"
|
|
|
|
#endif
|
2008-01-06 04:33:29 +08:00
|
|
|
"fdt move <fdt> <newaddr> <length> - Copy the fdt to <addr> and make it active\n"
|
2008-08-15 21:24:44 +08:00
|
|
|
"fdt resize - Resize fdt to size + padding to 4k addr\n"
|
2007-04-01 00:22:10 +08:00
|
|
|
"fdt print <path> [<prop>] - Recursive print starting at <path>\n"
|
|
|
|
"fdt list <path> [<prop>] - Print one level starting at <path>\n"
|
2012-08-17 18:34:37 +08:00
|
|
|
"fdt get value <var> <path> <prop> - Get <property> and store in <var>\n"
|
|
|
|
"fdt get name <var> <path> <index> - Get name of node <index> and store in <var>\n"
|
|
|
|
"fdt get addr <var> <path> <prop> - Get start address of <property> and store in <var>\n"
|
|
|
|
"fdt get size <var> <path> [<prop>] - Get size of [<property>] or num nodes and store in <var>\n"
|
2007-04-01 00:22:10 +08:00
|
|
|
"fdt set <path> <prop> [<val>] - Set <property> [to <val>]\n"
|
|
|
|
"fdt mknode <path> <node> - Create a new node after <path>\n"
|
|
|
|
"fdt rm <path> [<prop>] - Delete the node or <property>\n"
|
2008-02-15 17:34:36 +08:00
|
|
|
"fdt header - Display header info\n"
|
|
|
|
"fdt bootcpu <id> - Set boot cpuid\n"
|
|
|
|
"fdt memory <addr> <size> - Add/Update memory node\n"
|
|
|
|
"fdt rsvmem print - Show current mem reserves\n"
|
|
|
|
"fdt rsvmem add <addr> <size> - Add a mem reserve\n"
|
|
|
|
"fdt rsvmem delete <index> - Delete a mem reserves\n"
|
2008-08-15 21:24:34 +08:00
|
|
|
"fdt chosen [<start> <end>] - Add/update the /chosen branch in the tree\n"
|
|
|
|
" <start>/<end> - initrd start/end addr\n"
|
2014-03-03 19:19:24 +08:00
|
|
|
#if defined(CONFIG_FIT_SIGNATURE)
|
|
|
|
"fdt checksign [<addr>] - check FIT signature\n"
|
|
|
|
" <start> - addr of key blob\n"
|
|
|
|
" default gd->fdt_blob\n"
|
|
|
|
#endif
|
2008-08-23 02:37:05 +08:00
|
|
|
"NOTE: Dereference aliases by omiting the leading '/', "
|
2012-10-29 21:34:31 +08:00
|
|
|
"e.g. fdt print ethernet0.";
|
|
|
|
#endif
|
|
|
|
|
|
|
|
U_BOOT_CMD(
|
|
|
|
fdt, 255, 0, do_fdt,
|
|
|
|
"flattened device tree utility commands", fdt_help_text
|
2007-04-01 00:22:10 +08:00
|
|
|
);
|