summaryrefslogtreecommitdiff
path: root/src/cpu/ti
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-05-15 23:39:23 -0500
committerPatrick Georgi <pgeorgi@google.com>2015-06-02 14:09:31 +0200
commit899d13d0dff9e7495eb17950f19431e9bd344b2f (patch)
tree8901845fc299126a7125ff19fe1f7bde17e3f305 /src/cpu/ti
parent68bdd00799c7b2b25f265fa9e31beb709c877eb6 (diff)
downloadcoreboot-899d13d0dff9e7495eb17950f19431e9bd344b2f.tar.xz
cbfs: new API and better program loading
A new CBFS API is introduced to allow making CBFS access easier for providing multiple CBFS sources. That is achieved by decoupling the cbfs source from a CBFS file. A CBFS source is described by a descriptor. It contains the necessary properties for walking a CBFS to locate a file. The CBFS file is then decoupled from the CBFS descriptor in that it's no longer needed to access the contents of the file. All of this is accomplished using the regions infrastructure by repsenting CBFS sources and files as region_devices. Because region_devices can be chained together forming subregions this allows one to decouple a CBFS source from a file. This also allows one to provide CBFS files that came from other sources for payload and/or stage loading. The program loading takes advantage of those very properties by allowing multiple sources for locating a program. Because of this we can reduce the overhead of loading programs because it's all done in the common code paths. Only locating the program is per source. Change-Id: I339b84fce95f03d1dbb63a0f54a26be5eb07f7c8 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/9134 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/cpu/ti')
-rw-r--r--src/cpu/ti/am335x/bootblock_media.c71
-rw-r--r--src/cpu/ti/am335x/nand.c8
2 files changed, 3 insertions, 76 deletions
diff --git a/src/cpu/ti/am335x/bootblock_media.c b/src/cpu/ti/am335x/bootblock_media.c
index 79724eea5d..0a8ccb696c 100644
--- a/src/cpu/ti/am335x/bootblock_media.c
+++ b/src/cpu/ti/am335x/bootblock_media.c
@@ -18,80 +18,13 @@
*/
#include <boot_device.h>
-#include <cbfs.h>
-#include <console/console.h>
-#include <string.h>
#include <symbols.h>
/* FIXME: No idea how big the internal SRAM actually is. */
-static const struct mem_region_device gboot_dev =
+static const struct mem_region_device boot_dev =
MEM_REGION_DEV_INIT(_dram, CONFIG_ROM_SIZE);
const struct region_device *boot_device_ro(void)
{
- return &gboot_dev.rdev;
-}
-
-static int dummy_open(struct cbfs_media *media)
-{
- return 0;
-}
-
-static int dummy_close(struct cbfs_media *media)
-{
- return 0;
-}
-
-static void * on_chip_memory_map(struct cbfs_media *media, size_t offset,
- size_t count)
-{
- const struct region_device *boot_dev;
- void *ptr;
-
- boot_dev = media->context;
-
- ptr = rdev_mmap(boot_dev, offset, count);
-
- if (ptr == NULL)
- return (void *)-1;
-
- return ptr;
-}
-
-static void * dummy_unmap(struct cbfs_media *media, const void *address)
-{
- const struct region_device *boot_dev;
-
- boot_dev = media->context;
-
- rdev_munmap(boot_dev, (void *)address);
-
- return NULL;
-}
-
-static size_t on_chip_memory_read(struct cbfs_media *media, void *dest,
- size_t offset, size_t count)
-{
- const struct region_device *boot_dev;
-
- boot_dev = media->context;
-
- if (rdev_readat(boot_dev, dest, offset, count) < 0)
- return 0;
-
- return count;
-}
-
-int init_default_cbfs_media(struct cbfs_media *media)
-{
- boot_device_init();
-
- media->context = (void *)boot_device_ro();
- media->open = dummy_open;
- media->close = dummy_close;
- media->map = on_chip_memory_map;
- media->unmap = dummy_unmap;
- media->read = on_chip_memory_read;
-
- return 0;
+ return &boot_dev.rdev;
}
diff --git a/src/cpu/ti/am335x/nand.c b/src/cpu/ti/am335x/nand.c
index dd05fb6dee..4ac359da59 100644
--- a/src/cpu/ti/am335x/nand.c
+++ b/src/cpu/ti/am335x/nand.c
@@ -18,15 +18,9 @@
*/
#include <boot_device.h>
-#include <cbfs.h>
const struct region_device *boot_device_ro(void)
{
- return NULL;
-}
-
-int init_default_cbfs_media(struct cbfs_media *media)
-{
/* FIXME: add support for reading coreboot from NAND */
- return -1;
+ return NULL;
}