From patchwork Mon Sep 10 15:03:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146330 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595454ljw; Mon, 10 Sep 2018 08:04:22 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYjcNGM68t12S7EtbNUDV8cVrAE2IULDxiNAy1dJVjx0OBao7vqILftaxPKtYHCo3DTTRa3 X-Received: by 2002:a17:902:3a2:: with SMTP id d31-v6mr22339998pld.287.1536591862446; Mon, 10 Sep 2018 08:04:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591862; cv=none; d=google.com; s=arc-20160816; b=YyEak+LRensgRDgR946cRAmv4rhhnNK57C6ulL23hYaiMPS6H9qEDYlPVKC0rJTgV+ fMl/kEjWN/m3RGN5Yr6enfRnptBTp+aT9dOwhdC8l/ZftIAIOqBkspJatFBv1EcRAvpv do51xpAgsLunK7HoJqpyMLt9YhRci/Zc0PZ1XdTFwgXZ+U7/3GkPUxILpf7pVCOEuqhs DuXr9rZ3TYDTwxCyu+N3X5d5zku4954e6IzVdcLluRed9Nx08tm1d1lljyV5ZHaMM/2q rB2o2M9C7feOCLXKT7PPU0a8+Fp9CvojuPN5pBlzmyCKeaVnmWVP2EMj5iJWWlQlcN4+ a7Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=OFEEaVtg96Vzr+wRENqq56ej9KS7VctFB/C9wMh58yU=; b=nDaz40qmCjxqX8/0QrmV2AoWr3i7tfSGn2AU2jWZf0njl+DOWwG+a5FgS/ZtMxEr26 +2Nh/4H9Wh86ywT7FVnxzC1s4tFtg0pOtg3vswWXzXwuEVHh4BKgbR81FpIGkre4IPgr QkhwupH/Qx2sQITXYAbwi43+OnLizw9UxJNTvucEzPyyd1au6qqA0hS2YHQC5uL1NpdN tX3TdRqN7B81BA5caYMUiZST8u8JhL7BcRE5TwlF9owTSAVvK1RWuLcdTfL9jGElxDro Sq5hNmCPhJbukdkYTGwB/ISI/otYQznLxh53d+xK1+6Ye/Sgr019TQN/oKstKMmwMdF+ Bc+w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d10-v6si17142965pla.436.2018.09.10.08.04.22; Mon, 10 Sep 2018 08:04:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728819AbeIJT6u (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:50 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:38848 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728362AbeIJT6s (ORCPT ); Mon, 10 Sep 2018 15:58:48 -0400 Received: by mail-oi0-f68.google.com with SMTP id x197-v6so40749879oix.5; Mon, 10 Sep 2018 08:04:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OFEEaVtg96Vzr+wRENqq56ej9KS7VctFB/C9wMh58yU=; b=ES7gQdL0fAyRZoWgzsoK5uwOjhIPd3NzwHhHUEGjm/SSViBYiqbi8+M9xhw0rdiEzj 8/KdG1HcfaSJb5jTON5uIWtPB2mipTYerQ1AXmoBf45nHVitNEU+cpX9U6ocKyyLOany ujWfC4A0nixeOxGnrCf04c1w9ywtjwrkUwrzminZfW4XP22YVTLh2gIs9/53Uo7u+9gh RliD1zVuhH2kNXQZhhv3LqbiRowu51iGyHVoNEO+YO2FfyyWAKVQim8g+xW/a48LIptc bhyHFG7/3181VxaCYq7jkJKeiHk/OocEf1d5XICPXOukVuaHFQ6TJUvUbJ3EnFDZg4s4 nY/g== X-Gm-Message-State: APzg51BeDjak5kUk4IgYRsRzfLdtIRlmMOBvzY9W9xpHdlnh4bHcM80S URN+fw3cJnrDFzXhlfhyRz754Rw= X-Received: by 2002:aca:3110:: with SMTP id x16-v6mr23782030oix.126.1536591852622; Mon, 10 Sep 2018 08:04:12 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id k85-v6sm49465631oiy.2.2018.09.10.08.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:11 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Frank Rowand , Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org Subject: [PATCH v3 5/9] c6x: use common built-in dtb support Date: Mon, 10 Sep 2018 10:03:59 -0500 Message-Id: <20180910150403.19476-6-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180910150403.19476-1-robh@kernel.org> References: <20180910150403.19476-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Aurelien Jacquiot Cc: linux-c6x-dev@linux-c6x.org Signed-off-by: Rob Herring --- arch/c6x/boot/dts/Makefile | 11 +---------- arch/c6x/boot/dts/linked_dtb.S | 2 -- arch/c6x/include/asm/sections.h | 1 - arch/c6x/kernel/setup.c | 4 ++-- arch/c6x/kernel/vmlinux.lds.S | 10 ---------- 5 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 arch/c6x/boot/dts/linked_dtb.S -- 2.17.1 diff --git a/arch/c6x/boot/dts/Makefile b/arch/c6x/boot/dts/Makefile index b212d278ebc4..fd937f781d16 100644 --- a/arch/c6x/boot/dts/Makefile +++ b/arch/c6x/boot/dts/Makefile @@ -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 diff --git a/arch/c6x/boot/dts/linked_dtb.S b/arch/c6x/boot/dts/linked_dtb.S deleted file mode 100644 index cf347f1d16ce..000000000000 --- a/arch/c6x/boot/dts/linked_dtb.S +++ /dev/null @@ -1,2 +0,0 @@ -.section __fdt_blob,"a" -.incbin "arch/c6x/boot/dts/builtin.dtb" diff --git a/arch/c6x/include/asm/sections.h b/arch/c6x/include/asm/sections.h index d6c591ab5b7e..dc2f15eb3bde 100644 --- a/arch/c6x/include/asm/sections.h +++ b/arch/c6x/include/asm/sections.h @@ -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 */ diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c index 786e36e2f61d..509c5f086496 100644 --- a/arch/c6x/kernel/setup.c +++ b/arch/c6x/kernel/setup.c @@ -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); @@ -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(); diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S index 1fba5b421eee..584bab2bace6 100644 --- a/arch/c6x/kernel/vmlinux.lds.S +++ b/arch/c6x/kernel/vmlinux.lds.S @@ -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 = .; /*