pico-imx6ul: Convert to distro config
Instead of keeping a custom environment, use a more generic approach by switching to distro config. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
parent
d1e15041ab
commit
636941ff4d
|
@ -4,7 +4,9 @@ CONFIG_SYS_TEXT_BASE=0x87800000
|
||||||
CONFIG_TARGET_PICO_IMX6UL=y
|
CONFIG_TARGET_PICO_IMX6UL=y
|
||||||
# CONFIG_CMD_BMODE is not set
|
# CONFIG_CMD_BMODE is not set
|
||||||
CONFIG_NR_DRAM_BANKS=1
|
CONFIG_NR_DRAM_BANKS=1
|
||||||
|
CONFIG_DISTRO_DEFAULTS=y
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg"
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg"
|
||||||
|
CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
|
||||||
CONFIG_BOOTDELAY=3
|
CONFIG_BOOTDELAY=3
|
||||||
CONFIG_SUPPORT_RAW_INITRD=y
|
CONFIG_SUPPORT_RAW_INITRD=y
|
||||||
CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb"
|
CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb"
|
||||||
|
|
|
@ -52,65 +52,34 @@
|
||||||
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
|
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
|
"script=boot.scr\0" \
|
||||||
"image=zImage\0" \
|
"image=zImage\0" \
|
||||||
"console=ttymxc5\0" \
|
"console=ttymxc5\0" \
|
||||||
"fdt_high=0xffffffff\0" \
|
"fdt_high=0xffffffff\0" \
|
||||||
"initrd_high=0xffffffff\0" \
|
"initrd_high=0xffffffff\0" \
|
||||||
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
||||||
"fdt_addr=0x83000000\0" \
|
"fdt_addr=0x83000000\0" \
|
||||||
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
|
"fdt_addr_r=0x83000000\0" \
|
||||||
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\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" \
|
||||||
"mmcautodetect=yes\0" \
|
"mmcautodetect=yes\0" \
|
||||||
CONFIG_DFU_ENV_SETTINGS \
|
CONFIG_DFU_ENV_SETTINGS \
|
||||||
"finduuid=part uuid mmc 0:2 uuid\0" \
|
"finduuid=part uuid mmc 0:1 uuid\0" \
|
||||||
"partitions=" \
|
"partitions=" \
|
||||||
"uuid_disk=${uuid_gpt_disk};" \
|
"uuid_disk=${uuid_gpt_disk};" \
|
||||||
"name=boot,size=16MiB;name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \
|
"name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \
|
||||||
"setup_emmc=gpt write mmc 0 $partitions; reset;\0" \
|
"fastboot_partition_alias_system=rootfs\0" \
|
||||||
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
"setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \
|
||||||
"root=PARTUUID=${uuid} rootwait rw\0" \
|
BOOTENV
|
||||||
"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 \
|
#define BOOT_TARGET_DEVICES(func) \
|
||||||
"if mmc rescan; then " \
|
func(MMC, mmc, 0) \
|
||||||
"if run loadimage; then " \
|
func(DHCP, dhcp, na)
|
||||||
"run mmcboot; " \
|
|
||||||
"else run netboot; " \
|
#include <config_distro_bootcmd.h>
|
||||||
"fi; " \
|
|
||||||
"else run netboot; fi"
|
|
||||||
|
|
||||||
#define CONFIG_SYS_MEMTEST_START 0x80000000
|
#define CONFIG_SYS_MEMTEST_START 0x80000000
|
||||||
#define CONFIG_SYS_MEMTEST_END CONFIG_SYS_MEMTEST_START + SZ_128M
|
#define CONFIG_SYS_MEMTEST_END CONFIG_SYS_MEMTEST_START + SZ_128M
|
||||||
|
|
Loading…
Reference in New Issue
Block a user