From: Yan Liu Date: Wed, 9 Mar 2016 10:09:39 +0000 (+0530) Subject: keystone2: env: Set mmc as default boot for k2g-evm X-Git-Tag: v2016.05-rc1~346 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d28a86c07adc4b0288b86084db074c327cde2731;p=oweals%2Fu-boot.git 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 Signed-off-by: Lokesh Vutla Reviewed-by: Tom Rini --- diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index daf37f63f4..07f975bb37 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -17,6 +17,7 @@ /* U-Boot general configuration */ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ + "boot=ubi\0" \ "addr_mon=0x0c140000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 2e477635c5..7bc506f51f 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -18,6 +18,7 @@ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_MMC_TI_ARGS \ DEFAULT_PMMC_BOOT_ENV \ + "boot=mmc\0" \ "console=ttyS0,115200n8\0" \ "bootpart=0:2\0" \ "bootdir=/boot\0" \ diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index a031ae40af..a268a86736 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -17,6 +17,7 @@ /* U-Boot general configuration */ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ + "boot=ubi\0" \ "addr_mon=0x0c5f0000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index 829daa28c2..f366e6703d 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -17,6 +17,7 @@ /* U-Boot general configuration */ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ + "boot=ubi\0" \ "addr_mon=0x0c140000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 7131601ccc..0274ac6f88 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -248,7 +248,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ - "boot=ubi\0" \ "bootdir=/boot\0" \ "tftp_root=/\0" \ "nfs_root=/export\0" \