mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-29 16:10:24 +09:00
mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or not
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
This commit is contained in:
parent
6efbe21990
commit
bf0c2245a2
@ -83,6 +83,10 @@
|
|||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
"script=boot.scr\0" \
|
"script=boot.scr\0" \
|
||||||
"uimage=uImage\0" \
|
"uimage=uImage\0" \
|
||||||
|
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
||||||
|
"fdt_addr=0x11000000\0" \
|
||||||
|
"boot_fdt=try\0" \
|
||||||
|
"ip_dyn=yes\0" \
|
||||||
"console=" CONFIG_CONSOLE_DEV "\0" \
|
"console=" CONFIG_CONSOLE_DEV "\0" \
|
||||||
"fdt_high=0xffffffff\0" \
|
"fdt_high=0xffffffff\0" \
|
||||||
"initrd_high=0xffffffff\0" \
|
"initrd_high=0xffffffff\0" \
|
||||||
@ -96,15 +100,46 @@
|
|||||||
"bootscript=echo Running bootscript from mmc ...; " \
|
"bootscript=echo Running bootscript from mmc ...; " \
|
||||||
"source\0" \
|
"source\0" \
|
||||||
"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
|
"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
|
||||||
|
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
|
||||||
"mmcboot=echo Booting from mmc ...; " \
|
"mmcboot=echo Booting from mmc ...; " \
|
||||||
"run mmcargs; " \
|
"run mmcargs; " \
|
||||||
"bootm\0" \
|
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
||||||
|
"if run loadfdt; then " \
|
||||||
|
"bootm ${loadaddr} - ${fdt_addr}; " \
|
||||||
|
"else " \
|
||||||
|
"if test ${boot_fdt} = try; then " \
|
||||||
|
"bootm; " \
|
||||||
|
"else " \
|
||||||
|
"echo WARN: Cannot load the DT; " \
|
||||||
|
"fi; " \
|
||||||
|
"fi; " \
|
||||||
|
"else " \
|
||||||
|
"bootm; " \
|
||||||
|
"fi;\0" \
|
||||||
"netargs=setenv bootargs console=${console},${baudrate} " \
|
"netargs=setenv bootargs console=${console},${baudrate} " \
|
||||||
"root=/dev/nfs " \
|
"root=/dev/nfs " \
|
||||||
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
||||||
"netboot=echo Booting from net ...; " \
|
"netboot=echo Booting from net ...; " \
|
||||||
"run netargs; " \
|
"run netargs; " \
|
||||||
"dhcp ${uimage}; bootm\0" \
|
"if test ${ip_dyn} = yes; then " \
|
||||||
|
"setenv get_cmd dhcp; " \
|
||||||
|
"else " \
|
||||||
|
"setenv get_cmd tftp; " \
|
||||||
|
"fi; " \
|
||||||
|
"${get_cmd} ${uimage}; " \
|
||||||
|
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
||||||
|
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
|
||||||
|
"bootm ${loadaddr} - ${fdt_addr}; " \
|
||||||
|
"else " \
|
||||||
|
"if test ${boot_fdt} = try; then " \
|
||||||
|
"bootm; " \
|
||||||
|
"else " \
|
||||||
|
"echo WARN: Cannot load the DT; " \
|
||||||
|
"fi; " \
|
||||||
|
"fi; " \
|
||||||
|
"else " \
|
||||||
|
"bootm; " \
|
||||||
|
"fi;\0"
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND \
|
#define CONFIG_BOOTCOMMAND \
|
||||||
"mmc dev ${mmcdev};" \
|
"mmc dev ${mmcdev};" \
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
#define CONFIG_MACH_TYPE 3529
|
#define CONFIG_MACH_TYPE 3529
|
||||||
#define CONFIG_MXC_UART_BASE UART4_BASE
|
#define CONFIG_MXC_UART_BASE UART4_BASE
|
||||||
#define CONFIG_CONSOLE_DEV "ttymxc3"
|
#define CONFIG_CONSOLE_DEV "ttymxc3"
|
||||||
|
#define CONFIG_DEFAULT_FDT_FILE "imx6q-sabreauto.dtb"
|
||||||
#define CONFIG_MMCROOT "/dev/mmcblk0p2"
|
#define CONFIG_MMCROOT "/dev/mmcblk0p2"
|
||||||
#define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024)
|
#define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024)
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
#define CONFIG_MXC_UART_BASE UART1_BASE
|
#define CONFIG_MXC_UART_BASE UART1_BASE
|
||||||
#define CONFIG_CONSOLE_DEV "ttymxc0"
|
#define CONFIG_CONSOLE_DEV "ttymxc0"
|
||||||
#define CONFIG_MMCROOT "/dev/mmcblk1p2"
|
#define CONFIG_MMCROOT "/dev/mmcblk1p2"
|
||||||
|
#define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd.dtb"
|
||||||
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
|
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
|
||||||
|
|
||||||
#include "mx6qsabre_common.h"
|
#include "mx6qsabre_common.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user