mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 06:31:31 +00:00
embestmx6boards: convert to use config_distro_bootcmd.h
Since the Riot & Mars boards are dev boards it's likely people will want to run standard distros on them. So replace the current boot scripts with the standard one from config_distro_bootcmd.h Signed-off-by: Iain Paton <ipaton0@gmail.com> Tested-by: Nikolay Dimitrov <picmaster@mail.bg>
This commit is contained in:
Iain Paton
Stefano Babic
parent
729d2a34bd
commit
c86efd85e9
1 changed files with 39 additions and 129 deletions
|
|
@ -116,133 +116,6 @@
|
||||||
#define CONFIG_LOADADDR 0x12000000
|
#define CONFIG_LOADADDR 0x12000000
|
||||||
#define CONFIG_SYS_TEXT_BASE 0x17800000
|
#define CONFIG_SYS_TEXT_BASE 0x17800000
|
||||||
|
|
||||||
#ifdef CONFIG_SUPPORT_EMMC_BOOT
|
|
||||||
#define EMMC_ENV \
|
|
||||||
"emmcdev=2\0" \
|
|
||||||
"update_emmc_firmware=" \
|
|
||||||
"if test ${ip_dyn} = yes; then " \
|
|
||||||
"setenv get_cmd dhcp; " \
|
|
||||||
"else " \
|
|
||||||
"setenv get_cmd tftp; " \
|
|
||||||
"fi; " \
|
|
||||||
"if ${get_cmd} ${update_sd_firmware_filename}; then " \
|
|
||||||
"if mmc dev ${emmcdev}; then " \
|
|
||||||
"setexpr fw_sz ${filesize} / 0x200; " \
|
|
||||||
"setexpr fw_sz ${fw_sz} + 1; " \
|
|
||||||
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
|
||||||
"fi; " \
|
|
||||||
"fi\0"
|
|
||||||
#else
|
|
||||||
#define EMMC_ENV ""
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_CMD_SF
|
|
||||||
#define SF_ENV \
|
|
||||||
"update_spi_firmware=" \
|
|
||||||
"if test ${ip_dyn} = yes; then " \
|
|
||||||
"setenv get_cmd dhcp; " \
|
|
||||||
"else " \
|
|
||||||
"setenv get_cmd tftp; " \
|
|
||||||
"fi; " \
|
|
||||||
"if ${get_cmd} ${update_spi_firmware_filename}; then " \
|
|
||||||
"if sf probe; then " \
|
|
||||||
"sf erase 0 0xc0000; " \
|
|
||||||
"sf write ${loadaddr} 0x400 ${filesize}; " \
|
|
||||||
"fi; " \
|
|
||||||
"fi\0"
|
|
||||||
#else
|
|
||||||
#define SF_ENV ""
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
||||||
"script=boot.scr\0" \
|
|
||||||
"image=zImage\0" \
|
|
||||||
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
|
||||||
"fdt_addr=0x18000000\0" \
|
|
||||||
"boot_fdt=try\0" \
|
|
||||||
"ip_dyn=yes\0" \
|
|
||||||
"console=" CONFIG_CONSOLE_DEV "\0" \
|
|
||||||
"fdt_high=0xffffffff\0" \
|
|
||||||
"initrd_high=0xffffffff\0" \
|
|
||||||
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
|
||||||
"mmcpart=1\0" \
|
|
||||||
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
|
|
||||||
"update_sd_firmware=" \
|
|
||||||
"if test ${ip_dyn} = yes; then " \
|
|
||||||
"setenv get_cmd dhcp; " \
|
|
||||||
"else " \
|
|
||||||
"setenv get_cmd tftp; " \
|
|
||||||
"fi; " \
|
|
||||||
"if mmc dev ${mmcdev}; then " \
|
|
||||||
"if ${get_cmd} ${update_sd_firmware_filename}; then " \
|
|
||||||
"setexpr fw_sz ${filesize} / 0x200; " \
|
|
||||||
"setexpr fw_sz ${fw_sz} + 1; " \
|
|
||||||
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
|
||||||
"fi; " \
|
|
||||||
"fi\0" \
|
|
||||||
EMMC_ENV \
|
|
||||||
SF_ENV \
|
|
||||||
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
|
||||||
"root=${mmcroot}\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 mmcargs; " \
|
|
||||||
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
|
||||||
"if run loadfdt; 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" \
|
|
||||||
"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 \
|
|
||||||
"mmc dev ${mmcdev};" \
|
|
||||||
"if mmc rescan; then " \
|
|
||||||
"if run loadbootscript; then " \
|
|
||||||
"run bootscript; " \
|
|
||||||
"else " \
|
|
||||||
"if run loadimage; then " \
|
|
||||||
"run mmcboot; " \
|
|
||||||
"else run netboot; " \
|
|
||||||
"fi; " \
|
|
||||||
"fi; " \
|
|
||||||
"else run netboot; fi"
|
|
||||||
|
|
||||||
#define CONFIG_ARP_TIMEOUT 200UL
|
#define CONFIG_ARP_TIMEOUT 200UL
|
||||||
|
|
||||||
/* Miscellaneous configurable options */
|
/* Miscellaneous configurable options */
|
||||||
|
|
@ -282,14 +155,14 @@
|
||||||
|
|
||||||
#if defined(CONFIG_ENV_IS_IN_MMC)
|
#if defined(CONFIG_ENV_IS_IN_MMC)
|
||||||
/* RiOTboard */
|
/* RiOTboard */
|
||||||
#define CONFIG_DEFAULT_FDT_FILE "imx6dl-riotboard.dtb"
|
#define CONFIG_FDTFILE "imx6dl-riotboard.dtb"
|
||||||
#define CONFIG_SYS_FSL_USDHC_NUM 3
|
#define CONFIG_SYS_FSL_USDHC_NUM 3
|
||||||
#define CONFIG_SYS_MMC_ENV_DEV 2 /* SDHC4 */
|
#define CONFIG_SYS_MMC_ENV_DEV 2 /* SDHC4 */
|
||||||
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
|
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
|
||||||
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
|
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
|
||||||
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
|
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
|
||||||
/* MarSBoard */
|
/* MarSBoard */
|
||||||
#define CONFIG_DEFAULT_FDT_FILE "imx6q-marsboard.dtb"
|
#define CONFIG_FDTFILE "imx6q-marsboard.dtb"
|
||||||
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
||||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||||
#define CONFIG_ENV_SECT_SIZE (8 * 1024)
|
#define CONFIG_ENV_SECT_SIZE (8 * 1024)
|
||||||
|
|
@ -322,4 +195,41 @@
|
||||||
|
|
||||||
#include <config_distro_defaults.h>
|
#include <config_distro_defaults.h>
|
||||||
|
|
||||||
|
/* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
|
||||||
|
* 1M script, 1M pxe and the ramdisk at the end */
|
||||||
|
#define MEM_LAYOUT_ENV_SETTINGS \
|
||||||
|
"bootm_size=0x10000000\0" \
|
||||||
|
"kernel_addr_r=0x12000000\0" \
|
||||||
|
"fdt_addr_r=0x13000000\0" \
|
||||||
|
"scriptaddr=0x13100000\0" \
|
||||||
|
"pxefile_addr_r=0x13200000\0" \
|
||||||
|
"ramdisk_addr_r=0x13300000\0"
|
||||||
|
|
||||||
|
#define BOOT_TARGET_DEVICES(func) \
|
||||||
|
func(MMC, mmc, 0) \
|
||||||
|
func(MMC, mmc, 1) \
|
||||||
|
func(MMC, mmc, 2) \
|
||||||
|
func(USB, usb, 0) \
|
||||||
|
func(PXE, pxe, na) \
|
||||||
|
func(DHCP, dhcp, na)
|
||||||
|
|
||||||
|
#include <config_distro_bootcmd.h>
|
||||||
|
|
||||||
|
#define CONSOLE_STDIN_SETTINGS \
|
||||||
|
"stdin=serial\0"
|
||||||
|
|
||||||
|
#define CONSOLE_STDOUT_SETTINGS \
|
||||||
|
"stdout=serial\0" \
|
||||||
|
"stderr=serial\0"
|
||||||
|
|
||||||
|
#define CONSOLE_ENV_SETTINGS \
|
||||||
|
CONSOLE_STDIN_SETTINGS \
|
||||||
|
CONSOLE_STDOUT_SETTINGS
|
||||||
|
|
||||||
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
|
CONSOLE_ENV_SETTINGS \
|
||||||
|
MEM_LAYOUT_ENV_SETTINGS \
|
||||||
|
"fdtfile=" CONFIG_FDTFILE "\0" \
|
||||||
|
BOOTENV
|
||||||
|
|
||||||
#endif /* __RIOTBOARD_CONFIG_H */
|
#endif /* __RIOTBOARD_CONFIG_H */
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue