From patchwork Fri Dec 17 23:01:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 1570399 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.a=rsa-sha256 header.s=google header.b=U+FoHNLK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JG4JD2dt6z9sCD for ; Sat, 18 Dec 2021 10:02:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B98283740; Sat, 18 Dec 2021 00:02:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.b="U+FoHNLK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 53E798370D; Sat, 18 Dec 2021 00:02:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AF20B83720 for ; Sat, 18 Dec 2021 00:02:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=troy.kisky@boundarydevices.com Received: by mail-pl1-x62b.google.com with SMTP id v19so3077197plo.7 for ; Fri, 17 Dec 2021 15:02:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aFzPlLUo3sC9qj9r2+s9wjRj3cJIv8z3oi41FwRtxAs=; b=U+FoHNLKPotYLZNIVIqg4Kf7wsgFZUwBZEkhA4nkUqx+v8gAQNv28tc9/6vlKbabtd Xb17hG8tCQXV7rCMymaxjbR//gIeAIe3Pv6oXEPDc5pmikXvzU83iZu70AmUQkeMS8uc iTIx/wjtWDtCXm5l2iMl2piuCORS78F7ND+TM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aFzPlLUo3sC9qj9r2+s9wjRj3cJIv8z3oi41FwRtxAs=; b=8BEHcWm688qoFnjGJhEDZq0EqVjRxO3s500JZAu65h0rbiN1X91ENKaajiatJ5/x2K X4r0jgrzYBiNT+qkf0/znl15T5bApXiTf3yh57dxv/OoCX7Ya5A8NM7Cfb4NedtbcrV4 JFJi3Kgrc3LuFo0pj/alGYciyTBMf9Lx7vL3JlX6Ob0jE7bVk3w61XHDyuVWGA597SSD IgQhRo7MAXFC0x5KW6RWqJ/uvGnXPk6dzLgO14o0rIap/ePqERqBXtIXCcAWHDzTaRjr 6a0DIV9A9JOZZbk4o5Un9hjMtZ5EZKCUV0zf3gtZHW61phBuZgcKwDI8h/RVd/sgp4bA VsCw== X-Gm-Message-State: AOAM531UD0qBxsKFysbEtv+y0F+NRODEtqltvHo3z/d03NVcHnOxgdey huqMjQcCXYsSz37t1949yo/KnA== X-Google-Smtp-Source: ABdhPJySs0fq+qMrMuahXNT+VO325gxhCn+2lAdATGlDprs3C1Dpm6B8zwytxREFQD8r4RxGdOURJA== X-Received: by 2002:a17:90b:3889:: with SMTP id mu9mr6269057pjb.160.1639782122978; Fri, 17 Dec 2021 15:02:02 -0800 (PST) Received: from OS2.boundarydevices.com. (wsip-72-200-236-186.oc.oc.cox.net. [72.200.236.186]) by smtp.googlemail.com with ESMTPSA id f7sm11130388pfj.41.2021.12.17.15.02.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Dec 2021 15:02:02 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de, Troy Kisky Subject: [PATCH v1 1/5] kconfig: allow defconfigs to live in board directory Date: Fri, 17 Dec 2021 15:01:27 -0800 Message-Id: <20211217230131.2715940-2-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> References: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean This will reduce the size of the configs directory, and make it more clear which board directory uses the defconfig file. Signed-off-by: Troy Kisky Reviewed-by: Simon Glass --- scripts/kconfig/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 12e525ee31f..307262e00de 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -92,8 +92,15 @@ else endif endif +%_defconfig: SHELL:=/bin/bash %_defconfig: $(obj)/conf - $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) + $(Q)readarray -d '' names < <(find $(srctree)/configs $(srctree)/board -type f -name $@ -print0); \ + if (test $${#names[*]} -eq 1); then \ + $< $(silent) --defconfig="$${names[0]}" $(Kconfig); \ + else \ + echo "$@" not found or ambiguous error; \ + echo "$${names[@]}"; exit 1; \ + fi # Added for U-Boot (backward compatibility) %_config: %_defconfig From patchwork Fri Dec 17 23:01:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 1570403 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.a=rsa-sha256 header.s=google header.b=LPapEkUt; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JG4Jr6JLMz9sRR for ; Sat, 18 Dec 2021 10:03:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4EA21837DD; Sat, 18 Dec 2021 00:02:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.b="LPapEkUt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A41083720; Sat, 18 Dec 2021 00:02:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B671E83742 for ; Sat, 18 Dec 2021 00:02:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=troy.kisky@boundarydevices.com Received: by mail-pj1-x1034.google.com with SMTP id j6-20020a17090a588600b001a78a5ce46aso7054712pji.0 for ; Fri, 17 Dec 2021 15:02:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oL7vsoy9maUvAlVqFQwH3Pv5ifisziwbgV5vtXZTi6w=; b=LPapEkUtOdGFx3kwtowYBgmYKcSrjvkficzN8kChal1WxgRN5UMD06jKkJqU1HZ6yU hZKy6pOju/EbaBg0MCB93D2e1juvfcuDTSUNH9OvKUQMU/fsX2pcgTVd50EtH5c1f+m1 7NZKwHPtSo5Mig6QrxVFHyvS1UtX5ywczpXZs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oL7vsoy9maUvAlVqFQwH3Pv5ifisziwbgV5vtXZTi6w=; b=JtKo+bTdioswQ8k3VahBEY8T+nX/il4bfp7d+yTsFFpBwBM9cwpIDsMhsVkPDKhETn D1QX0BFtZf0p4pY+L0xJVLN5AbKFy8N+OpUMbyFguH6eVg7uBHY700SUJgaZDsWLPJer Rk+KJkJNc9Iont4nOYSsleAcO2+1oklUZJnFl/N4ZxWDJsdW9ni+wAAwQtBPR7LYQw8l PiGSk0+t5SbF2rM7EWUVWVrLru0o4jN1xf3ogzXcQJdIs+N9ThuTjkiNxYdapOnzCT2+ CRQBOsUo4EmrHjw/9PfSjsEQx3f7NbvbdBMrz0sC/d1unaYnYjoWRAvqdOfxrPBEV+7Z fSzA== X-Gm-Message-State: AOAM530oOAnJH28WrXftOo9YheY8zE86099WyBgj4b9uesQOkB72KHEu tGXN2crsJ+Dx5PNumsFmc6YGNA== X-Google-Smtp-Source: ABdhPJyT+0zUI/GcLpbTQTxTFfdgDFjM27OLcgBAtGd2p/d0JRDQRkHc2039j7HMpvlX1PPer1u0rA== X-Received: by 2002:a17:90b:1bc7:: with SMTP id oa7mr4334213pjb.200.1639782124164; Fri, 17 Dec 2021 15:02:04 -0800 (PST) Received: from OS2.boundarydevices.com. (wsip-72-200-236-186.oc.oc.cox.net. [72.200.236.186]) by smtp.googlemail.com with ESMTPSA id f7sm11130388pfj.41.2021.12.17.15.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Dec 2021 15:02:03 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de, Troy Kisky Subject: [PATCH v1 2/5] dts: allow dts files in board directory Date: Fri, 17 Dec 2021 15:01:28 -0800 Message-Id: <20211217230131.2715940-3-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> References: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Let the board specific dts files live in the board directory. Signed-off-by: Troy Kisky --- dts/Makefile | 11 +++++++++-- scripts/Makefile.lib | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dts/Makefile b/dts/Makefile index cb311138295..09b46f9fcfd 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -13,7 +13,9 @@ endif ifneq ($(EXT_DTB),) DTB := $(EXT_DTB) else -DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb +ifneq "$(ARCH)" "arm64" +DTB := $(patsubst $(srctree)/%.dts,%.dtb,$(shell find "$(srctree)/board/$(BOARDDIR)" $(srctree)/arch/$(ARCH)/dts/ -type f -name $(DEVICE_TREE).dts)) +endif endif $(obj)/dt-$(SPL_NAME).dtb: dts/dt.dtb $(objtree)/tools/fdtgrep FORCE @@ -40,8 +42,13 @@ $(DTB): arch-dtbs /bin/false) PHONY += arch-dtbs +ifneq "$(patsubst board/$(BOARDDIR)/%,,$(DTB))" "" arch-dtbs: $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs +else +arch-dtbs: + $(Q)$(MAKE) $(build)="board/$(BOARDDIR)" dtbs +endif ifeq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o @@ -63,4 +70,4 @@ spl_dtbs: $(obj)/dt-$(SPL_NAME).dtb clean-files := dt.dtb.S # Let clean descend into dts directories -subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/mips/dts ../arch/sandbox/dts ../arch/x86/dts ../arch/powerpc/dts ../arch/riscv/dts +subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/mips/dts ../arch/sandbox/dts ../arch/x86/dts ../arch/powerpc/dts ../arch/riscv/dts ../$(patsubst $(srctree)/%/,%,$(dir $(shell find $(srctree)/board -type f -name "*.dtb"))) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 39f03398ed8..18fe42f378f 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -183,6 +183,7 @@ u_boot_dtsi = $(strip $(u_boot_dtsi_options_debug) \ # Modified for U-Boot dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ + -I$(srctree)/board/$(BOARDDIR) \ -I$(srctree)/arch/$(ARCH)/dts \ -I$(srctree)/arch/$(ARCH)/dts/include \ -Iinclude \ From patchwork Fri Dec 17 23:01:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 1570400 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.a=rsa-sha256 header.s=google header.b=d0B4fRuD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JG4JH24NDz9sCD for ; Sat, 18 Dec 2021 10:02:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D10678376C; Sat, 18 Dec 2021 00:02:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.b="d0B4fRuD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 77AC78370D; Sat, 18 Dec 2021 00:02:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ADF9E83784 for ; Sat, 18 Dec 2021 00:02:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=troy.kisky@boundarydevices.com Received: by mail-pl1-x62e.google.com with SMTP id u17so3073012plg.9 for ; Fri, 17 Dec 2021 15:02:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+Nj9CEjmYSF/G3Aj49QyVrRZZMs0Rtm1XNwmtTgQl+o=; b=d0B4fRuDTPAYX+/fPvS1EiorTHrWBq8nX/9uhm3oJiSL3VKxAmrwekRAQ1uNqiG1+Q ViKJxkszb1eSpAt03Hj6eesTqhjzDu35wXnuXd2ZOg8NRoXrDqNDTu7lDcB0Fm/e7fb5 BcSqSuueEHGBf1JLGUO57bEHgtXboNhiAqqLc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+Nj9CEjmYSF/G3Aj49QyVrRZZMs0Rtm1XNwmtTgQl+o=; b=ulj0HYLL7664ZWwFSE/hjt3AhEHPVg679tLlE279W07W4C1Sq7ldCJxfvYaU+SDcWF uH1qbUqgcLFWChLMyVf9qq0UUMcmecyz+oou3H3d7UafOwRNQwo/vdbE1UKerzbCP6/o pUwxs//tN4ybuL05Be7kxUGmkZIzrZyjxWshWvhZPxwvVVikvC5ixLpv1eolnKQ+9jnh /lHkeOHdvX9UeWQ4NThmrPf7zER8OxbeiabVoxLXSWdUaBr2W9bJ4wDuvoGV6iA5pWva LpiwXGaN0xAN2yPax4xLQIIe1wVs/JNqr3jnR/UVWMOpRGh3eBMss7P7eOXz3nYujLkp nsiA== X-Gm-Message-State: AOAM532hAG4XJc7f9s1pVPQ7CCN/ZeWATSmx4B2+adLYuJz9CT7d7zWm pc3mAJczSpGIWNbE1//WUFikNg== X-Google-Smtp-Source: ABdhPJwC6DQVcQRX79a7GajyOdzJJzKqtRUq7ldn8Dz/kKSPDztTzkLzdpsDVcSdodLtSb1Hrdpc7Q== X-Received: by 2002:a17:903:246:b0:148:d321:a083 with SMTP id j6-20020a170903024600b00148d321a083mr5697153plh.83.1639782125212; Fri, 17 Dec 2021 15:02:05 -0800 (PST) Received: from OS2.boundarydevices.com. (wsip-72-200-236-186.oc.oc.cox.net. [72.200.236.186]) by smtp.googlemail.com with ESMTPSA id f7sm11130388pfj.41.2021.12.17.15.02.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Dec 2021 15:02:04 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de, Troy Kisky Subject: [PATCH v1 3/5] scripts: Makefile.autoconf: allow CONFIG_SYS_CONFIG_NAME file to live in board directory Date: Fri, 17 Dec 2021 15:01:29 -0800 Message-Id: <20211217230131.2715940-4-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> References: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Let the board specific include file live in the board directory. Signed-off-by: Troy Kisky --- scripts/Makefile.autoconf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 8a3efdb2db0..6a725a3e2ff 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -103,9 +103,14 @@ define filechk_config_h echo \#define CONFIG_$$i \ | sed '/=/ {s/=/ /;q; } ; { s/$$/ 1/; }'; \ done; \ - echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ + config_boarddir=board/$(if $(VENDOR),$(VENDOR)/)$(BOARD); \ + echo \#define CONFIG_BOARDDIR $$config_boarddir; \ echo \#include \; \ - echo \#include \; \ + if [ -f $(srctree)/$$config_boarddir/$(CONFIG_SYS_CONFIG_NAME).h ] ; then \ + echo \#include \"../$$config_boarddir/$(CONFIG_SYS_CONFIG_NAME).h\"; \ + else \ + echo \#include \; \ + fi; \ echo \#include \; \ echo \#include \; \ echo \#include \;) From patchwork Fri Dec 17 23:01:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 1570402 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.a=rsa-sha256 header.s=google header.b=aoo1CQOz; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JG4Jf3RwFz9sRR for ; Sat, 18 Dec 2021 10:02:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5DB0837C5; Sat, 18 Dec 2021 00:02:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.b="aoo1CQOz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5EE198370D; Sat, 18 Dec 2021 00:02:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E608683781 for ; Sat, 18 Dec 2021 00:02:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=troy.kisky@boundarydevices.com Received: by mail-pj1-x1035.google.com with SMTP id b1-20020a17090a990100b001b14bd47532so3704847pjp.0 for ; Fri, 17 Dec 2021 15:02:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rWfBmcxyLK94FkU25CtB9dUjymhUBA0txDbs+T0jN1c=; b=aoo1CQOzkzm/xex4vNpqboVvbWzg6wS/Q30R08+hBqt6bA/0c5Knx38lOc8gHo0ISe u/UKtlJSJHLXt89URsU0xFKujROJ8Jtr7ekJyeKMOQhSehgRheqJ1fd08Sg5e9RDwkAL 6a2eOVZR74WI6Pe2Po2gh6rKaPR5ZOJ36mL1Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rWfBmcxyLK94FkU25CtB9dUjymhUBA0txDbs+T0jN1c=; b=6itcjfujxJQvcvoRn2XSCTTfOU8lo9MmJskKnp+/4I/4L8JCmQiaTHtX6EdUvUQH/l WLTSUaYrivDAHWT/n2PQZkYuOE11W2oCLLC7UJQVbjOL13XQIKbjq5/Bqg41hdVPvncY HS7O/+LDywIdUwfm6u9IHLCrs9ogjSO9YOBmE0CPBY6zJyltA7hMF3GYRQRIpfnLmGM4 I7TLC9U9faMw015wTPMBgdBINElBECvJPQ9Zt3FHkFE5Y2qob2M53vrYiHU0ZeT5bdcc HEoeoMJnP0T73kg+m0tkWwIOcKZEe1EsQfaDaQrpGjnlj0cubxQoN6NJL10mtEXxaAmh jwmw== X-Gm-Message-State: AOAM531amRXSbUgHE2tnwHSwCyy91CxaP9LxZ5OlK642uhkQwKUz/9TY opJyj4Au8x6O0KBMYiG8SHeVzA== X-Google-Smtp-Source: ABdhPJz1XWxQr+Zo+ewvqryQTIRJWXli5yxaUYa2yCncGFEhUibNTPyunbYzKewFI4DQNDZIOWaBfg== X-Received: by 2002:a17:902:b18d:b0:148:dcd8:79e with SMTP id s13-20020a170902b18d00b00148dcd8079emr4743185plr.74.1639782126346; Fri, 17 Dec 2021 15:02:06 -0800 (PST) Received: from OS2.boundarydevices.com. (wsip-72-200-236-186.oc.oc.cox.net. [72.200.236.186]) by smtp.googlemail.com with ESMTPSA id f7sm11130388pfj.41.2021.12.17.15.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Dec 2021 15:02:05 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de, Troy Kisky Subject: [PATCH v1 4/5] genboardcfg: allow defconfigs in board directory Date: Fri, 17 Dec 2021 15:01:30 -0800 Message-Id: <20211217230131.2715940-5-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> References: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean The adds boards whose defconfigs are in the board's directory. Signed-off-by: Troy Kisky Reviewed-by: Simon Glass --- tools/genboardscfg.py | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py index 4ee7aa1f891..60e2fe5cf3e 100755 --- a/tools/genboardscfg.py +++ b/tools/genboardscfg.py @@ -37,6 +37,13 @@ COMMENT_BLOCK = '''# ''' % __file__ ### helper functions ### +def find_defconfig_in_board_subdir(f): + for (dirpath, dirnames, filenames) in os.walk('board'): + for filename in filenames: + if filename == f: + return True + return False + def try_remove(f): """Remove a file ignoring 'No such file or directory' error.""" try: @@ -76,6 +83,14 @@ def output_is_new(output): if ctime < os.path.getctime(filepath): return False + for (dirpath, dirnames, filenames) in os.walk('board'): + for filename in fnmatch.filter(filenames, '*'): + if fnmatch.fnmatch(filename, '.*'): + continue + filepath = os.path.join(dirpath, filename) + if ctime < os.path.getctime(filepath): + return False + for (dirpath, dirnames, filenames) in os.walk('.'): for filename in filenames: if (fnmatch.fnmatch(filename, '*~') or @@ -94,7 +109,8 @@ def output_is_new(output): continue defconfig = line.split()[6] + '_defconfig' if not os.path.exists(os.path.join(CONFIG_DIR, defconfig)): - return False + if not find_defconfig_in_board_subdir(defconfig): + return False return True @@ -231,6 +247,12 @@ def scan_defconfigs(jobs=1): continue all_defconfigs.append(os.path.join(dirpath, filename)) + for (dirpath, dirnames, filenames) in os.walk('board'): + for filename in fnmatch.filter(filenames, '*_defconfig'): + if fnmatch.fnmatch(filename, '.*'): + continue + all_defconfigs.append(os.path.join(dirpath, filename)) + total_boards = len(all_defconfigs) processes = [] queues = [] @@ -346,6 +368,19 @@ class MaintainersDatabase: targets = [] maintainers = [] status = '-' + + front, match, rear = file.partition('board/') + if match: + front, match, rear = file.partition('/MAINTAINERS') + if front: + for (dirpath, dirnames, filenames) in os.walk(front): + for filename in fnmatch.filter(filenames, '*_defconfig'): + if fnmatch.fnmatch(filename, '.*'): + continue + front, match, rear = filename.rpartition('_defconfig') + if match and not rear: + targets.append(front) + if targets: for target in targets: self.database[target] = (status, maintainers) From patchwork Fri Dec 17 23:01:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 1570401 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.a=rsa-sha256 header.s=google header.b=SnOP3F8m; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JG4JS6pv2z9s1l for ; Sat, 18 Dec 2021 10:02:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 33BC6837BD; Sat, 18 Dec 2021 00:02:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.b="SnOP3F8m"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 846BB83784; Sat, 18 Dec 2021 00:02:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 122F083740 for ; Sat, 18 Dec 2021 00:02:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=troy.kisky@boundarydevices.com Received: by mail-pl1-x62e.google.com with SMTP id p18so3055585pld.13 for ; Fri, 17 Dec 2021 15:02:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u9lpb/0wedOiozGPrcDPRxIogG/6lBS2VK74f4XS92Y=; b=SnOP3F8mDcmcBWX9aODbpWgpoNQXvRbXAF/Na/HnluOq/hhTxabicJzB8TmvzT4NL6 rwjKPx79VR64k07VnFeBLMX/gfFAg1pGoYBWSne8tGKhf4A/L++XH79DWGWlLxmiA2xH JYjQ3r5m0tZYW3lNGDSCq235qt11GLlmTm90g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u9lpb/0wedOiozGPrcDPRxIogG/6lBS2VK74f4XS92Y=; b=XXnmHBe2yiYrwcc00FYOmOtSurLVmfzlgKzQVCK3NlaPX4TmwhSbZyT/2keWHEWLes llgZTqWt9WpuQyRf8IB7jqCKOOwnKEGzmgU2GnWrXtNxRSehEiMsJnqh4ayXn09/KxM2 OUrcsq590RS2Jo/AV9vw75Z7maBILIg17lBBXaTJtyBWgzIhs2GptErT6oWPFudsAqMW dFR0S9Ug4LVlssrf+dvCihANcspQwRwbeThDq3SoR/D1O/qNuiGE6f5N/xJ7uHo36Vgn sjD37jikhLxuTlSuZZ2hrIHtIl6cYIbbWLnbQLWsii9TMrF5j/lCK7CULbi441KRq0rI E+mA== X-Gm-Message-State: AOAM531SIjcBxWPCbMhvSxmqwXWWoaj44fNJVTr+9Ft3w8PRhoIqzF3W PXnQYy9n7a9XoDVdtYU0XvnfgQ== X-Google-Smtp-Source: ABdhPJzEkGgGFKMugu+7I7YqZEFX3h7YBz7keMlEIu05nw2MgJM2uOhuaX4dUvnOi8FLJtKi1HCABw== X-Received: by 2002:a17:902:70cc:b0:148:aa3a:8c65 with SMTP id l12-20020a17090270cc00b00148aa3a8c65mr5497779plt.114.1639782127442; Fri, 17 Dec 2021 15:02:07 -0800 (PST) Received: from OS2.boundarydevices.com. (wsip-72-200-236-186.oc.oc.cox.net. [72.200.236.186]) by smtp.googlemail.com with ESMTPSA id f7sm11130388pfj.41.2021.12.17.15.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Dec 2021 15:02:07 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de, Troy Kisky Subject: [PATCH v1 5/5] nitrogen6x: move board specific files to nitrogen6x directory Date: Fri, 17 Dec 2021 15:01:31 -0800 Message-Id: <20211217230131.2715940-6-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> References: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean This makes it clearer which board uses a file. Signed-off-by: Troy Kisky --- arch/arm/dts/Makefile | 3 --- board/boundary/nitrogen6x/MAINTAINERS | 13 ------------- board/boundary/nitrogen6x/Makefile | 13 +++++++++++++ .../boundary/nitrogen6x}/imx6dl-nitrogen6x.dts | 0 .../boundary/nitrogen6x}/imx6q-nitrogen6x.dts | 0 .../boundary/nitrogen6x}/imx6q-sabrelite.dts | 0 .../boundary/nitrogen6x}/imx6qdl-nitrogen6x.dtsi | 0 .../boundary/nitrogen6x}/imx6qdl-sabrelite.dtsi | 0 .../boundary/nitrogen6x}/mx6qsabrelite_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6dl2g_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6dl_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6q2g_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6q_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6s1g_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6s_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6x.h | 2 +- 16 files changed, 14 insertions(+), 17 deletions(-) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6dl-nitrogen6x.dts (100%) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6q-nitrogen6x.dts (100%) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6q-sabrelite.dts (100%) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6qdl-nitrogen6x.dtsi (100%) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6qdl-sabrelite.dtsi (100%) rename {configs => board/boundary/nitrogen6x}/mx6qsabrelite_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6dl2g_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6dl_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6q2g_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6q_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6s1g_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6s_defconfig (100%) rename {include/configs => board/boundary/nitrogen6x}/nitrogen6x.h (98%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7f622fedbda..a864a6dd4b8 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -744,7 +744,6 @@ dtb-y += \ imx6dl-mba6a.dtb \ imx6dl-mba6b.dtb \ imx6dl-mamoj.dtb \ - imx6dl-nitrogen6x.dtb \ imx6dl-pico.dtb \ imx6dl-udoo.dtb \ imx6dl-riotboard.dtb \ @@ -792,13 +791,11 @@ dtb-y += \ imx6q-mba6a.dtb \ imx6q-mba6b.dtb \ imx6q-mccmon6.dtb\ - imx6q-nitrogen6x.dtb \ imx6q-novena.dtb \ imx6q-pico.dtb \ imx6q-phytec-mira-rdk-nand.dtb \ imx6q-udoo.dtb \ imx6q-sabreauto.dtb \ - imx6q-sabrelite.dtb \ imx6q-sabresd.dtb \ imx6q-tbs2910.dtb \ imx6q-wandboard-revd1.dtb \ diff --git a/board/boundary/nitrogen6x/MAINTAINERS b/board/boundary/nitrogen6x/MAINTAINERS index 17018d69f64..b11bc1f20d1 100644 --- a/board/boundary/nitrogen6x/MAINTAINERS +++ b/board/boundary/nitrogen6x/MAINTAINERS @@ -1,17 +1,4 @@ NITROGEN6X BOARD M: Troy Kisky S: Maintained -F: arch/arm/dts/imx6dl-nitrogen6x.dts -F: arch/arm/dts/imx6q-nitrogen6x.dts -F: arch/arm/dts/imx6q-sabrelite.dts -F: arch/arm/dts/imx6qdl-nitrogen6x.dtsi -F: arch/arm/dts/imx6qdl-sabrelite.dtsi F: board/boundary/nitrogen6x/ -F: include/configs/nitrogen6x.h -F: configs/mx6qsabrelite_defconfig -F: configs/nitrogen6dl_defconfig -F: configs/nitrogen6dl2g_defconfig -F: configs/nitrogen6q_defconfig -F: configs/nitrogen6q2g_defconfig -F: configs/nitrogen6s_defconfig -F: configs/nitrogen6s1g_defconfig diff --git a/board/boundary/nitrogen6x/Makefile b/board/boundary/nitrogen6x/Makefile index c8433bd7488..dd627411fa9 100644 --- a/board/boundary/nitrogen6x/Makefile +++ b/board/boundary/nitrogen6x/Makefile @@ -5,3 +5,16 @@ # Copyright (C) 2013, Boundary Devices obj-y := nitrogen6x.o + +dtb-y += imx6dl-nitrogen6x.dtb \ + imx6q-nitrogen6x.dtb \ + imx6q-sabrelite.dtb \ + +# Add any required device tree compiler flags here +DTC_FLAGS += -a 0x8 + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := $(dtb-y) diff --git a/arch/arm/dts/imx6dl-nitrogen6x.dts b/board/boundary/nitrogen6x/imx6dl-nitrogen6x.dts similarity index 100% rename from arch/arm/dts/imx6dl-nitrogen6x.dts rename to board/boundary/nitrogen6x/imx6dl-nitrogen6x.dts diff --git a/arch/arm/dts/imx6q-nitrogen6x.dts b/board/boundary/nitrogen6x/imx6q-nitrogen6x.dts similarity index 100% rename from arch/arm/dts/imx6q-nitrogen6x.dts rename to board/boundary/nitrogen6x/imx6q-nitrogen6x.dts diff --git a/arch/arm/dts/imx6q-sabrelite.dts b/board/boundary/nitrogen6x/imx6q-sabrelite.dts similarity index 100% rename from arch/arm/dts/imx6q-sabrelite.dts rename to board/boundary/nitrogen6x/imx6q-sabrelite.dts diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi b/board/boundary/nitrogen6x/imx6qdl-nitrogen6x.dtsi similarity index 100% rename from arch/arm/dts/imx6qdl-nitrogen6x.dtsi rename to board/boundary/nitrogen6x/imx6qdl-nitrogen6x.dtsi diff --git a/arch/arm/dts/imx6qdl-sabrelite.dtsi b/board/boundary/nitrogen6x/imx6qdl-sabrelite.dtsi similarity index 100% rename from arch/arm/dts/imx6qdl-sabrelite.dtsi rename to board/boundary/nitrogen6x/imx6qdl-sabrelite.dtsi diff --git a/configs/mx6qsabrelite_defconfig b/board/boundary/nitrogen6x/mx6qsabrelite_defconfig similarity index 100% rename from configs/mx6qsabrelite_defconfig rename to board/boundary/nitrogen6x/mx6qsabrelite_defconfig diff --git a/configs/nitrogen6dl2g_defconfig b/board/boundary/nitrogen6x/nitrogen6dl2g_defconfig similarity index 100% rename from configs/nitrogen6dl2g_defconfig rename to board/boundary/nitrogen6x/nitrogen6dl2g_defconfig diff --git a/configs/nitrogen6dl_defconfig b/board/boundary/nitrogen6x/nitrogen6dl_defconfig similarity index 100% rename from configs/nitrogen6dl_defconfig rename to board/boundary/nitrogen6x/nitrogen6dl_defconfig diff --git a/configs/nitrogen6q2g_defconfig b/board/boundary/nitrogen6x/nitrogen6q2g_defconfig similarity index 100% rename from configs/nitrogen6q2g_defconfig rename to board/boundary/nitrogen6x/nitrogen6q2g_defconfig diff --git a/configs/nitrogen6q_defconfig b/board/boundary/nitrogen6x/nitrogen6q_defconfig similarity index 100% rename from configs/nitrogen6q_defconfig rename to board/boundary/nitrogen6x/nitrogen6q_defconfig diff --git a/configs/nitrogen6s1g_defconfig b/board/boundary/nitrogen6x/nitrogen6s1g_defconfig similarity index 100% rename from configs/nitrogen6s1g_defconfig rename to board/boundary/nitrogen6x/nitrogen6s1g_defconfig diff --git a/configs/nitrogen6s_defconfig b/board/boundary/nitrogen6x/nitrogen6s_defconfig similarity index 100% rename from configs/nitrogen6s_defconfig rename to board/boundary/nitrogen6x/nitrogen6s_defconfig diff --git a/include/configs/nitrogen6x.h b/board/boundary/nitrogen6x/nitrogen6x.h similarity index 98% rename from include/configs/nitrogen6x.h rename to board/boundary/nitrogen6x/nitrogen6x.h index 1a1c08bd308..2c86a2a99d0 100644 --- a/include/configs/nitrogen6x.h +++ b/board/boundary/nitrogen6x/nitrogen6x.h @@ -9,7 +9,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include "mx6_common.h" +#include #define CONFIG_USBD_HS