Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 97ce274d97e9c1796d58ae34aadcbc10293cccd7

Authored by Chin Liang See
Committed by Marek Vasut
1 parent ddcbed04a2
Exists in v2017.01-smarct4x and in 37 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, 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

arm: socfpga: Enable SDMMC boot for SOCFPGA U-Boot 

Enable the SDMMC boot as default boot for SOCFPGA U-Boot dev kit.
Enable the bootz command as zImage is used instead uImage.

Signed-off-by: Chin Liang See <clsee@altera.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Pavel Machek <pavel@denx.de>

Showing 1 changed file with 18 additions and 4 deletions Side-by-side Diff

include/configs/socfpga_cyclone5.h
Diff comments   View file @ 97ce274
... ... @@ -93,6 +93,8 @@
93 93 #include <config_cmd_default.h>
94 94 /* FAT file system support */
95 95 #define CONFIG_CMD_FAT
  96 +/* bootz command support */
  97 +#define CONFIG_CMD_BOOTZ
96 98  
97 99  
98 100 /*
99 101  
100 102  
101 103  
102 104  
... ... @@ -117,24 +119,36 @@
117 119 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
118 120 #define CONFIG_CMD_RUN
119 121  
  122 +#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
120 123 #define CONFIG_BOOTCOMMAND "run ramboot"
  124 +#else
  125 +#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot"
  126 +#endif
121 127  
122 128 /*
123 129 * arguments passed to the bootm command. The value of
124 130 * CONFIG_BOOTARGS goes into the environment value "bootargs".
125 131 * Do note the value will overide also the chosen node in FDT blob.
126 132 */
127   -#define CONFIG_BOOTARGS "console=ttyS0,57600,mem=256M@0x0"
  133 +#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
128 134  
129 135 #define CONFIG_EXTRA_ENV_SETTINGS \
130 136 "verify=n\0" \
131 137 "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
132 138 "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
133 139 "bootm ${loadaddr} - ${fdt_addr}\0" \
134   - "bootimage=uImageImage\0" \" \
  140 + "bootimage=zImageImage\0" \" \
135 141 "fdt_addr=100\0" \
136   - "fsloadcmd=ext2load\0" \
137   - "bootm ${loadaddr} - ${fdt_addr}\0" \
  142 + "fdtimage=socfpga.dtb\0" \
  143 + "fsloadcmd=ext2load\0" \
  144 + "bootm ${loadaddr} - ${fdt_addr}\0" \
  145 + "mmcroot=/dev/mmcblk0p2\0" \
  146 + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \
  147 + " root=${mmcroot} rw rootwait;" \
  148 + "bootz ${loadaddr} - ${fdt_addr}\0" \
  149 + "mmcload=mmc rescan;" \
  150 + "fatload mmc 0:1 ${loadaddr} ${bootimage};" \
  151 + "fatload mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
138 152 "qspiroot=/dev/mtdblock0\0" \
139 153 "qspirootfstype=jffs2\0" \
140 154 "qspiboot=setenv bootargs " CONFIG_BOOTARGS \