Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f073f50b6e6bbf65968956615baf3b6b61f3b0bb

Authored by Lokesh Vutla
1 parent 9e0c3f6ee2
Exists in v2015.07-smarct4x and in 3 other branches ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc

ti_armv7_common: env: Consolidate MMC args 

Define default mmc args in ti_armv7_common.h so that all
TI platforms can reuse.

Reported-by: Yan Liu <yan-liu@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Showing 6 changed files with 19 additions and 38 deletions Side-by-side Diff

include/configs/am335x_evm.h
Diff comments   View file @ f073f50
... ... @@ -70,6 +70,7 @@
70 70 #ifndef CONFIG_SPL_BUILD
71 71 #define CONFIG_EXTRA_ENV_SETTINGS \
72 72 DEFAULT_LINUX_BOOT_ENV \
  73 + DEFAULT_MMC_TI_ARGS \
73 74 "boot_fdt=try\0" \
74 75 "bootpart=0:2\0" \
75 76 "bootdir=/boot\0" \
76 77  
... ... @@ -80,15 +81,8 @@
80 81 "uuid_disk=${uuid_gpt_disk};" \
81 82 "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
82 83 "optargs=\0" \
83   - "mmcdev=0\0" \
84   - "mmcroot=/dev/mmcblk0p2 ro\0" \
85   - "mmcrootfstype=ext4 rootwait\0" \
86 84 "ramroot=/dev/ram0 rw\0" \
87 85 "ramrootfstype=ext2\0" \
88   - "mmcargs=setenv bootargs console=${console} " \
89   - "${optargs} " \
90   - "root=${mmcroot} " \
91   - "rootfstype=${mmcrootfstype}\0" \
92 86 "spiroot=/dev/mtdblock4 rw\0" \
93 87 "spirootfstype=jffs2\0" \
94 88 "spisrcaddr=0xe0000\0" \
... ... @@ -112,7 +106,7 @@
112 106 "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
113 107 "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
114 108 "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
115   - "mmcloados=run mmcargs; " \
  109 + "mmcloados=run args_mmc; " \
116 110 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
117 111 "if run loadfdt; then " \
118 112 "bootz ${loadaddr} - ${fdtaddr}; " \
include/configs/am43xx_evm.h
Diff comments   View file @ f073f50
... ... @@ -226,6 +226,7 @@
226 226 #ifndef CONFIG_SPL_BUILD
227 227 #define CONFIG_EXTRA_ENV_SETTINGS \
228 228 DEFAULT_LINUX_BOOT_ENV \
  229 + DEFAULT_MMC_TI_ARGS \
229 230 "fdtfile=undefined\0" \
230 231 "bootpart=0:2\0" \
231 232 "bootdir=/boot\0" \
232 233  
... ... @@ -235,18 +236,11 @@
235 236 "uuid_disk=${uuid_gpt_disk};" \
236 237 "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
237 238 "optargs=\0" \
238   - "mmcdev=0\0" \
239   - "mmcroot=/dev/mmcblk0p2 rw\0" \
240   - "mmcrootfstype=ext4 rootwait\0" \
241 239 "usbroot=/dev/sda2 rw\0" \
242 240 "usbrootfstype=ext4 rootwait\0" \
243 241 "usbdev=0\0" \
244 242 "ramroot=/dev/ram0 rw\0" \
245 243 "ramrootfstype=ext2\0" \
246   - "mmcargs=setenv bootargs console=${console} " \
247   - "${optargs} " \
248   - "root=${mmcroot} " \
249   - "rootfstype=${mmcrootfstype}\0" \
250 244 "usbargs=setenv bootargs console=${console} " \
251 245 "${optargs} " \
252 246 "root=${usbroot} " \
... ... @@ -278,7 +272,7 @@
278 272 "if run loadimage; then " \
279 273 "run loadfdt; " \
280 274 "echo Booting from mmc${mmcdev} ...; " \
281   - "run mmcargs; " \
  275 + "run args_mmc; " \
282 276 "bootz ${loadaddr} - ${fdtaddr}; " \
283 277 "fi;" \
284 278 "fi;\0" \
include/configs/k2g_evm.h
Diff comments   View file @ f073f50
... ... @@ -16,10 +16,10 @@
16 16  
17 17 /* U-Boot general configuration */
18 18 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
  19 + DEFAULT_MMC_TI_ARGS \
  20 + "console=ttyS0,115200n8\0" \
