Merge git://git.denx.de/u-boot-imx
- changes in pico-* boards - fix imx6ull pinmux
This commit is contained in:
Tom Rini
@@ -12,6 +12,19 @@
|
||||
#include <linux/sizes.h>
|
||||
#include "mx6_common.h"
|
||||
#include <asm/mach-imx/gpio.h>
|
||||
#include "imx6_spl.h"
|
||||
|
||||
#ifdef CONFIG_SPL_OS_BOOT
|
||||
/* Falcon Mode */
|
||||
#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
|
||||
#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
|
||||
#define CONFIG_SYS_SPL_ARGS_ADDR 0x88000000
|
||||
|
||||
/* Falcon Mode - MMC support: args@1MB kernel@2MB */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */
|
||||
#endif
|
||||
|
||||
/* Network support */
|
||||
|
||||
@@ -27,7 +40,6 @@
|
||||
#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR
|
||||
|
||||
/* MMC Configs */
|
||||
#define CONFIG_FSL_USDHC
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
|
||||
#define CONFIG_SUPPORT_EMMC_BOOT
|
||||
|
||||
@@ -43,74 +55,57 @@
|
||||
#define DFU_DEFAULT_POLL_TIMEOUT 300
|
||||
|
||||
#define CONFIG_DFU_ENV_SETTINGS \
|
||||
"dfu_alt_info=uboot raw 0x2 0x400 mmcpart 1;" \
|
||||
"boot part 0 1;" \
|
||||
"/zImage ext4 0 1;" \
|
||||
"/imx6ul-pico-hobbit.dtb ext4 0 1;" \
|
||||
"rootfs part 0 2\0" \
|
||||
"dfu_alt_info=" \
|
||||
"spl raw 0x2 0x400 mmcpart 1;" \
|
||||
"u-boot raw 0x8a 0x400 mmcpart 1;" \
|
||||
"/boot/zImage ext4 0 1;" \
|
||||
"/boot/imx6ul-pico-hobbit.dtb ext4 0 1;" \
|
||||
"/boot/imx6ul-pico-pi.dtb ext4 0 1;" \
|
||||
"rootfs part 0 1\0" \
|
||||
|
||||
#define BOOTMENU_ENV \
|
||||
"bootmenu_0=Boot using PICO-Hobbit baseboard=" \
|
||||
"setenv fdtfile imx6ul-pico-hobbit.dtb\0" \
|
||||
"bootmenu_1=Boot using PICO-Pi baseboard=" \
|
||||
"setenv fdtfile imx6ul-pico-pi.dtb\0" \
|
||||
|
||||
#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" \
|
||||
BOOTMENU_ENV \
|
||||
"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" \
|
||||
"mmcautodetect=yes\0" \
|
||||
CONFIG_DFU_ENV_SETTINGS \
|
||||
"finduuid=part uuid mmc 0:2 uuid\0" \
|
||||
"findfdt=" \
|
||||
"if test $fdtfile = ask ; then " \
|
||||
"bootmenu -1; fi;" \
|
||||
"if test $fdtfile != ask ; then " \
|
||||
"saveenv; fi;\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" \
|
||||
"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 CONFIG_BOOTCOMMAND \
|
||||
"if mmc rescan; then " \
|
||||
"if run loadimage; then " \
|
||||
"run mmcboot; " \
|
||||
"else run netboot; " \
|
||||
"fi; " \
|
||||
"else run netboot; fi"
|
||||
#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
|
||||
|
||||
@@ -48,11 +48,14 @@
|
||||
"spl raw 0x2 0x400 mmcpart 1;" \
|
||||
"u-boot raw 0x8a 0x400 mmcpart 1;" \
|
||||
"/boot/zImage ext4 0 1;" \
|
||||
"/boot/imx7d-pico-hobbit.dtb ext4 0 1;" \
|
||||
"/boot/imx7d-pico-pi.dtb ext4 0 1;" \
|
||||
"rootfs part 0 1\0" \
|
||||
|
||||
#define BOOTMENU_ENV \
|
||||
"bootmenu_0=Boot using PICO-PI baseboard=" \
|
||||
"bootmenu_0=Boot using PICO-Hobbit baseboard=" \
|
||||
"setenv fdtfile imx7d-pico-hobbit.dtb\0" \
|
||||
"bootmenu_1=Boot using PICO-Pi baseboard=" \
|
||||
"setenv fdtfile imx7d-pico-pi.dtb\0" \
|
||||
|
||||
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
|
||||
|
||||
Reference in New Issue
Block a user