From patchwork Wed Apr 13 09:33:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1616666 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 4Kdcrz669Xz9sFv for ; Wed, 13 Apr 2022 19:35:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4089D83E28; Wed, 13 Apr 2022 11:34:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 220C383E01; Wed, 13 Apr 2022 11:34:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 86F1083E03 for ; Wed, 13 Apr 2022 11:34:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marcel@ziswiler.com Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MZBIA-1nO8Sp2Jno-00KtnR; Wed, 13 Apr 2022 11:33:59 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Marcel Ziswiler Subject: [PATCH v2 11/11] configs: tdx: apalis/colibri_imx6: use preboot as well Date: Wed, 13 Apr 2022 11:33:35 +0200 Message-Id: <20220413093335.1372656-12-marcel@ziswiler.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220413093335.1372656-1-marcel@ziswiler.com> References: <20220413093335.1372656-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:izfoJuxFwlHm/J74h7TbzQqMgKQUn8xxW6p67ZnPhogYYG4m/o6 iuabMVKjPsbHbLcJszOKZOKVRbXO92WHeOnt/qCYdW2rTJ2QNNdz2bQKt7y9otCdmxMeiGo mMta6Vqel4KBfBOqyxhhvjAj/6viKUum0qmBtk33gXADgAvK6mnTVTyJrQV0IUJ9Th/aX/G HxLi/21FAdq3VOyooS/6w== X-UI-Out-Filterresults: notjunk:1;V03:K0:x94T4MNPOtU=:EZo8LhAbUjLoMiDRMzUNnH MrImvJ/KRbqTFuywgoDQyR2OA+lwoUp4sIBFVvUmhgnBXCa2niLyIyXbj9Q5N42DkYWygE+H4 wSGm/V6GpKy0CmCfYtFVI0SQRkzDBkNDr6to49WeMnkvH4PoVrxwscJSmSz90xA6l5syHsTNo LNvX8psvuNIfNPgXfbDDTw+xha0vVumjyQpaoTCh6sJ4YumCGlltR9JnTpGSZpcCHfVYjod2p HZ9P/n/D9UUXNIJgIT02bvY021P1Aj4Uie3jpW3LY11j5QXTC4o1ZbC6cb4Zav8QaRPjA8Oca 5eToaRB3/vPO01RALOSSyacWcjz8rVOUlbbTIHOtM0MOt5sNPrCLM5Vl51Pyjytro4yN7Tdjh H5JhU20Dds2cea9H6rKvSUIkjvqJ7WA+CPHismeiiZADmpyo3NyqJaCXmNBWoCgNAZvYWV+OD PiVFfIBZXHAj+IGwKqguTOywGxhoQ5UrRequ7sgntE5jqH7uJE9Wm+nDYDVutcExcLxsyg9kz eY7+9aQjqwrVKrcaodyOI/0sAji1WF71O70cRaI6XNaukQxwDqo7TG7m2T/CikFcu3UWIzTzZ lseq43/kGy/r62n2Ts8HJfMl9LPk4y/WZ3DCZ/0uZRtH3wxHE7yPdCZEieQ9VsUSCKpDUv9UA lfQfVIotG5YVOM9klv7kbL1pqms1/EKKRCGvdH7Pgkm29H1HefV5rTkyFa+4LjdBBr0w= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Use PREBOOT as well. This allows a customer to just set fdt_board as on any other module to customize the device tree for his carrier board. Signed-off-by: Marcel Ziswiler --- Changes in v2: - Re-based on top of Stefano's imx/master-next which dropped 13 commits already applied. configs/apalis_imx6_defconfig | 2 ++ configs/colibri_imx6_defconfig | 2 ++ include/configs/apalis_imx6.h | 5 +---- include/configs/colibri_imx6.h | 4 +--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 00c9a24a5dd..ea4ad276e7f 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -29,6 +29,8 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_BOOTDELAY=1 CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6q-apalis-${fdt_board}.dtb" CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 1c65d8a7fe1..4f38d5cb483 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -28,6 +28,8 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_BOOTDELAY=1 CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6dl-colibri-${fdt_board}.dtb" CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 57fd3ce12d0..aa93d10f852 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -89,16 +89,13 @@ "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" -#define FDT_FILE "imx6q-apalis-eval.dtb" - #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ "boot_file=zImage\0" \ "boot_script_dhcp=boot.scr\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off vmalloc=400M\0" \ - "fdt_file=" FDT_FILE "\0" \ - "fdtfile=" FDT_FILE "\0" \ + "fdt_board=eval\0" \ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ UBOOT_UPDATE \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index f7e9709e122..9ca6bef192f 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -78,15 +78,13 @@ "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" -#define FDT_FILE "imx6dl-colibri-eval-v3.dtb" #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ "boot_file=zImage\0" \ "boot_script_dhcp=boot.scr\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \ - "fdt_file=" FDT_FILE "\0" \ - "fdtfile=" FDT_FILE "\0" \ + "fdt_board=eval-v3\0" \ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ UBOOT_UPDATE \