Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4bddbabb10822b8f6cb28a59a426dc9c1cbf8c73

Authored by Ye Li
1 parent 3957eaafc0
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 4 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

MLK-19973 mx6ulz: Change to load uTee-6ulzevk for 6ULZ 

When running on iMX6ULZ, need to set tee_file to uTee-6ulzevk not
uTee-6ullevk. Thus, add findtee script into env to set correct tee
file before booting.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Showing 1 changed file with 14 additions and 1 deletions Inline Diff

include/configs/mx6ullevk.h
Diff comments   View file @ 4bddbab
1 /* 1 /*
2 * Copyright (C) 2016 Freescale Semiconductor, Inc. 2 * Copyright (C) 2016 Freescale Semiconductor, Inc.
3 * Copyright 2017 NXP 3 * Copyright 2017 NXP
4 * 4 *
5 * Configuration settings for the Freescale i.MX6UL 14x14 EVK board. 5 * Configuration settings for the Freescale i.MX6UL 14x14 EVK board.
6 * 6 *
7 * SPDX-License-Identifier: GPL-2.0+ 7 * SPDX-License-Identifier: GPL-2.0+
8 */ 8 */
9 #ifndef __MX6ULLEVK_CONFIG_H 9 #ifndef __MX6ULLEVK_CONFIG_H
10 #define __MX6ULLEVK_CONFIG_H 10 #define __MX6ULLEVK_CONFIG_H
11 11
12 12
13 #include <asm/arch/imx-regs.h> 13 #include <asm/arch/imx-regs.h>
14 #include <linux/sizes.h> 14 #include <linux/sizes.h>
15 #include "mx6_common.h" 15 #include "mx6_common.h"
16 #include <asm/mach-imx/gpio.h> 16 #include <asm/mach-imx/gpio.h>
17 #include "imx_env.h" 17 #include "imx_env.h"
18 18
19 #ifdef CONFIG_SECURE_BOOT 19 #ifdef CONFIG_SECURE_BOOT
20 #ifndef CONFIG_CSF_SIZE 20 #ifndef CONFIG_CSF_SIZE
21 #define CONFIG_CSF_SIZE 0x4000 21 #define CONFIG_CSF_SIZE 0x4000
22 #endif 22 #endif
23 #endif 23 #endif
24 24
25 #define is_mx6ull_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6ULL_9X9_EVK) 25 #define is_mx6ull_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6ULL_9X9_EVK)
26 26
27 #ifdef CONFIG_TARGET_MX6ULL_9X9_EVK 27 #ifdef CONFIG_TARGET_MX6ULL_9X9_EVK
28 #define PHYS_SDRAM_SIZE SZ_256M 28 #define PHYS_SDRAM_SIZE SZ_256M
29 #define BOOTARGS_CMA_SIZE "cma=96M " 29 #define BOOTARGS_CMA_SIZE "cma=96M "
30 #else 30 #else
31 #define PHYS_SDRAM_SIZE SZ_512M 31 #define PHYS_SDRAM_SIZE SZ_512M
32 #define BOOTARGS_CMA_SIZE "" 32 #define BOOTARGS_CMA_SIZE ""
33 /* DCDC used on 14x14 EVK, no PMIC */ 33 /* DCDC used on 14x14 EVK, no PMIC */
34 #undef CONFIG_LDO_BYPASS_CHECK 34 #undef CONFIG_LDO_BYPASS_CHECK
35 #endif 35 #endif
36 36
37 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG 37 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
38 38
39 /* Size of malloc() pool */ 39 /* Size of malloc() pool */
40 #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) 40 #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
41 41
42 #define CONFIG_MXC_UART 42 #define CONFIG_MXC_UART
43 #define CONFIG_MXC_UART_BASE UART1_BASE 43 #define CONFIG_MXC_UART_BASE UART1_BASE
44 44
45 /* MMC Configs */ 45 /* MMC Configs */
46 #ifdef CONFIG_FSL_USDHC 46 #ifdef CONFIG_FSL_USDHC
47 #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR 47 #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
48 48
49 /* NAND pin conflicts with usdhc2 */ 49 /* NAND pin conflicts with usdhc2 */
50 #ifdef CONFIG_CMD_NAND 50 #ifdef CONFIG_CMD_NAND
51 #define CONFIG_SYS_FSL_USDHC_NUM 1 51 #define CONFIG_SYS_FSL_USDHC_NUM 1
52 #else 52 #else
53 #define CONFIG_SYS_FSL_USDHC_NUM 2 53 #define CONFIG_SYS_FSL_USDHC_NUM 2
54 #endif 54 #endif
55 #endif 55 #endif
56 56
57 /* I2C configs */ 57 /* I2C configs */
58 #ifdef CONFIG_CMD_I2C 58 #ifdef CONFIG_CMD_I2C
59 #define CONFIG_SYS_I2C_MXC 59 #define CONFIG_SYS_I2C_MXC
60 #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ 60 #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
61 #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ 61 #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
62 #define CONFIG_SYS_I2C_SPEED 100000 62 #define CONFIG_SYS_I2C_SPEED 100000
63 #endif 63 #endif
64 64
65 /* Only use DM I2C driver for 14x14 EVK. Because the PFUZE3000 driver does not support DM */ 65 /* Only use DM I2C driver for 14x14 EVK. Because the PFUZE3000 driver does not support DM */
66 #ifndef CONFIG_DM_I2C 66 #ifndef CONFIG_DM_I2C
67 #define CONFIG_SYS_I2C 67 #define CONFIG_SYS_I2C
68 68
69 /* PMIC only for 9X9 EVK */ 69 /* PMIC only for 9X9 EVK */
70 #define CONFIG_POWER 70 #define CONFIG_POWER
71 #define CONFIG_POWER_I2C 71 #define CONFIG_POWER_I2C
72 #define CONFIG_POWER_PFUZE3000 72 #define CONFIG_POWER_PFUZE3000
73 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 73 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
74 #endif 74 #endif
75 75
76 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 76 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
77 77
78 #ifdef CONFIG_NAND_BOOT 78 #ifdef CONFIG_NAND_BOOT
79 #define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) " 79 #define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
80 #else 80 #else
81 #define MFG_NAND_PARTITION "" 81 #define MFG_NAND_PARTITION ""
82 #endif 82 #endif
83 83
84 #define CONFIG_CMD_READ 84 #define CONFIG_CMD_READ
85 #define CONFIG_SERIAL_TAG 85 #define CONFIG_SERIAL_TAG
86 #define CONFIG_FASTBOOT_USB_DEV 0 86 #define CONFIG_FASTBOOT_USB_DEV 0
87 87
88 #define CONFIG_MFG_ENV_SETTINGS \ 88 #define CONFIG_MFG_ENV_SETTINGS \
89 CONFIG_MFG_ENV_SETTINGS_DEFAULT \ 89 CONFIG_MFG_ENV_SETTINGS_DEFAULT \
90 "initrd_addr=0x83800000\0" \ 90 "initrd_addr=0x83800000\0" \
91 "initrd_high=0xffffffff\0" \ 91 "initrd_high=0xffffffff\0" \
92 "emmc_dev=1\0"\ 92 "emmc_dev=1\0"\
93 "sd_dev=1\0" \ 93 "sd_dev=1\0" \
94 94
95 #if defined(CONFIG_NAND_BOOT) 95 #if defined(CONFIG_NAND_BOOT)
96 #define CONFIG_EXTRA_ENV_SETTINGS \ 96 #define CONFIG_EXTRA_ENV_SETTINGS \
97 CONFIG_MFG_ENV_SETTINGS \ 97 CONFIG_MFG_ENV_SETTINGS \
98 TEE_ENV \ 98 TEE_ENV \
99 "panel=TFT43AB\0" \ 99 "panel=TFT43AB\0" \
100 "fdt_addr=0x83000000\0" \ 100 "fdt_addr=0x83000000\0" \
101 "fdt_high=0xffffffff\0" \ 101 "fdt_high=0xffffffff\0" \
102 "console=ttymxc0\0" \ 102 "console=ttymxc0\0" \
103 "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \ 103 "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \
104 "root=ubi0:rootfs rootfstype=ubifs " \ 104 "root=ubi0:rootfs rootfstype=ubifs " \
105 BOOTARGS_CMA_SIZE \ 105 BOOTARGS_CMA_SIZE \
106 MFG_NAND_PARTITION \ 106 MFG_NAND_PARTITION \
107 "\0" \ 107 "\0" \
108 "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ 108 "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\
109 "nand read ${fdt_addr} 0x5000000 0x100000;"\ 109 "nand read ${fdt_addr} 0x5000000 0x100000;"\
110 "if test ${tee} = yes; then " \ 110 "if test ${tee} = yes; then " \
111 "nand read ${tee_addr} 0x6000000 0x400000;"\ 111 "nand read ${tee_addr} 0x6000000 0x400000;"\
112 "bootm ${teeaddr} - ${fdt_addr};" \ 112 "bootm ${teeaddr} - ${fdt_addr};" \
113 "else " \ 113 "else " \
114 "bootz ${loadaddr} - ${fdt_addr};" \ 114 "bootz ${loadaddr} - ${fdt_addr};" \
115 "fi\0" 115 "fi\0"
116 116
117 #else 117 #else
118 #define CONFIG_EXTRA_ENV_SETTINGS \ 118 #define CONFIG_EXTRA_ENV_SETTINGS \
119 CONFIG_MFG_ENV_SETTINGS \ 119 CONFIG_MFG_ENV_SETTINGS \
120 TEE_ENV \ 120 TEE_ENV \
121 "script=boot.scr\0" \ 121 "script=boot.scr\0" \
122 "image=zImage\0" \ 122 "image=zImage\0" \
123 "console=ttymxc0\0" \ 123 "console=ttymxc0\0" \
124 "fdt_high=0xffffffff\0" \ 124 "fdt_high=0xffffffff\0" \
125 "initrd_high=0xffffffff\0" \ 125 "initrd_high=0xffffffff\0" \
126 "fdt_file=undefined\0" \ 126 "fdt_file=undefined\0" \
127 "fdt_addr=0x83000000\0" \ 127 "fdt_addr=0x83000000\0" \
128 "tee_addr=0x84000000\0" \ 128 "tee_addr=0x84000000\0" \
129 "tee_file=uTee-6ullevk\0" \ 129 "tee_file=undefined\0" \
130 "boot_fdt=try\0" \ 130 "boot_fdt=try\0" \
131 "ip_dyn=yes\0" \ 131 "ip_dyn=yes\0" \
132 "panel=TFT43AB\0" \ 132 "panel=TFT43AB\0" \
133 "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ 133 "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
134 "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ 134 "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
135 "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ 135 "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
136 "mmcautodetect=yes\0" \ 136 "mmcautodetect=yes\0" \
137 "mmcargs=setenv bootargs console=${console},${baudrate} " \ 137 "mmcargs=setenv bootargs console=${console},${baudrate} " \
138 BOOTARGS_CMA_SIZE \ 138 BOOTARGS_CMA_SIZE \
139 "root=${mmcroot}\0" \ 139 "root=${mmcroot}\0" \
140 "loadbootscript=" \ 140 "loadbootscript=" \
141 "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ 141 "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
142 "bootscript=echo Running bootscript from mmc ...; " \ 142 "bootscript=echo Running bootscript from mmc ...; " \
143 "source\0" \ 143 "source\0" \
144 "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ 144 "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
145 "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ 145 "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
146 "loadtee=fatload mmc ${mmcdev}:${mmcpart} ${tee_addr} ${tee_file}\0" \ 146 "loadtee=fatload mmc ${mmcdev}:${mmcpart} ${tee_addr} ${tee_file}\0" \
147 "mmcboot=echo Booting from mmc ...; " \ 147 "mmcboot=echo Booting from mmc ...; " \
148 "run mmcargs; " \ 148 "run mmcargs; " \
149 "if test ${tee} = yes; then " \ 149 "if test ${tee} = yes; then " \
150 "run loadfdt; run loadtee; bootm ${tee_addr} - ${fdt_addr}; " \ 150 "run loadfdt; run loadtee; bootm ${tee_addr} - ${fdt_addr}; " \
151 "else " \ 151 "else " \
152 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ 152 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
153 "if run loadfdt; then " \ 153 "if run loadfdt; then " \
154 "bootz ${loadaddr} - ${fdt_addr}; " \ 154 "bootz ${loadaddr} - ${fdt_addr}; " \
155 "else " \ 155 "else " \
156 "if test ${boot_fdt} = try; then " \ 156 "if test ${boot_fdt} = try; then " \
157 "bootz; " \ 157 "bootz; " \
158 "else " \ 158 "else " \
159 "echo WARN: Cannot load the DT; " \ 159 "echo WARN: Cannot load the DT; " \
160 "fi; " \ 160 "fi; " \
161 "fi; " \ 161 "fi; " \
162 "else " \ 162 "else " \
163 "bootz; " \ 163 "bootz; " \
164 "fi; " \ 164 "fi; " \
165 "fi;\0" \ 165 "fi;\0" \
166 "netargs=setenv bootargs console=${console},${baudrate} " \ 166 "netargs=setenv bootargs console=${console},${baudrate} " \
167 BOOTARGS_CMA_SIZE \ 167 BOOTARGS_CMA_SIZE \
168 "root=/dev/nfs " \ 168 "root=/dev/nfs " \
169 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ 169 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
170 "netboot=echo Booting from net ...; " \ 170 "netboot=echo Booting from net ...; " \
171 "${usb_net_cmd}; " \ 171 "${usb_net_cmd}; " \
172 "run netargs; " \ 172 "run netargs; " \
173 "if test ${ip_dyn} = yes; then " \ 173 "if test ${ip_dyn} = yes; then " \
174 "setenv get_cmd dhcp; " \ 174 "setenv get_cmd dhcp; " \
175 "else " \ 175 "else " \
176 "setenv get_cmd tftp; " \ 176 "setenv get_cmd tftp; " \
177 "fi; " \ 177 "fi; " \
178 "${get_cmd} ${image}; " \ 178 "${get_cmd} ${image}; " \
179 "if test ${tee} = yes; then " \ 179 "if test ${tee} = yes; then " \
180 "${get_cmd} ${tee_addr} ${tee_file}; " \ 180 "${get_cmd} ${tee_addr} ${tee_file}; " \
181 "${get_cmd} ${fdt_addr} ${fdt_file}; " \ 181 "${get_cmd} ${fdt_addr} ${fdt_file}; " \
182 "bootm ${tee_addr} - ${fdt_addr}; " \ 182 "bootm ${tee_addr} - ${fdt_addr}; " \
183 "else " \ 183 "else " \
184 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ 184 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
185 "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ 185 "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
186 "bootz ${loadaddr} - ${fdt_addr}; " \ 186 "bootz ${loadaddr} - ${fdt_addr}; " \
187 "else " \ 187 "else " \
188 "if test ${boot_fdt} = try; then " \ 188 "if test ${boot_fdt} = try; then " \
189 "bootz; " \ 189 "bootz; " \
190 "else " \ 190 "else " \
191 "echo WARN: Cannot load the DT; " \ 191 "echo WARN: Cannot load the DT; " \
192 "fi; " \ 192 "fi; " \
193 "fi; " \ 193 "fi; " \
194 "else " \ 194 "else " \
195 "bootz; " \ 195 "bootz; " \
196 "fi; " \ 196 "fi; " \
197 "fi;\0" \ 197 "fi;\0" \
198 "findfdt="\ 198 "findfdt="\
199 "if test $fdt_file = undefined; then " \ 199 "if test $fdt_file = undefined; then " \
200 "if test $board_name = ULZ-EVK && test $board_rev = 14X14; then " \ 200 "if test $board_name = ULZ-EVK && test $board_rev = 14X14; then " \
201 "setenv fdt_file imx6ulz-14x14-evk.dtb; fi; " \ 201 "setenv fdt_file imx6ulz-14x14-evk.dtb; fi; " \
202 "if test $board_name = EVK && test $board_rev = 9X9; then " \ 202 "if test $board_name = EVK && test $board_rev = 9X9; then " \
203 "setenv fdt_file imx6ull-9x9-evk.dtb; fi; " \ 203 "setenv fdt_file imx6ull-9x9-evk.dtb; fi; " \
204 "if test $board_name = EVK && test $board_rev = 14X14; then " \ 204 "if test $board_name = EVK && test $board_rev = 14X14; then " \
205 "setenv fdt_file imx6ull-14x14-evk.dtb; fi; " \ 205 "setenv fdt_file imx6ull-14x14-evk.dtb; fi; " \
206 "if test $fdt_file = undefined; then " \ 206 "if test $fdt_file = undefined; then " \
207 "echo WARNING: Could not determine dtb to use; " \ 207 "echo WARNING: Could not determine dtb to use; " \
208 "fi; " \ 208 "fi; " \
209 "fi;\0" \ 209 "fi;\0" \
210 "findtee="\
211 "if test $tee_file = undefined; then " \
212 "if test $board_name = ULZ-EVK && test $board_rev = 14X14; then " \
213 "setenv tee_file uTee-6ulzevk; fi; " \
214 "if test $board_name = EVK && test $board_rev = 9X9; then " \
215 "setenv tee_file uTee-6ullevk; fi; " \
216 "if test $board_name = EVK && test $board_rev = 14X14; then " \
217 "setenv tee_file uTee-6ullevk; fi; " \
218 "if test $tee_file = undefined; then " \
219 "echo WARNING: Could not determine tee to use; " \
220 "fi; " \
221 "fi;\0" \
210 222
211 #define CONFIG_BOOTCOMMAND \ 223 #define CONFIG_BOOTCOMMAND \
212 "run findfdt;" \ 224 "run findfdt;" \
225 "run findtee;" \
213 "mmc dev ${mmcdev};" \ 226 "mmc dev ${mmcdev};" \
214 "mmc dev ${mmcdev}; if mmc rescan; then " \ 227 "mmc dev ${mmcdev}; if mmc rescan; then " \
215 "if run loadbootscript; then " \ 228 "if run loadbootscript; then " \
216 "run bootscript; " \ 229 "run bootscript; " \
217 "else " \ 230 "else " \
218 "if run loadimage; then " \ 231 "if run loadimage; then " \
219 "run mmcboot; " \ 232 "run mmcboot; " \
220 "else run netboot; " \ 233 "else run netboot; " \
221 "fi; " \ 234 "fi; " \
222 "fi; " \ 235 "fi; " \
223 "else run netboot; fi" 236 "else run netboot; fi"
224 #endif 237 #endif
225 238
226 /* Miscellaneous configurable options */ 239 /* Miscellaneous configurable options */
227 #define CONFIG_SYS_MEMTEST_START 0x80000000 240 #define CONFIG_SYS_MEMTEST_START 0x80000000
228 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x8000000) 241 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x8000000)
229 242
230 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR 243 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
231 #define CONFIG_SYS_HZ 1000 244 #define CONFIG_SYS_HZ 1000
232 245
233 /* Physical Memory Map */ 246 /* Physical Memory Map */
234 #define CONFIG_NR_DRAM_BANKS 1 247 #define CONFIG_NR_DRAM_BANKS 1
235 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR 248 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
236 249
237 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM 250 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
238 #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR 251 #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
239 #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE 252 #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
240 253
241 #define CONFIG_SYS_INIT_SP_OFFSET \ 254 #define CONFIG_SYS_INIT_SP_OFFSET \
242 (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) 255 (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
243 #define CONFIG_SYS_INIT_SP_ADDR \ 256 #define CONFIG_SYS_INIT_SP_ADDR \
244 (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) 257 (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
245 258
246 /* environment organization */ 259 /* environment organization */
247 #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ 260 #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */
248 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ 261 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */
249 #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ 262 #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
250 263
251 #define CONFIG_IMX_THERMAL 264 #define CONFIG_IMX_THERMAL
252 265
253 #define CONFIG_IOMUX_LPSR 266 #define CONFIG_IOMUX_LPSR
254 267
255 #define CONFIG_SOFT_SPI 268 #define CONFIG_SOFT_SPI
256 269
257 #ifdef CONFIG_FSL_QSPI 270 #ifdef CONFIG_FSL_QSPI
258 #define CONFIG_SYS_FSL_QSPI_AHB 271 #define CONFIG_SYS_FSL_QSPI_AHB
259 #define CONFIG_SF_DEFAULT_BUS 0 272 #define CONFIG_SF_DEFAULT_BUS 0
260 #define CONFIG_SF_DEFAULT_CS 0 273 #define CONFIG_SF_DEFAULT_CS 0
261 #define CONFIG_SF_DEFAULT_SPEED 40000000 274 #define CONFIG_SF_DEFAULT_SPEED 40000000
262 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 275 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
263 #define FSL_QSPI_FLASH_NUM 1 276 #define FSL_QSPI_FLASH_NUM 1
264 #define FSL_QSPI_FLASH_SIZE SZ_32M 277 #define FSL_QSPI_FLASH_SIZE SZ_32M
265 #endif 278 #endif
266 279
267 #ifdef CONFIG_CMD_NAND 280 #ifdef CONFIG_CMD_NAND
268 #define CONFIG_CMD_NAND_TRIMFFS 281 #define CONFIG_CMD_NAND_TRIMFFS
269 282
270 #define CONFIG_NAND_MXS 283 #define CONFIG_NAND_MXS
271 #define CONFIG_SYS_MAX_NAND_DEVICE 1 284 #define CONFIG_SYS_MAX_NAND_DEVICE 1
272 #define CONFIG_SYS_NAND_BASE 0x40000000 285 #define CONFIG_SYS_NAND_BASE 0x40000000
273 #define CONFIG_SYS_NAND_5_ADDR_CYCLE 286 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
274 #define CONFIG_SYS_NAND_ONFI_DETECTION 287 #define CONFIG_SYS_NAND_ONFI_DETECTION
275 288
276 /* DMA stuff, needed for GPMI/MXS NAND support */ 289 /* DMA stuff, needed for GPMI/MXS NAND support */
277 #define CONFIG_APBH_DMA 290 #define CONFIG_APBH_DMA
278 #define CONFIG_APBH_DMA_BURST 291 #define CONFIG_APBH_DMA_BURST
279 #define CONFIG_APBH_DMA_BURST8 292 #define CONFIG_APBH_DMA_BURST8
280 #endif 293 #endif
281 294
282 #define CONFIG_ENV_SIZE SZ_8K 295 #define CONFIG_ENV_SIZE SZ_8K
283 #if defined(CONFIG_ENV_IS_IN_MMC) 296 #if defined(CONFIG_ENV_IS_IN_MMC)
284 #define CONFIG_ENV_OFFSET (14 * SZ_64K) 297 #define CONFIG_ENV_OFFSET (14 * SZ_64K)
285 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) 298 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
286 #define CONFIG_ENV_OFFSET (896 * 1024) 299 #define CONFIG_ENV_OFFSET (896 * 1024)
287 #define CONFIG_ENV_SECT_SIZE (64 * 1024) 300 #define CONFIG_ENV_SECT_SIZE (64 * 1024)
288 #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS 301 #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
289 #define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS 302 #define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
290 #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE 303 #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
291 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED 304 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
292 #elif defined(CONFIG_ENV_IS_IN_NAND) 305 #elif defined(CONFIG_ENV_IS_IN_NAND)
293 #undef CONFIG_ENV_SIZE 306 #undef CONFIG_ENV_SIZE
294 #define CONFIG_ENV_OFFSET (60 << 20) 307 #define CONFIG_ENV_OFFSET (60 << 20)
295 #define CONFIG_ENV_SECT_SIZE (128 << 10) 308 #define CONFIG_ENV_SECT_SIZE (128 << 10)
296 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE 309 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
297 #endif 310 #endif
298 311
299 /* USB Configs */ 312 /* USB Configs */
300 #ifdef CONFIG_CMD_USB 313 #ifdef CONFIG_CMD_USB
301 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) 314 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
302 #endif 315 #endif
303 316
304 #ifdef CONFIG_FEC_MXC 317 #ifdef CONFIG_FEC_MXC
305 #define CONFIG_MII 318 #define CONFIG_MII
306 #define CONFIG_FEC_ENET_DEV 1 319 #define CONFIG_FEC_ENET_DEV 1
307 320
308 #if (CONFIG_FEC_ENET_DEV == 0) 321 #if (CONFIG_FEC_ENET_DEV == 0)
309 #define IMX_FEC_BASE ENET_BASE_ADDR 322 #define IMX_FEC_BASE ENET_BASE_ADDR
310 #define CONFIG_FEC_MXC_PHYADDR 0x2 323 #define CONFIG_FEC_MXC_PHYADDR 0x2
311 #define CONFIG_FEC_XCV_TYPE RMII 324 #define CONFIG_FEC_XCV_TYPE RMII
312 #ifdef CONFIG_DM_ETH 325 #ifdef CONFIG_DM_ETH
313 #define CONFIG_ETHPRIME "eth0" 326 #define CONFIG_ETHPRIME "eth0"
314 #else 327 #else
315 #define CONFIG_ETHPRIME "FEC0" 328 #define CONFIG_ETHPRIME "FEC0"
316 #endif 329 #endif
317 #elif (CONFIG_FEC_ENET_DEV == 1) 330 #elif (CONFIG_FEC_ENET_DEV == 1)
318 #define IMX_FEC_BASE ENET2_BASE_ADDR 331 #define IMX_FEC_BASE ENET2_BASE_ADDR
319 #define CONFIG_FEC_MXC_PHYADDR 0x1 332 #define CONFIG_FEC_MXC_PHYADDR 0x1
320 #define CONFIG_FEC_XCV_TYPE RMII 333 #define CONFIG_FEC_XCV_TYPE RMII
321 #ifdef CONFIG_DM_ETH 334 #ifdef CONFIG_DM_ETH
322 #define CONFIG_ETHPRIME "eth1" 335 #define CONFIG_ETHPRIME "eth1"
323 #else 336 #else
324 #define CONFIG_ETHPRIME "FEC1" 337 #define CONFIG_ETHPRIME "FEC1"
325 #endif 338 #endif
326 #endif 339 #endif
327 #define CONFIG_FEC_MXC_MDIO_BASE ENET2_BASE_ADDR 340 #define CONFIG_FEC_MXC_MDIO_BASE ENET2_BASE_ADDR
328 #endif 341 #endif
329 342
330 #ifdef CONFIG_VIDEO 343 #ifdef CONFIG_VIDEO
331 #define CONFIG_VIDEO_MXS 344 #define CONFIG_VIDEO_MXS
332 #define CONFIG_VIDEO_LOGO 345 #define CONFIG_VIDEO_LOGO
333 #define CONFIG_SPLASH_SCREEN 346 #define CONFIG_SPLASH_SCREEN
334 #define CONFIG_SPLASH_SCREEN_ALIGN 347 #define CONFIG_SPLASH_SCREEN_ALIGN
335 #define CONFIG_BMP_16BPP 348 #define CONFIG_BMP_16BPP
336 #define CONFIG_VIDEO_BMP_RLE8 349 #define CONFIG_VIDEO_BMP_RLE8
337 #define CONFIG_VIDEO_BMP_LOGO 350 #define CONFIG_VIDEO_BMP_LOGO
338 #define CONFIG_IMX_VIDEO_SKIP 351 #define CONFIG_IMX_VIDEO_SKIP
339 #endif 352 #endif
340 353
341 #define CONFIG_MODULE_FUSE 354 #define CONFIG_MODULE_FUSE
342 #define CONFIG_OF_SYSTEM_SETUP 355 #define CONFIG_OF_SYSTEM_SETUP
343 356
344 #endif 357 #endif
345 358