Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70438C7EE2C for ; Sun, 28 May 2023 19:18:35 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6DCA784791; Sun, 28 May 2023 21:18:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="S+uqVWzR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC213857D0; Sun, 28 May 2023 21:18:13 +0200 (CEST) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (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 C8AB580610 for ; Sun, 28 May 2023 21:18:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-776fdba68ecso78046639f.1 for ; Sun, 28 May 2023 12:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685301488; x=1687893488; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2wT8Ay4F4WfKwfVzmqLBnWVKjNF0Lm43edrzEoBngns=; b=S+uqVWzRZmRDDXKktfoItLjK/KBT2fPRsB5sOHB63HLB6WdYHSwR0+Fa12IHMKZKWY fllJhDZ1sopOh7JjO9TzgusUyWCrR1ElPYHYOw/c74+VzcthsodBEiZ9XWEasKTiMnsC rQoqEvCMRyloTdRLnKPIuLedwtrcDWayY8he7FrSovoMcxodWHNIUckinrv0nNik/7OG BsViaG1EQczV9VtDMRtBY2Sj630D4hUgm+OoxZ5xIi9oOmvEzgQKz3RMw4CxW91+S1/s vL6pt8gWSh9e1VIx3PJfMqpxpFN5p+kZF2PsjYBgagWO/DITrEWchqeREQE2tDZaaK06 /wbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685301488; x=1687893488; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2wT8Ay4F4WfKwfVzmqLBnWVKjNF0Lm43edrzEoBngns=; b=jMB5lIkLz7amp6RfIxDW/Dwh1jznVX8ChHBewJotIHQpJAnBJ6cSP8eRR1dpqM93WC YQjoPv+mLmcF0gY1VojSzXxMkKeJMrJ5zan+o10zh/4s4bz1Unk2eGkEvpR60uN69S1x wXievReDiU/VhDcgAntmwmCeql4oVO/qhc4q5vb5DaKw3FezQYrjJNmfWdvdYmj6np2B uKN0fAxJNswRC4udnZKbV82BqNWUZn9r/b72zBH+6ETHeBECQ/tmNmFL5TKJXfBOhd8y FDLGKhAxEUBGYbctBvcJHUFrOVaxNFR6u3ykfZygNnmpGiBcH8CB5+/rnXUd0KnFa58w S04g== X-Gm-Message-State: AC+VfDzlHCN6/ig0S/HJOCK/JYbSVNcgMpA9plpsezwT1LUtKsQZMnaD I7ntotNsuajPrmjJG3Ak5WMcY/ZtvaM= X-Google-Smtp-Source: ACHHUZ5heAMvH3rYh+JJWXw4LDMuD7KgE39aJW3a+KMO0O6APLaY8pLYXDCx1trKlwTyqqBU9IcCdA== X-Received: by 2002:a6b:dd02:0:b0:776:f31f:aba2 with SMTP id f2-20020a6bdd02000000b00776f31faba2mr6065271ioc.5.1685301488050; Sun, 28 May 2023 12:18:08 -0700 (PDT) Received: from aford-B741.lan ([2601:447:d001:897f:9ca4:38c2:9b8e:2adc]) by smtp.gmail.com with ESMTPSA id u20-20020a5ec014000000b0076c872823b7sm2154061iol.22.2023.05.28.12.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 12:18:07 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: trini@konsulko.com, aford@beaconembedded.com, Adam Ford Subject: [PATCH 1/5] imx: imx8mm-beacon: Move environment definition to env file Date: Sun, 28 May 2023 14:18:00 -0500 Message-Id: <20230528191805.66713-1-aford173@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 at phobos.denx.de X-Virus-Status: Clean Instead of cluttering up a header file with a bunch of defines, move the default environmental variables to a file called imx8mm_beacon.env and reference it from the defconfig. Signed-off-by: Adam Ford --- board/beacon/imx8mm/imx8mm_beacon.env | 19 ++++++++++ configs/imx8mm_beacon_defconfig | 1 + include/configs/imx8mm_beacon.h | 50 --------------------------- 3 files changed, 20 insertions(+), 50 deletions(-) create mode 100644 board/beacon/imx8mm/imx8mm_beacon.env diff --git a/board/beacon/imx8mm/imx8mm_beacon.env b/board/beacon/imx8mm/imx8mm_beacon.env new file mode 100644 index 0000000000..00bf67edd5 --- /dev/null +++ b/board/beacon/imx8mm/imx8mm_beacon.env @@ -0,0 +1,19 @@ +boot_fit=try +bootscript=echo Running bootscript from mmc ...; source +console=ttymxc1 +fdt_addr=0x45000000 +fdt_file=imx8mm-beacon-kit.dtb +finduuid=part uuid mmc ${mmcdev}:2 uuid +image=Image +initrd_addr=0x46000000 +loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script}; +loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file} +loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} +mmcargs=setenv bootargs console=${console},${baudrate} root=PARTUUID=${uuid} rootwait rw ${mtdparts} ${optargs} +mmcautodetect=yes +mmcboot=echo Booting from mmc ...; run finduuid; run mmcargs; if run loadfdt; then booti ${loadaddr} - ${fdt_addr}; else echo WARN: Cannot load the DT; fi; +netargs=setenv bootargs console=${console},${baudrate} root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp +mmcdev=1 +mmcpart=1 +netboot=echo Booting from net ...; run netargs; if test ${ip_dyn} = yes; then setenv get_cmd dhcp; else setenv get_cmd tftp; fi; ${get_cmd} ${loadaddr} ${image}; if test ${boot_fit} = yes || test ${boot_fit} = try; then bootm ${loadaddr}; else if ${get_cmd} ${fdt_addr} ${fdt_file}; then booti ${loadaddr} - ${fdt_addr}; else echo WARN: Cannot load the DT; fi; fi; +script=boot.scr diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig index 597fe256d0..c049db32c1 100644 --- a/configs/imx8mm_beacon_defconfig +++ b/configs/imx8mm_beacon_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_ENV_SOURCE_FILE="imx8mm_beacon" CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFDE00 diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index d85ae21e23..c8dab91f61 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -19,56 +19,6 @@ #endif -/* Initial environment variables */ -#define CFG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ - "image=Image\0" \ - "console=ttymxc1,115200\0" \ - "fdt_addr=0x43000000\0" \ - "boot_fit=try\0" \ - "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "initrd_addr=0x43800000\0" \ - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ - "mmcpart=1\0" \ - "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ - "mmcautodetect=yes\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate}" \ - " root=PARTUUID=${uuid} rootwait rw ${mtdparts} ${optargs}\0" \ - "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}" \ - " ${script};\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run finduuid; " \ - "run mmcargs; " \ - "if run loadfdt; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "netargs=setenv bootargs console=${console} " \ - "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ - "run netargs; " \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "${get_cmd} ${loadaddr} ${image}; " \ - "if test ${boot_fit} = yes || test ${boot_fit} = try; then " \ - "bootm ${loadaddr}; " \ - "else " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi;\0" - /* Link Definitions */ #define CFG_SYS_INIT_RAM_ADDR 0x40000000 -- 2.39.2