All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2 01/13] pico-imx6ul: Convert to distro config
@ 2018-09-04 13:23 Otavio Salvador
  2018-09-04 13:23 ` [U-Boot] [PATCH v2 02/13] pico-imx6ul: Convert to SPL Otavio Salvador
                   ` (11 more replies)
  0 siblings, 12 replies; 20+ messages in thread
From: Otavio Salvador @ 2018-09-04 13:23 UTC (permalink / raw)
  To: u-boot

From: Fabio Estevam <festevam@gmail.com>

Instead of keeping a custom environment, use a more generic approach
by switching to disto config.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v2: None

 configs/pico-imx6ul_defconfig |  2 +
 include/configs/pico-imx6ul.h | 69 ++++++++++-------------------------
 2 files changed, 21 insertions(+), 50 deletions(-)

diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig
index 59ef7b7f22..3f969a2d6e 100644
--- a/configs/pico-imx6ul_defconfig
+++ b/configs/pico-imx6ul_defconfig
@@ -4,7 +4,9 @@ CONFIG_SYS_TEXT_BASE=0x87800000
 CONFIG_TARGET_PICO_IMX6UL=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg"
+CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 CONFIG_BOOTDELAY=3
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb"
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 80a2d1fbdb..1a148bf1a6 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -52,64 +52,33 @@
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
+	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc5\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
-	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_addr=0x83000000\0" \
-	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+	"fdt_addr_r=0x83000000\0" \
+	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+	"ramdisk_addr_r=0x83000000\0" \
+	"ramdiskaddr=0x83000000\0" \
+	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
 	CONFIG_DFU_ENV_SETTINGS \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc 0:1 uuid\0" \
 	"partitions=" \
 		"uuid_disk=${uuid_gpt_disk};" \
-		"name=boot,size=16MiB;name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \
-	"setup_emmc=gpt write mmc 0 $partitions; reset;\0" \
-	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-		"root=PARTUUID=${uuid} rootwait rw\0" \
-	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-	"mmcboot=echo Booting from mmc ...; " \
-		"run finduuid; " \
-		"run mmcargs; " \
-		"if run loadfdt; then " \
-			"bootz ${loadaddr} - ${fdt_addr}; " \
-		"else " \
-			"echo WARN: Cannot load the DT; " \
-		"fi;\0" \
-	"netargs=setenv bootargs console=${console},${baudrate} " \
-		"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} ${image}; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-				"bootz ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootz; " \
-				"else " \
-					"echo WARN: Cannot load the DT; " \
-				"fi; " \
-			"fi; " \
-		"else " \
-			"bootz; " \
-		"fi;\0" \
-
-#define CONFIG_BOOTCOMMAND \
-	   "if mmc rescan; then " \
-		   "if run loadimage; then " \
-			   "run mmcboot; " \
-		   "else run netboot; " \
-		   "fi; " \
-	   "else run netboot; fi"
+		"name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \
+	"fastboot_partition_alias_system=rootfs\0" \
+	"setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \
+	BOOTENV
+
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
 
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		CONFIG_SYS_MEMTEST_START + SZ_128M
-- 
2.18.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread
end of thread, other threads:[~2018-09-06 13:45 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-04 13:23 [U-Boot] [PATCH v2 01/13] pico-imx6ul: Convert to distro config Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 02/13] pico-imx6ul: Convert to SPL Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 03/13] pico-imx6ul: Add fastboot support Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 04/13] pico-imx6ul: Add bmode support Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 05/13] pico-imx6ul: Add support for the 512MB module Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 06/13] pico-imx7d: Update the README file Otavio Salvador
2018-09-04 14:05   ` Michael Nazzareno Trimarchi
2018-09-04 19:13     ` Otavio Salvador
2018-09-05 19:13       ` Otavio Salvador
2018-09-06  9:54         ` Stefano Babic
2018-09-06 12:17           ` Otavio Salvador
2018-09-06 13:02             ` Stefano Babic
2018-09-06 13:45   ` [U-Boot] [U-Boot,v2,06/13] " Tom Rini
2018-09-04 13:23 ` [U-Boot] [PATCH v2 07/13] pico-imx6ul: " Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 08/13] pico-imx6ul: Sync defconfig with new changes Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 09/13] pico-imx6ul: Add bootmenu to choose the baseboard Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 10/13] pico-imx6ul: Improve default DFU settings Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 11/13] pico-imx6ul: Sync README with pico-imx7d Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 12/13] pico-imx6ul: Add new pico-hobbit config Otavio Salvador
2018-09-04 13:23 ` [U-Boot] [PATCH v2 13/13] pico-imx6ul: Remove CONFIG_FSL_USDHC from .h Otavio Salvador

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.