2009-03-31 13:57:36 +02:00
|
|
|
/*
|
2009-04-14 02:08:34 +02:00
|
|
|
* cbfstool
|
2009-03-31 13:57:36 +02:00
|
|
|
*
|
|
|
|
* Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
|
|
|
|
*
|
|
|
|
* 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; version 2 of the License.
|
|
|
|
*
|
|
|
|
* 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., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/mman.h>
|
|
|
|
#include <sys/wait.h>
|
2009-04-14 02:08:34 +02:00
|
|
|
#include "cbfstool.h"
|
2009-03-31 13:57:36 +02:00
|
|
|
|
|
|
|
#define MAX_PATH 255
|
|
|
|
|
|
|
|
static int add_from_fd(struct rom *rom, const char *name, int type, int fd)
|
|
|
|
{
|
|
|
|
unsigned char *buffer = malloc(16 * 1024);
|
|
|
|
unsigned char *ptr = buffer;
|
|
|
|
|
|
|
|
int size = 0;
|
|
|
|
int aloc = 16 * 1024;
|
|
|
|
int remain = 16 * 1024;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (buffer == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
ret = read(fd, ptr, remain);
|
|
|
|
|
|
|
|
if (ret <= 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
ptr += ret;
|
|
|
|
remain -= ret;
|
|
|
|
size += ret;
|
|
|
|
|
|
|
|
if (remain == 0) {
|
|
|
|
buffer = realloc(buffer, aloc + 16 * 1024);
|
|
|
|
|
|
|
|
if (buffer == NULL) {
|
|
|
|
ret = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
ptr = buffer + size;
|
|
|
|
|
|
|
|
aloc += (16 * 1024);
|
|
|
|
remain = 16 * 1024;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret == -1 || size == 0) {
|
|
|
|
|
|
|
|
if (buffer != NULL)
|
|
|
|
free(buffer);
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
This is transition code for cbfs to implement
cbfs files at fixed addresses.
I call this transitional as the approach I am taking is to add
capability to cbfstool but not change code in a way that will break
existing usages. Later, once we're sure nothing has broken, we can start to
smooth the edges.
Right now, fixed address file are only supported via the add command.
There is one additional command syntax, so, example:
cbfstool add rom romstrap optionrom 0xffffd000
Will add the file to that fix location for a romstrap.
The assumption is that the ROM is based at the end of a 32-bit address
space. As you can see from the code, that assumption can easily be
over-ridden, if we ever need to, with a command option.
Here is one example output result.
rminnich@xcpu2:~/src/bios/coreboot-v2/util/cbfstool$ ./cbfstool x.cbf print
x.cbf: 1024 kB, bootblocksize 32768, romsize 1048576, offset 0x0
Alignment: 16 bytes
Name Offset Type Size
h 0x0 optionrom 251
0x130 free 917120
h3 0xdffe0 optionrom 251
0xe0110 free 97960
The way this is implemented is pretty simple. I introduce a new
operator, split, that splits an unallocated area into two unallocated
areas. Then, allocation merely becomes a matter of 0, 1, or 2 splits:
0 split -- the free area is the exact fit
1 splits -- need to split some off the front or back
2 splits -- need to split off BOTH the front and back
I think you'll be able to see what I've done. I call this transitional
because, in the end state, we only need one allocate function; for now
I've left two in, to make sure I don't break compatibilty.
Why I like this better than ldscript approach: I like having the
ROMSTRAP located by cbfs, not linker scripts. For one thing, it makes
romstrap visible as a first class object. I think I would have latched
onto a problem I was having much more quickly had I remembered the
ROMSTRAP. It gets lost in the linker scripts.
At this point, we should be able to start removing special ROMSTRAP location
code from linker scripts.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4351 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2009-06-08 05:33:57 +02:00
|
|
|
ret = rom_add(rom, name, buffer, 0, size, type);
|
2009-03-31 13:57:36 +02:00
|
|
|
free(buffer);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int fork_tool_and_add(struct rom *rom, const char *tool, const char *input,
|
|
|
|
const char *name, int type, int argc, char **argv)
|
|
|
|
{
|
|
|
|
int output[2];
|
|
|
|
pid_t pid;
|
|
|
|
int ret;
|
|
|
|
int status;
|
|
|
|
char **toolargs;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Create the pipe */
|
|
|
|
|
|
|
|
if (pipe(output)) {
|
|
|
|
ERROR("Couldn't create a pipe: %m\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
toolargs = (char **)malloc((5 + argc) * sizeof(char *));
|
|
|
|
|
|
|
|
if (toolargs == NULL) {
|
|
|
|
ERROR("Unable to allocate memory: %m\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
toolargs[0] = (char *)tool;
|
|
|
|
|
|
|
|
/* these are args. So they need a - in front */
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
/* I wish I had python */
|
|
|
|
char *c = malloc(strlen(argv[i])) + 2;
|
|
|
|
c[0] = '-';
|
|
|
|
strcpy(&c[1], argv[i]);
|
|
|
|
c[strlen(argv[i])+1] = 0;
|
|
|
|
toolargs[1 + i] = c;
|
|
|
|
}
|
|
|
|
|
|
|
|
toolargs[1 + argc] = "-o";
|
|
|
|
toolargs[2 + argc] = "-";
|
|
|
|
toolargs[3 + argc] = (char *)input;
|
|
|
|
toolargs[4 + argc] = NULL;
|
|
|
|
|
|
|
|
pid = fork();
|
|
|
|
|
|
|
|
if (pid == 0) {
|
|
|
|
|
|
|
|
/* Set up stdin/stdout for the child */
|
|
|
|
|
|
|
|
dup2(output[1], STDOUT_FILENO);
|
|
|
|
close(output[0]);
|
|
|
|
|
|
|
|
/* Execute the tool */
|
|
|
|
if (execv(tool, toolargs)) {
|
|
|
|
ERROR("Unable to execute %s: %m\n", tool);
|
|
|
|
exit(-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(toolargs);
|
|
|
|
|
|
|
|
close(output[1]);
|
|
|
|
|
|
|
|
/* Read from the file */
|
|
|
|
ret = add_from_fd(rom, name, type, output[0]);
|
|
|
|
|
|
|
|
/* Reap the child */
|
|
|
|
waitpid(pid, &status, 0);
|
|
|
|
|
|
|
|
if (WIFSIGNALED(status)) {
|
|
|
|
kill(pid, WTERMSIG(status));
|
|
|
|
ERROR("Error while executing %s\n", tool);
|
|
|
|
return -1;
|
|
|
|
} else if (WEXITSTATUS(status) != 0) {
|
|
|
|
ERROR("Error while executing %s: %d\n", tool,
|
|
|
|
(int)WEXITSTATUS(status));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int add_blob(struct rom *rom, const char *filename,
|
This is transition code for cbfs to implement
cbfs files at fixed addresses.
I call this transitional as the approach I am taking is to add
capability to cbfstool but not change code in a way that will break
existing usages. Later, once we're sure nothing has broken, we can start to
smooth the edges.
Right now, fixed address file are only supported via the add command.
There is one additional command syntax, so, example:
cbfstool add rom romstrap optionrom 0xffffd000
Will add the file to that fix location for a romstrap.
The assumption is that the ROM is based at the end of a 32-bit address
space. As you can see from the code, that assumption can easily be
over-ridden, if we ever need to, with a command option.
Here is one example output result.
rminnich@xcpu2:~/src/bios/coreboot-v2/util/cbfstool$ ./cbfstool x.cbf print
x.cbf: 1024 kB, bootblocksize 32768, romsize 1048576, offset 0x0
Alignment: 16 bytes
Name Offset Type Size
h 0x0 optionrom 251
0x130 free 917120
h3 0xdffe0 optionrom 251
0xe0110 free 97960
The way this is implemented is pretty simple. I introduce a new
operator, split, that splits an unallocated area into two unallocated
areas. Then, allocation merely becomes a matter of 0, 1, or 2 splits:
0 split -- the free area is the exact fit
1 splits -- need to split some off the front or back
2 splits -- need to split off BOTH the front and back
I think you'll be able to see what I've done. I call this transitional
because, in the end state, we only need one allocate function; for now
I've left two in, to make sure I don't break compatibilty.
Why I like this better than ldscript approach: I like having the
ROMSTRAP located by cbfs, not linker scripts. For one thing, it makes
romstrap visible as a first class object. I think I would have latched
onto a problem I was having much more quickly had I remembered the
ROMSTRAP. It gets lost in the linker scripts.
At this point, we should be able to start removing special ROMSTRAP location
code from linker scripts.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4351 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2009-06-08 05:33:57 +02:00
|
|
|
const char *name, unsigned long address, int type)
|
2009-03-31 13:57:36 +02:00
|
|
|
{
|
|
|
|
void *ptr;
|
|
|
|
struct stat s;
|
|
|
|
int fd, ret;
|
|
|
|
|
|
|
|
if (!strcmp(filename, "-"))
|
|
|
|
return add_from_fd(rom, name, type, 0);
|
|
|
|
|
|
|
|
fd = open(filename, O_RDONLY);
|
|
|
|
|
|
|
|
if (fd == -1) {
|
|
|
|
ERROR("Could not open %s: %m\n", filename);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fstat(fd, &s)) {
|
|
|
|
ERROR("Could not stat %s: %m\n", filename);
|
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ptr = mmap(0, s.st_size, PROT_READ, MAP_SHARED, fd, 0);
|
|
|
|
|
|
|
|
if (ptr == MAP_FAILED) {
|
|
|
|
ERROR("Unable to map %s: %m\n", filename);
|
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
This is transition code for cbfs to implement
cbfs files at fixed addresses.
I call this transitional as the approach I am taking is to add
capability to cbfstool but not change code in a way that will break
existing usages. Later, once we're sure nothing has broken, we can start to
smooth the edges.
Right now, fixed address file are only supported via the add command.
There is one additional command syntax, so, example:
cbfstool add rom romstrap optionrom 0xffffd000
Will add the file to that fix location for a romstrap.
The assumption is that the ROM is based at the end of a 32-bit address
space. As you can see from the code, that assumption can easily be
over-ridden, if we ever need to, with a command option.
Here is one example output result.
rminnich@xcpu2:~/src/bios/coreboot-v2/util/cbfstool$ ./cbfstool x.cbf print
x.cbf: 1024 kB, bootblocksize 32768, romsize 1048576, offset 0x0
Alignment: 16 bytes
Name Offset Type Size
h 0x0 optionrom 251
0x130 free 917120
h3 0xdffe0 optionrom 251
0xe0110 free 97960
The way this is implemented is pretty simple. I introduce a new
operator, split, that splits an unallocated area into two unallocated
areas. Then, allocation merely becomes a matter of 0, 1, or 2 splits:
0 split -- the free area is the exact fit
1 splits -- need to split some off the front or back
2 splits -- need to split off BOTH the front and back
I think you'll be able to see what I've done. I call this transitional
because, in the end state, we only need one allocate function; for now
I've left two in, to make sure I don't break compatibilty.
Why I like this better than ldscript approach: I like having the
ROMSTRAP located by cbfs, not linker scripts. For one thing, it makes
romstrap visible as a first class object. I think I would have latched
onto a problem I was having much more quickly had I remembered the
ROMSTRAP. It gets lost in the linker scripts.
At this point, we should be able to start removing special ROMSTRAP location
code from linker scripts.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4351 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2009-06-08 05:33:57 +02:00
|
|
|
ret = rom_add(rom, name, ptr, address, s.st_size, type);
|
2009-03-31 13:57:36 +02:00
|
|
|
|
|
|
|
munmap(ptr, s.st_size);
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void add_usage(void)
|
|
|
|
{
|
This is transition code for cbfs to implement
cbfs files at fixed addresses.
I call this transitional as the approach I am taking is to add
capability to cbfstool but not change code in a way that will break
existing usages. Later, once we're sure nothing has broken, we can start to
smooth the edges.
Right now, fixed address file are only supported via the add command.
There is one additional command syntax, so, example:
cbfstool add rom romstrap optionrom 0xffffd000
Will add the file to that fix location for a romstrap.
The assumption is that the ROM is based at the end of a 32-bit address
space. As you can see from the code, that assumption can easily be
over-ridden, if we ever need to, with a command option.
Here is one example output result.
rminnich@xcpu2:~/src/bios/coreboot-v2/util/cbfstool$ ./cbfstool x.cbf print
x.cbf: 1024 kB, bootblocksize 32768, romsize 1048576, offset 0x0
Alignment: 16 bytes
Name Offset Type Size
h 0x0 optionrom 251
0x130 free 917120
h3 0xdffe0 optionrom 251
0xe0110 free 97960
The way this is implemented is pretty simple. I introduce a new
operator, split, that splits an unallocated area into two unallocated
areas. Then, allocation merely becomes a matter of 0, 1, or 2 splits:
0 split -- the free area is the exact fit
1 splits -- need to split some off the front or back
2 splits -- need to split off BOTH the front and back
I think you'll be able to see what I've done. I call this transitional
because, in the end state, we only need one allocate function; for now
I've left two in, to make sure I don't break compatibilty.
Why I like this better than ldscript approach: I like having the
ROMSTRAP located by cbfs, not linker scripts. For one thing, it makes
romstrap visible as a first class object. I think I would have latched
onto a problem I was having much more quickly had I remembered the
ROMSTRAP. It gets lost in the linker scripts.
At this point, we should be able to start removing special ROMSTRAP location
code from linker scripts.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4351 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2009-06-08 05:33:57 +02:00
|
|
|
printf("add FILE NAME TYPE [base address]\tAdd a component\n");
|
2009-03-31 13:57:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void add_stage_usage(void)
|
|
|
|
{
|
2009-05-08 21:39:15 +02:00
|
|
|
printf("add-stage FILE NAME [OPTIONS]\tAdd a stage to the ROM\n");
|
2009-03-31 13:57:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void add_payload_usage(void)
|
|
|
|
{
|
|
|
|
printf
|
2009-05-08 21:39:15 +02:00
|
|
|
("add-payload FILE NAME [OPTIONS]\tAdd a payload to the ROM\n");
|
2009-03-31 13:57:36 +02:00
|
|
|
}
|
|
|
|
|
2009-05-13 22:08:28 +02:00
|
|
|
int select_component_type(char *s)
|
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
char *accepted_strings[] = {
|
|
|
|
"stage",
|
|
|
|
"payload",
|
|
|
|
"optionrom",
|
|
|
|
"deleted",
|
|
|
|
"free",
|
|
|
|
};
|
|
|
|
for (i=0; i < 5; i++)
|
|
|
|
if (!strcmp(s, accepted_strings[i]))
|
|
|
|
return i;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-03-31 13:57:36 +02:00
|
|
|
int add_handler(struct rom *rom, int argc, char **argv)
|
|
|
|
{
|
2009-04-14 02:08:34 +02:00
|
|
|
unsigned int type = CBFS_COMPONENT_NULL;
|
2009-06-18 18:38:35 +02:00
|
|
|
unsigned long address = 0;
|
2009-03-31 13:57:36 +02:00
|
|
|
|
This is transition code for cbfs to implement
cbfs files at fixed addresses.
I call this transitional as the approach I am taking is to add
capability to cbfstool but not change code in a way that will break
existing usages. Later, once we're sure nothing has broken, we can start to
smooth the edges.
Right now, fixed address file are only supported via the add command.
There is one additional command syntax, so, example:
cbfstool add rom romstrap optionrom 0xffffd000
Will add the file to that fix location for a romstrap.
The assumption is that the ROM is based at the end of a 32-bit address
space. As you can see from the code, that assumption can easily be
over-ridden, if we ever need to, with a command option.
Here is one example output result.
rminnich@xcpu2:~/src/bios/coreboot-v2/util/cbfstool$ ./cbfstool x.cbf print
x.cbf: 1024 kB, bootblocksize 32768, romsize 1048576, offset 0x0
Alignment: 16 bytes
Name Offset Type Size
h 0x0 optionrom 251
0x130 free 917120
h3 0xdffe0 optionrom 251
0xe0110 free 97960
The way this is implemented is pretty simple. I introduce a new
operator, split, that splits an unallocated area into two unallocated
areas. Then, allocation merely becomes a matter of 0, 1, or 2 splits:
0 split -- the free area is the exact fit
1 splits -- need to split some off the front or back
2 splits -- need to split off BOTH the front and back
I think you'll be able to see what I've done. I call this transitional
because, in the end state, we only need one allocate function; for now
I've left two in, to make sure I don't break compatibilty.
Why I like this better than ldscript approach: I like having the
ROMSTRAP located by cbfs, not linker scripts. For one thing, it makes
romstrap visible as a first class object. I think I would have latched
onto a problem I was having much more quickly had I remembered the
ROMSTRAP. It gets lost in the linker scripts.
At this point, we should be able to start removing special ROMSTRAP location
code from linker scripts.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4351 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2009-06-08 05:33:57 +02:00
|
|
|
if ((argc < 3) || (argc > 4)) {
|
2009-03-31 13:57:36 +02:00
|
|
|
add_usage();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
This is transition code for cbfs to implement
cbfs files at fixed addresses.
I call this transitional as the approach I am taking is to add
capability to cbfstool but not change code in a way that will break
existing usages. Later, once we're sure nothing has broken, we can start to
smooth the edges.
Right now, fixed address file are only supported via the add command.
There is one additional command syntax, so, example:
cbfstool add rom romstrap optionrom 0xffffd000
Will add the file to that fix location for a romstrap.
The assumption is that the ROM is based at the end of a 32-bit address
space. As you can see from the code, that assumption can easily be
over-ridden, if we ever need to, with a command option.
Here is one example output result.
rminnich@xcpu2:~/src/bios/coreboot-v2/util/cbfstool$ ./cbfstool x.cbf print
x.cbf: 1024 kB, bootblocksize 32768, romsize 1048576, offset 0x0
Alignment: 16 bytes
Name Offset Type Size
h 0x0 optionrom 251
0x130 free 917120
h3 0xdffe0 optionrom 251
0xe0110 free 97960
The way this is implemented is pretty simple. I introduce a new
operator, split, that splits an unallocated area into two unallocated
areas. Then, allocation merely becomes a matter of 0, 1, or 2 splits:
0 split -- the free area is the exact fit
1 splits -- need to split some off the front or back
2 splits -- need to split off BOTH the front and back
I think you'll be able to see what I've done. I call this transitional
because, in the end state, we only need one allocate function; for now
I've left two in, to make sure I don't break compatibilty.
Why I like this better than ldscript approach: I like having the
ROMSTRAP located by cbfs, not linker scripts. For one thing, it makes
romstrap visible as a first class object. I think I would have latched
onto a problem I was having much more quickly had I remembered the
ROMSTRAP. It gets lost in the linker scripts.
At this point, we should be able to start removing special ROMSTRAP location
code from linker scripts.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4351 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2009-06-08 05:33:57 +02:00
|
|
|
if (argc > 3) {
|
|
|
|
address = strtoul(argv[3], 0, 0);
|
|
|
|
}
|
|
|
|
|
2009-03-31 13:57:36 +02:00
|
|
|
if (!rom_exists(rom)) {
|
|
|
|
ERROR("You need to create the ROM before adding files to it\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* There are two ways to specify the type - a string or a number */
|
|
|
|
|
2009-05-08 21:39:15 +02:00
|
|
|
if (isdigit(*(argv[2])))
|
|
|
|
type = strtoul(argv[2], 0, 0);
|
|
|
|
else {
|
2009-07-26 17:11:53 +02:00
|
|
|
switch(select_component_type(argv[2])) {
|
2009-05-13 22:08:28 +02:00
|
|
|
case 0:
|
|
|
|
type = CBFS_COMPONENT_STAGE;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
type = CBFS_COMPONENT_PAYLOAD;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
type = CBFS_COMPONENT_OPTIONROM;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
type = CBFS_COMPONENT_DELETED;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
type = CBFS_COMPONENT_NULL;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ERROR("Unrecognized component type %s.\nValid options are: stage, payload, optionrom, deleted, free.\n", argv[2]);
|
|
|
|
return -1;
|
|
|
|
}
|
2009-03-31 13:57:36 +02:00
|
|
|
}
|
|
|
|
|
This is transition code for cbfs to implement
cbfs files at fixed addresses.
I call this transitional as the approach I am taking is to add
capability to cbfstool but not change code in a way that will break
existing usages. Later, once we're sure nothing has broken, we can start to
smooth the edges.
Right now, fixed address file are only supported via the add command.
There is one additional command syntax, so, example:
cbfstool add rom romstrap optionrom 0xffffd000
Will add the file to that fix location for a romstrap.
The assumption is that the ROM is based at the end of a 32-bit address
space. As you can see from the code, that assumption can easily be
over-ridden, if we ever need to, with a command option.
Here is one example output result.
rminnich@xcpu2:~/src/bios/coreboot-v2/util/cbfstool$ ./cbfstool x.cbf print
x.cbf: 1024 kB, bootblocksize 32768, romsize 1048576, offset 0x0
Alignment: 16 bytes
Name Offset Type Size
h 0x0 optionrom 251
0x130 free 917120
h3 0xdffe0 optionrom 251
0xe0110 free 97960
The way this is implemented is pretty simple. I introduce a new
operator, split, that splits an unallocated area into two unallocated
areas. Then, allocation merely becomes a matter of 0, 1, or 2 splits:
0 split -- the free area is the exact fit
1 splits -- need to split some off the front or back
2 splits -- need to split off BOTH the front and back
I think you'll be able to see what I've done. I call this transitional
because, in the end state, we only need one allocate function; for now
I've left two in, to make sure I don't break compatibilty.
Why I like this better than ldscript approach: I like having the
ROMSTRAP located by cbfs, not linker scripts. For one thing, it makes
romstrap visible as a first class object. I think I would have latched
onto a problem I was having much more quickly had I remembered the
ROMSTRAP. It gets lost in the linker scripts.
At this point, we should be able to start removing special ROMSTRAP location
code from linker scripts.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4351 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2009-06-08 05:33:57 +02:00
|
|
|
return add_blob(rom, argv[0], argv[1], address, type);
|
2009-03-31 13:57:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
char *find_tool(char *tool)
|
|
|
|
{
|
|
|
|
static char toolpath[MAX_PATH];
|
2009-04-14 02:08:34 +02:00
|
|
|
extern char cbfstool_bindir[];
|
2009-03-31 13:57:36 +02:00
|
|
|
|
|
|
|
snprintf(toolpath, MAX_PATH - 1, "tools/%s", tool);
|
|
|
|
if (!access(toolpath, X_OK))
|
|
|
|
return toolpath;
|
|
|
|
|
2009-04-14 02:08:34 +02:00
|
|
|
snprintf(toolpath, MAX_PATH - 1, "%s/tools/%s", cbfstool_bindir, tool);
|
2009-03-31 13:57:36 +02:00
|
|
|
|
|
|
|
if (!access(toolpath, X_OK))
|
|
|
|
return toolpath;
|
|
|
|
|
2009-04-14 02:08:34 +02:00
|
|
|
snprintf(toolpath, MAX_PATH - 1, "%s/%s", cbfstool_bindir, tool);
|
2009-03-31 13:57:36 +02:00
|
|
|
|
|
|
|
if (!access(toolpath, X_OK))
|
|
|
|
return toolpath;
|
|
|
|
|
|
|
|
strncpy(toolpath, tool, MAX_PATH - 1);
|
|
|
|
return toolpath;
|
|
|
|
}
|
|
|
|
|
2009-04-14 21:48:32 +02:00
|
|
|
/* Invoke the cbfs-mkpayload utility */
|
2009-03-31 13:57:36 +02:00
|
|
|
|
|
|
|
int add_payload_handler(struct rom *rom, int argc, char **argv)
|
|
|
|
{
|
|
|
|
if (argc < 2) {
|
|
|
|
add_payload_usage();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make sure the ROM exists */
|
|
|
|
|
|
|
|
if (!rom_exists(rom)) {
|
|
|
|
ERROR("You need to create the ROM before adding files to it\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check that the incoming file exists */
|
|
|
|
|
|
|
|
if (access(argv[0], R_OK)) {
|
|
|
|
ERROR("File %s does not exist\n", argv[0]);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-04-14 21:48:32 +02:00
|
|
|
return fork_tool_and_add(rom, find_tool("cbfs-mkpayload"), argv[0],
|
2009-04-14 02:08:34 +02:00
|
|
|
argv[1], CBFS_COMPONENT_PAYLOAD, argc - 2,
|
2009-03-31 13:57:36 +02:00
|
|
|
argc > 2 ? &argv[2] : NULL);
|
|
|
|
}
|
|
|
|
|
2009-04-14 21:48:32 +02:00
|
|
|
/* Invoke the cbfs-mkstage utility */
|
2009-03-31 13:57:36 +02:00
|
|
|
|
|
|
|
int add_stage_handler(struct rom *rom, int argc, char **argv)
|
|
|
|
{
|
|
|
|
if (argc < 2) {
|
|
|
|
add_stage_usage();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make sure the ROM exists */
|
|
|
|
|
|
|
|
if (!rom_exists(rom)) {
|
|
|
|
ERROR("You need to create the ROM before adding files to it\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check that the incoming file exists */
|
|
|
|
|
|
|
|
if (access(argv[0], R_OK)) {
|
|
|
|
ERROR("File %s does not exist\n", argv[0]);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-04-14 21:48:32 +02:00
|
|
|
return fork_tool_and_add(rom, find_tool("cbfs-mkstage"), argv[0],
|
2009-04-14 02:08:34 +02:00
|
|
|
argv[1], CBFS_COMPONENT_STAGE, argc - 2,
|
2009-03-31 13:57:36 +02:00
|
|
|
argc > 2 ? &argv[2] : NULL);
|
|
|
|
}
|