Commit 51a68cb7 authored by David Vrabel's avatar David Vrabel

arm: link a device tree blob into the xen image

Link a device tree blob (DTB) into the xen image.  This is loaded
immediately after Xen and xen_start() is called with the correct
address in atag_paddr.

The DTB file must be supplied by setting the CONFIG_DTB_FILE variable
in .config or on the make command line.
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Acked-by: default avatarTim Deegan <tim@xen.org>
Committed-by: default avatarIan Campbell <ian.campbell@citrix.com>
parent 4310edf1
......@@ -16,3 +16,9 @@ LDFLAGS_DIRECT_Linux = _linux
LDFLAGS_DIRECT += -marmelf$(LDFLAGS_DIRECT_$(XEN_OS))_eabi
CONFIG_LOAD_ADDRESS ?= 0x80000000
# XXX: When running on the model there is no bootloader to provide a
# device tree. It must be linked into Xen.
ifndef CONFIG_DTB_FILE
$(error CONFIG_DTB_FILE must be set to the absolute filename of a DTB)
endif
......@@ -22,12 +22,17 @@ obj-y += vtimer.o
#obj-bin-y += ....o
ifdef CONFIG_DTB_FILE
obj-y += dtb.o
AFLAGS += -DCONFIG_DTB_FILE=\"$(CONFIG_DTB_FILE)\"
endif
ALL_OBJS := head.o $(ALL_OBJS)
$(TARGET): $(TARGET)-syms
# XXX: VE model loads by VMA so instead of
# making a proper ELF we link with LMA == VMA and adjust crudely
$(OBJCOPY) --change-addresses +0x7fe00000 $< $@
$(OBJCOPY) --change-addresses +0x80000000 $< $@
# XXX strip it
#$(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32
......@@ -71,6 +76,8 @@ xen.lds: xen.lds.S
sed -e 's/xen\.lds\.o:/xen\.lds:/g' <.xen.lds.d >.xen.lds.d.new
mv -f .xen.lds.d.new .xen.lds.d
dtb.o: $(CONFIG_DTB_FILE)
.PHONY: clean
clean::
rm -f asm-offsets.s xen.lds
......
.section .dtb,#alloc
.incbin CONFIG_DTB_FILE
......@@ -55,6 +55,12 @@ start:
adr r9, start /* r9 := paddr (start) */
sub r10, r9, r0 /* r10 := phys-offset */
/* Using the DTB in the .dtb section? */
#ifdef CONFIG_DTB_FILE
ldr r8, =_sdtb
add r8, r10 /* r8 := paddr(DTB) */
#endif
#ifdef EARLY_UART_ADDRESS
/* Say hello */
ldr r11, =EARLY_UART_ADDRESS /* r11 := UART base address */
......
......@@ -122,6 +122,10 @@ SECTIONS
} :text
_end = . ;
/* Section for the device tree blob (if any). */
_sdtb = .;
.dtb : { *(.dtb) } :text
/* Sections to be discarded */
/DISCARD/ : {
*(.exit.text)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment