Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0b800a6b267de24466ca5a463db6497d7362f128

Authored by Igor Grinberg
Committed by Tom Rini
1 parent 26528632aa
Exists in master and in 53 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.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, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, 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, v2017.01-smarct4x

cm-t35: update config file 

Several minor updates to the cm-t35 config file.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>

Showing 1 changed file with 5 additions and 13 deletions Side-by-side Diff

include/configs/cm_t35.h
Diff comments   View file @ 0b800a6
... ... @@ -135,12 +135,12 @@
135 135 #define CONFIG_CMD_CACHE
136 136 #define CONFIG_CMD_EXT2 /* EXT2 Support */
137 137 #define CONFIG_CMD_FAT /* FAT support */
138   -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
139 138 #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
140 139 #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  140 +#define CONFIG_MTD_PARTITIONS
141 141 #define MTDIDS_DEFAULT "nand0=nand"
142 142 #define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
143   - "1920k(u-boot),128k(u-boot-env),"\
  143 + "1920k(u-boot),256k(u-boot-env),"\
144 144 "4m(kernel),-(fs)"
145 145  
146 146 #define CONFIG_CMD_I2C /* I2C serial bus support */
... ... @@ -182,14 +182,6 @@
182 182  
183 183 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
184 184 /* devices */
185   -#define CONFIG_JFFS2_NAND
186   -/* nand device jffs2 lives on */
187   -#define CONFIG_JFFS2_DEV "nand0"
188   -/* start of jffs2 partition */
189   -#define CONFIG_JFFS2_PART_OFFSET 0x680000
190   -#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* size of jffs2 */
191   - /* partition */
192   -
193 185 /* Environment information */
194 186 #define CONFIG_BOOTDELAY 10
195 187 #define CONFIG_ZERO_BOOTDELAY_CHECK
196 188  
... ... @@ -204,9 +196,9 @@
204 196 "defaultdisplay=dvi\0" \
205 197 "mmcdev=0\0" \
206 198 "mmcroot=/dev/mmcblk0p2 rw\0" \
207   - "mmcrootfstype=ext3 rootwait rootwait\0" \" \
  199 + "mmcrootfstype=ext4 rootwait rootwait\0" \" \
208 200 "nandroot=/dev/mtdblock4 rw\0" \
209   - "nandrootfstype=jffs2\0" \" \
  201 + "nandrootfstype=ubifs\0" \" \
210 202 "mmcargs=setenv bootargs console=${console} " \
211 203 "mpurate=${mpurate} " \
212 204 "vram=${vram} " \
... ... @@ -232,7 +224,7 @@
232 224 "bootm ${loadaddr}\0" \
233 225 "nandboot=echo Booting from nand ...; " \
234 226 "run nandargs; " \
235   - "nand read ${loadaddr} 280000 400000; " \
  227 + "nand read ${loadaddr} 2a0000 400000; " \
236 228 "bootm ${loadaddr}\0" \
237 229  
238 230 #define CONFIG_BOOTCOMMAND \