Skip to content

Commit

Permalink
c6x: use common built-in dtb support
Browse files Browse the repository at this point in the history
Using the common build support for built-in dtb files just requires
adding a .dtb.o target to obj-y.

The dtb now needs to be copied when unflattened because an init section
is used now.

Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
Cc: linux-c6x-dev@linux-c6x.org
Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
Rob Herring committed Oct 2, 2018
1 parent a91c614 commit be7cd2d
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 25 deletions.
11 changes: 1 addition & 10 deletions arch/c6x/boot/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,5 @@
DTC_FLAGS ?= -p 1024

ifneq ($(DTB),)
obj-y += linked_dtb.o
obj-y += $(DTB).dtb.o
endif

quiet_cmd_cp = CP $< $@$2
cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)

# Generate builtin.dtb from $(DTB).dtb
$(obj)/builtin.dtb: $(obj)/$(DTB).dtb
$(call if_changed,cp)

$(obj)/linked_dtb.o: $(obj)/builtin.dtb
2 changes: 0 additions & 2 deletions arch/c6x/boot/dts/linked_dtb.S

This file was deleted.

1 change: 0 additions & 1 deletion arch/c6x/include/asm/sections.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ extern char _vectors_start[];
extern char _vectors_end[];

extern char _data_lma[];
extern char _fdt_start[], _fdt_end[];

#endif /* _ASM_C6X_SECTIONS_H */
4 changes: 2 additions & 2 deletions arch/c6x/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ int __init c6x_add_memory(phys_addr_t start, unsigned long size)
notrace void __init machine_init(unsigned long dt_ptr)
{
void *dtb = __va(dt_ptr);
void *fdt = _fdt_start;
void *fdt = __dtb_start;

/* interrupts must be masked */
set_creg(IER, 2);
Expand Down Expand Up @@ -363,7 +363,7 @@ void __init setup_arch(char **cmdline_p)
memory_end >> PAGE_SHIFT);
memblock_reserve(memory_start, bootmap_size);

unflatten_device_tree();
unflatten_and_copy_device_tree();

c6x_cache_init();

Expand Down
10 changes: 0 additions & 10 deletions arch/c6x/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,6 @@ SECTIONS
*(.switch)
}

. = ALIGN (8) ;
__fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET)
{
_fdt_start = . ; /* place for fdt blob */
*(__fdt_blob) ; /* Any link-placed DTB */
BYTE(0); /* section always has contents */
. = _fdt_start + 0x4000; /* Pad up to 16kbyte */
_fdt_end = . ;
}

_etext = .;

/*
Expand Down

0 comments on commit be7cd2d

Please sign in to comment.