Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d28a86c07adc4b0288b86084db074c327cde2731

Authored by Yan Liu
Committed by Tom Rini
1 parent abca947746
Exists in v2017.01-smarct4x and in 29 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_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-n7.1.2_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, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

keystone2: env: Set mmc as default boot for k2g-evm 

For k2l, k2e and k2hk, ubi is set to default boot in uboot
environment settings; while for k2g, mmc should be the
default boot. This patch is to set mmc as default for k2g-evm

Signed-off-by: Yan Liu <yan-liu@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 5 changed files with 4 additions and 1 deletions Side-by-side Diff

include/configs/k2e_evm.h
Diff comments   View file @ d28a86c
... ... @@ -17,6 +17,7 @@
17 17 /* U-Boot general configuration */
18 18 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
19 19 DEFAULT_FW_INITRAMFS_BOOT_ENV \
  20 + "boot=ubi\0" \
20 21 "addr_mon=0x0c140000\0" \
21 22 "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
22 23 "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \
include/configs/k2g_evm.h
Diff comments   View file @ d28a86c
... ... @@ -18,6 +18,7 @@
18 18 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
19 19 DEFAULT_MMC_TI_ARGS \
20 20 DEFAULT_PMMC_BOOT_ENV \
  21 + "boot=mmc\0" \
21 22 "console=ttyS0,115200n8\0" \
22 23 "bootpart=0:2\0" \
23 24 "bootdir=/boot\0" \
include/configs/k2hk_evm.h
Diff comments   View file @ d28a86c
... ... @@ -17,6 +17,7 @@
17 17 /* U-Boot general configuration */
18 18 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
19 19 DEFAULT_FW_INITRAMFS_BOOT_ENV \
  20 + "boot=ubi\0" \
20 21 "addr_mon=0x0c5f0000\0" \
21 22 "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
22 23 "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \
include/configs/k2l_evm.h
Diff comments   View file @ d28a86c
... ... @@ -17,6 +17,7 @@
17 17 /* U-Boot general configuration */
18 18 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
19 19 DEFAULT_FW_INITRAMFS_BOOT_ENV \
  20 + "boot=ubi\0" \
20 21 "addr_mon=0x0c140000\0" \
21 22 "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
22 23 "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \
include/configs/ti_armv7_keystone2.h
Diff comments   View file @ d28a86c
... ... @@ -248,7 +248,6 @@
248 248 #define CONFIG_EXTRA_ENV_SETTINGS \
249 249 DEFAULT_LINUX_BOOT_ENV \
250 250 CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
251   - "boot=ubi\0" \
252 251 "bootdir=/boot\0" \
253 252 "tftp_root=/\0" \
254 253 "nfs_root=/export\0" \