548767f42e
Currently, dtc will put the nonsense value 0xfeedbeef into the boot_cpuid_phys field of an output blob, unless explicitly given another value with the -b command line option. As well as being a totally unuseful default value, this also means that dtc won't properly preserve the boot_cpuid_phys field in -I dtb -O dtb mode. This patch reworks things to improve the boot_cpuid handling. The new semantics are that the output's boot_cpuid_phys value is: the value given on the command line if -b is used otherwise the value from the input, if in -I dtb mode otherwise 0 Implementation-wise we do the following: - boot_cpuid_phys is added to struct boot_info, so that structure now contains all of the blob's semantic information. - dt_to_blob() and dt_to_asm() output the cpuid given in boot_info - dt_from_blob() fills in boot_info based on the input blob - The other dt_from_*() functions just record 0, but we can change this easily if e.g. we invent a way of specifying the boot cpu in the source format. - main() overrides the cpuid in the boot_info between input and output if -b is given We add some testcases to check this new behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
92 lines
2.2 KiB
C
92 lines
2.2 KiB
C
/*
|
|
* (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation. 2005.
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*/
|
|
|
|
#include "dtc.h"
|
|
|
|
#include <dirent.h>
|
|
#include <sys/stat.h>
|
|
|
|
static struct node *read_fstree(const char *dirname)
|
|
{
|
|
DIR *d;
|
|
struct dirent *de;
|
|
struct stat st;
|
|
struct node *tree;
|
|
|
|
d = opendir(dirname);
|
|
if (!d)
|
|
die("Couldn't opendir() \"%s\": %s\n", dirname, strerror(errno));
|
|
|
|
tree = build_node(NULL, NULL);
|
|
|
|
while ((de = readdir(d)) != NULL) {
|
|
char *tmpnam;
|
|
|
|
if (streq(de->d_name, ".")
|
|
|| streq(de->d_name, ".."))
|
|
continue;
|
|
|
|
tmpnam = join_path(dirname, de->d_name);
|
|
|
|
if (lstat(tmpnam, &st) < 0)
|
|
die("stat(%s): %s\n", tmpnam, strerror(errno));
|
|
|
|
if (S_ISREG(st.st_mode)) {
|
|
struct property *prop;
|
|
FILE *pfile;
|
|
|
|
pfile = fopen(tmpnam, "r");
|
|
if (! pfile) {
|
|
fprintf(stderr,
|
|
"WARNING: Cannot open %s: %s\n",
|
|
tmpnam, strerror(errno));
|
|
} else {
|
|
prop = build_property(strdup(de->d_name),
|
|
data_copy_file(pfile,
|
|
st.st_size),
|
|
NULL);
|
|
add_property(tree, prop);
|
|
fclose(pfile);
|
|
}
|
|
} else if (S_ISDIR(st.st_mode)) {
|
|
struct node *newchild;
|
|
|
|
newchild = read_fstree(tmpnam);
|
|
newchild = name_node(newchild, strdup(de->d_name),
|
|
NULL);
|
|
add_child(tree, newchild);
|
|
}
|
|
|
|
free(tmpnam);
|
|
}
|
|
|
|
return tree;
|
|
}
|
|
|
|
struct boot_info *dt_from_fs(const char *dirname)
|
|
{
|
|
struct node *tree;
|
|
|
|
tree = read_fstree(dirname);
|
|
tree = name_node(tree, "", NULL);
|
|
|
|
return build_boot_info(NULL, tree, 0);
|
|
}
|
|
|