Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3c92c3232c1f133de6424e15293115d6003f6536

Authored by Ash Charles
Committed by Tom Rini
1 parent ea5940e9d2
Exists in v2017.01-smarct4x and in 40 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

Allow overo to boot with device tree 

Update the board configuration for Gumstix Overo. In particular,
add support for zImage and DTB files on boot.

Signed-off-by: Ash Charles <ashcharles@gmail.com>

Showing 1 changed file with 38 additions and 20 deletions Side-by-side Diff

include/configs/omap3_overo.h
Diff comments   View file @ 3c92c32
... ... @@ -39,6 +39,7 @@
39 39 #define CONFIG_REVISION_TAG
40 40  
41 41 #define CONFIG_OF_LIBFDT
  42 +#define CONFIG_CMD_BOOTZ
42 43  
43 44 /*
44 45 * Size of malloc() pool
... ... @@ -92,7 +93,7 @@
92 93 #define CONFIG_CMD_CACHE
93 94 #define CONFIG_CMD_EXT2 /* EXT2 Support */
94 95 #define CONFIG_CMD_FAT /* FAT support */
95   -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
  96 +#define CONFIG_CMD_FS_GENERIC
96 97  
97 98 #define CONFIG_CMD_I2C /* I2C serial bus support */
98 99 #define CONFIG_CMD_MMC /* MMC support */
99 100  
... ... @@ -165,8 +166,13 @@
165 166  
166 167 #define CONFIG_EXTRA_ENV_SETTINGS \
167 168 "loadaddr=0x82000000\0" \
  169 + "dtbaddr=0x81600000\0" \
  170 + "dtbfile=overo.dtb\0" \
  171 + "bootdir=/boot\0" \
  172 + "bootfile=zImage\0" \
  173 + "usbtty=cdc_acm\0" \
168 174 "console=ttyO2,115200n8\0" \
169   - "mpurate=500\0" \" \
  175 + "mpurate=auto\0" \" \
170 176 "optargs=\0" \
171 177 "vram=12M\0" \
172 178 "dvimode=1024x768MR-16@60\0" \
173 179  
174 180  
175 181  
... ... @@ -193,16 +199,21 @@
193 199 "omapdss.def_disp=${defaultdisplay} " \
194 200 "root=${nandroot} " \
195 201 "rootfstype=${nandrootfstype}\0" \
196   - "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
197   - "bootscript=echo Running bootscript from mmc ...; " \
  202 + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
  203 + "bootscript=echo Running boot script from mmc ...; " \
198 204 "source ${loadaddr}\0" \
199   - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
200   - "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
  205 + "loadbootenv=load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
  206 + "importbootenv=echo Importing environment from mmc ...; " \
201 207 "env import -t ${loadaddr} ${filesize}\0" \
202   - "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
203   - "mmcboot=echo Booting from mmc ...; " \
  208 + "loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \
  209 + "mmcboot=echo Booting from mmc...; " \
204 210 "run mmcargs; " \
205 211 "bootm ${loadaddr}\0" \
  212 + "loadzimage=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}\0" \
  213 + "loadfdt=load mmc ${mmcdev}:2 ${dtbaddr} ${bootdir}/${dtbfile}\0" \
  214 + "mmcbootfdt=echo Booting with DT from mmc ...; " \
  215 + "run mmcargs; " \
  216 + "bootz ${loadaddr} - ${dtbaddr}\0" \
206 217 "nandboot=echo Booting from nand ...; " \
207 218 "run nandargs; " \
208 219 "nand read ${loadaddr} linux; " \
209 220  
... ... @@ -212,20 +223,27 @@
212 223 "mmc dev ${mmcdev}; if mmc rescan; then " \
213 224 "if run loadbootscript; then " \
214 225 "run bootscript; " \
215   - "else " \
216   - "if run loadbootenv; then " \
217   - "run importbootenv; " \
218   - "if test -n ${uenvcmd}; then " \
219   - "echo Running uenvcmd ...;" \
220   - "run uenvcmd;" \
  226 + "fi;" \
  227 + "if run loadbootenv; then " \
  228 + "echo Loaded environment from ${bootenv};" \
  229 + "run importbootenv;" \
  230 + "fi;" \
  231 + "if test -n $uenvcmd; then " \
  232 + "echo Running uenvcmd ...;" \
  233 + "run uenvcmd;" \
  234 + "fi;" \
  235 + "if run loaduimage; then " \
  236 + "run mmcboot;" \
  237 + "fi;" \
  238 + "if run loadzimage; then " \
  239 + "if test -n $dtbfile; then " \
  240 + "if run loadfdt; then " \
  241 + "run mmcbootfdt;" \
221 242 "fi;" \
222 243 "fi;" \
223   - "if run loaduimage; then " \
224   - "run mmcboot; " \
225   - "else run nandboot; " \
226   - "fi; " \
227   - "fi; " \
228   - "else run nandboot; fi"
  244 + "fi;" \
  245 + "fi;" \
  246 + "run nandboot; " \
229 247  
230 248 #define CONFIG_AUTO_COMPLETE 1
231 249 /*