summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/ti/am335x/Makefile.inc10
-rw-r--r--src/soc/ti/am335x/bootblock_media.c2
-rw-r--r--src/soc/ti/am335x/header.c2
-rw-r--r--src/soc/ti/am335x/memlayout.ld5
4 files changed, 9 insertions, 10 deletions
diff --git a/src/soc/ti/am335x/Makefile.inc b/src/soc/ti/am335x/Makefile.inc
index 2865338217..e744c72526 100644
--- a/src/soc/ti/am335x/Makefile.inc
+++ b/src/soc/ti/am335x/Makefile.inc
@@ -30,17 +30,13 @@ real-target: $(obj)/MLO
header_ld := $(call src-to-obj,omap-header,$(dir)/header.ld)
get_header_size= \
- $(eval omap_header_info=$(shell $(CBFSTOOL) $(1) print | grep $(2))) \
- $(shell echo $$(($(word 2,$(omap_header_info)) + \
- $(word 4,$(omap_header_info)))))
+ $(shell echo $$(wc -c < $(objcbfs)/bootblock.bin))
-$(obj)/omap-header.bin: $$(omap-header-objs) $(obj)/coreboot.rom
+$(obj)/omap-header.bin: $$(omap-header-objs) $(objcbfs)/bootblock.bin
@printf " CC $(subst $(obj)/,,$(@))\n"
$(CC_omap-header) -nostdlib -nostartfiles -static -include $(obj)/config.h \
-Wl,--defsym,header_load_size=$(strip \
- $(call get_header_size,$(obj)/coreboot.rom, \
- $(CONFIG_CBFS_PREFIX)/romstage \
- ) \
+ $(call get_header_size,$(obj)/coreboot.rom) \
) \
-o $@.tmp $< -T $(header_ld)
$(OBJCOPY_omap-header) --only-section=".header" -O binary $@.tmp $@
diff --git a/src/soc/ti/am335x/bootblock_media.c b/src/soc/ti/am335x/bootblock_media.c
index 050e0b77da..1c65c38684 100644
--- a/src/soc/ti/am335x/bootblock_media.c
+++ b/src/soc/ti/am335x/bootblock_media.c
@@ -5,7 +5,7 @@
/* FIXME: No idea how big the internal SRAM actually is. */
static const struct mem_region_device boot_dev =
- MEM_REGION_DEV_RO_INIT(_dram, CONFIG_ROM_SIZE);
+ MEM_REGION_DEV_RO_INIT(_sram, CONFIG_ROM_SIZE);
const struct region_device *boot_device_ro(void)
{
diff --git a/src/soc/ti/am335x/header.c b/src/soc/ti/am335x/header.c
index 9edfdd062b..c0a7589abd 100644
--- a/src/soc/ti/am335x/header.c
+++ b/src/soc/ti/am335x/header.c
@@ -52,6 +52,6 @@ struct omap_image_headers headers __attribute__((section(".header"))) = {
},
.image_header = {
.size = (uintptr_t)&header_load_size,
- .destination = (uintptr_t)_dram
+ .destination = (uintptr_t)_sram
}
};
diff --git a/src/soc/ti/am335x/memlayout.ld b/src/soc/ti/am335x/memlayout.ld
index 78528e63b7..991e4012a4 100644
--- a/src/soc/ti/am335x/memlayout.ld
+++ b/src/soc/ti/am335x/memlayout.ld
@@ -6,11 +6,14 @@
SECTIONS
{
- DRAM_START(0x40000000)
+ SRAM_START(0x402f0400)
BOOTBLOCK(0x402f0400, 20K)
ROMSTAGE(0x402f5400, 88K)
FMAP_CACHE(0x4030b400, 2K)
STACK(0x4030be00, 4K)
+ SRAM_END(0x40310000)
+ DRAM_START(0x80000000)
+
RAMSTAGE(0x80200000, 192K)
/* TODO: Implement MMU support and move TTB to a better location. */