aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador2013-01-10 03:45:09 -0600
committerStefano Babic2013-01-13 04:53:45 -0600
commitbf0c2245a2d8bbf437f6182f7d50b896461a931d (patch)
treec86d36a1c2c8e79a3b1e44706c6bbdf879c1a333
parent6efbe2199008f3a3abadcc59fd9d8e7d51cf816a (diff)
downloadu-boot-bf0c2245a2d8bbf437f6182f7d50b896461a931d.tar.gz
u-boot-bf0c2245a2d8bbf437f6182f7d50b896461a931d.tar.xz
u-boot-bf0c2245a2d8bbf437f6182f7d50b896461a931d.zip
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>
-rw-r--r--include/configs/mx6qsabre_common.h41
-rw-r--r--include/configs/mx6qsabreauto.h1
-rw-r--r--include/configs/mx6qsabresd.h1
3 files changed, 40 insertions, 3 deletions
diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index bd2fb108f..3229d5ace 100644
--- a/include/configs/mx6qsabre_common.h
+++ b/include/configs/mx6qsabre_common.h
@@ -83,6 +83,10 @@
83#define CONFIG_EXTRA_ENV_SETTINGS \ 83#define CONFIG_EXTRA_ENV_SETTINGS \
84 "script=boot.scr\0" \ 84 "script=boot.scr\0" \
85 "uimage=uImage\0" \ 85 "uimage=uImage\0" \
86 "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
87 "fdt_addr=0x11000000\0" \
88 "boot_fdt=try\0" \
89 "ip_dyn=yes\0" \
86 "console=" CONFIG_CONSOLE_DEV "\0" \ 90 "console=" CONFIG_CONSOLE_DEV "\0" \
87 "fdt_high=0xffffffff\0" \ 91 "fdt_high=0xffffffff\0" \
88 "initrd_high=0xffffffff\0" \ 92 "initrd_high=0xffffffff\0" \
@@ -96,15 +100,46 @@
96 "bootscript=echo Running bootscript from mmc ...; " \ 100 "bootscript=echo Running bootscript from mmc ...; " \
97 "source\0" \ 101 "source\0" \
98 "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ 102 "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
99 "mmcboot=echo Booting from mmc ...; " \ 103 "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
104 "mmcboot=echo Booting from mmc ...; " \
100 "run mmcargs; " \ 105 "run mmcargs; " \
101 "bootm\0" \ 106 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
107 "if run loadfdt; then " \
108 "bootm ${loadaddr} - ${fdt_addr}; " \
109 "else " \
110 "if test ${boot_fdt} = try; then " \
111 "bootm; " \
112 "else " \
113 "echo WARN: Cannot load the DT; " \
114 "fi; " \
115 "fi; " \
116 "else " \
117 "bootm; " \
118 "fi;\0" \
102 "netargs=setenv bootargs console=${console},${baudrate} " \ 119 "netargs=setenv bootargs console=${console},${baudrate} " \
103 "root=/dev/nfs " \ 120 "root=/dev/nfs " \
104 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ 121 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
105 "netboot=echo Booting from net ...; " \ 122 "netboot=echo Booting from net ...; " \
106 "run netargs; " \ 123 "run netargs; " \
107 "dhcp ${uimage}; bootm\0" \ 124 "if test ${ip_dyn} = yes; then " \
125 "setenv get_cmd dhcp; " \
126 "else " \
127 "setenv get_cmd tftp; " \
128 "fi; " \
129 "${get_cmd} ${uimage}; " \
130 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
131 "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
132 "bootm ${loadaddr} - ${fdt_addr}; " \
133 "else " \
134 "if test ${boot_fdt} = try; then " \
135 "bootm; " \
136 "else " \
137 "echo WARN: Cannot load the DT; " \
138 "fi; " \
139 "fi; " \
140 "else " \
141 "bootm; " \
142 "fi;\0"
108 143
109#define CONFIG_BOOTCOMMAND \ 144#define CONFIG_BOOTCOMMAND \
110 "mmc dev ${mmcdev};" \ 145 "mmc dev ${mmcdev};" \
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index f1ff20169..f4a082aea 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -15,6 +15,7 @@
15#define CONFIG_MACH_TYPE 3529 15#define CONFIG_MACH_TYPE 3529
16#define CONFIG_MXC_UART_BASE UART4_BASE 16#define CONFIG_MXC_UART_BASE UART4_BASE
17#define CONFIG_CONSOLE_DEV "ttymxc3" 17#define CONFIG_CONSOLE_DEV "ttymxc3"
18#define CONFIG_DEFAULT_FDT_FILE "imx6q-sabreauto.dtb"
18#define CONFIG_MMCROOT "/dev/mmcblk0p2" 19#define CONFIG_MMCROOT "/dev/mmcblk0p2"
19#define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024) 20#define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024)
20 21
diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
index a1d92850c..b64e9254f 100644
--- a/include/configs/mx6qsabresd.h
+++ b/include/configs/mx6qsabresd.h
@@ -21,6 +21,7 @@
21#define CONFIG_MXC_UART_BASE UART1_BASE 21#define CONFIG_MXC_UART_BASE UART1_BASE
22#define CONFIG_CONSOLE_DEV "ttymxc0" 22#define CONFIG_CONSOLE_DEV "ttymxc0"
23#define CONFIG_MMCROOT "/dev/mmcblk1p2" 23#define CONFIG_MMCROOT "/dev/mmcblk1p2"
24#define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd.dtb"
24#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) 25#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
25 26
26#include "mx6qsabre_common.h" 27#include "mx6qsabre_common.h"