19 21 "bootpart=0:2\0" \
20 22 "bootdir=/boot\0" \
21   - "mmcroot=/dev/mmcblk0p2 rw\0" \
22   - "mmcrootfstype=ext4 rootwait\0" \
23 23 "addr_mon=0x0c040000\0" \
24 24 "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
25 25 "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \
... ... @@ -32,8 +32,6 @@
32 32 "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \
33 33 "${bootdir}/${name_kern}\0" \
34 34 "get_mon_mmc=load mmc ${bootpart} ${addr_mon} ${bootdir}/${name_mon}\0"\
35   - "args_mmc=setenv bootargs ${bootargs} root=${mmcroot} " \
36   - "rootfstype=${mmcrootfstype}\0" \
37 35  
38 36 #include <configs/ti_armv7_keystone2.h>
39 37  
include/configs/ti_armv7_common.h
Diff comments   View file @ f073f50
... ... @@ -58,6 +58,14 @@
58 58 "ramdisk_addr_r=0x88080000\0" \
59 59 "bootm_size=0x10000000\0"
60 60  
  61 +#define DEFAULT_MMC_TI_ARGS \
  62 + "mmcdev=0\0" \
  63 + "mmcrootfstype=ext4 rootwait\0" \
  64 + "args_mmc=setenv bootargs console=${console} " \
  65 + "${optargs} " \
  66 + "root=${mmcroot} " \
  67 + "rootfstype=${mmcrootfstype}\0"
  68 +
61 69 /*
62 70 * Default to a quick boot delay.
63 71 */
include/configs/ti_omap4_common.h
Diff comments   View file @ f073f50
... ... @@ -83,6 +83,7 @@
83 83 */
84 84 #define CONFIG_EXTRA_ENV_SETTINGS \
85 85 DEFAULT_LINUX_BOOT_ENV \
  86 + DEFAULT_MMC_TI_ARGS \
86 87 "console=ttyO2,115200n8\0" \
87 88 "fdtfile=undefined\0" \
88 89 "bootpart=0:2\0" \
... ... @@ -90,13 +91,6 @@
90 91 "bootfile=zImage\0" \
91 92 "usbtty=cdc_acm\0" \
92 93 "vram=16M\0" \
93   - "mmcdev=0\0" \
94   - "mmcroot=/dev/mmcblk0p2 rw\0" \
95   - "mmcrootfstype=ext4 rootwait\0" \
96   - "mmcargs=setenv bootargs console=${console} " \
97   - "vram=${vram} " \
98   - "root=${mmcroot} " \
99   - "rootfstype=${mmcrootfstype}\0" \
100 94 "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
101 95 "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
102 96 "source ${loadaddr}\0" \
103 97  
... ... @@ -106,10 +100,10 @@
106 100 "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
107 101 "loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \
108 102 "mmcboot=echo Booting from mmc${mmcdev} ...; " \
109   - "run mmcargs; " \
  103 + "run args_mmc; " \
110 104 "bootz ${loadaddr} - ${fdtaddr}\0" \
111 105 "uimageboot=echo Booting from mmc${mmcdev} ...; " \
112   - "run mmcargs; " \
  106 + "run args_mmc; " \
113 107 "bootm ${loadaddr}\0" \
114 108 "findfdt="\
115 109 "if test $board_name = sdp4430; then " \
include/configs/ti_omap5_common.h
Diff comments   View file @ f073f50
... ... @@ -133,6 +133,7 @@
133 133 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
134 134 #define CONFIG_EXTRA_ENV_SETTINGS \
135 135 DEFAULT_LINUX_BOOT_ENV \
  136 + DEFAULT_MMC_TI_ARGS \
136 137 "console=" CONSOLEDEV ",115200n8\0" \
137 138 "fdtfile=undefined\0" \
138 139 "bootpart=0:2\0" \
... ... @@ -143,14 +144,6 @@
143 144 "partitions=" PARTS_DEFAULT "\0" \
144 145 "optargs=\0" \
145 146 "dofastboot=0\0" \
146   - "mmcdev=0\0" \
147   - "mmcroot=/dev/mmcblk0p2 rw\0" \
148   - "mmcrootfstype=ext4 rootwait\0" \
149   - "mmcargs=setenv bootargs console=${console} " \
150   - "${optargs} " \
151   - "vram=${vram} " \
152   - "root=${mmcroot} " \
153   - "rootfstype=${mmcrootfstype}\0" \
154 147 "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
155 148 "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
156 149 "source ${loadaddr}\0" \
... ... @@ -173,7 +166,7 @@
173 166 "if run loadimage; then " \
174 167 "run loadfdt; " \
175 168 "echo Booting from mmc${mmcdev} ...; " \
176   - "run mmcargs; " \
  169 + "run args_mmc; " \
177 170 "bootz ${loadaddr} - ${fdtaddr}; " \
178 171 "fi;" \
179 172 "fi;\0" \