Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e3cf9692053a4989f76a8964ab7d29df4fee90c0

Authored by Tom Rini
1 parent e261c83aa0
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

am335x_evm: Switch to zImage as default rather than uImage 

Signed-off-by: Tom Rini <trini@ti.com>

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

include/configs/am335x_evm.h
Diff comments   View file @ e3cf969
... ... @@ -46,7 +46,7 @@
46 46 "nandboot=echo Booting from nand ...; " \
47 47 "run nandargs; " \
48 48 "nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \
49   - "bootm ${loadaddr} ${loadaddr}\0" \" \
  49 + "bootz ${loadaddr} ${loadaddr}\0" \" \
50 50 "nandimgsize=0x500000\0"
51 51 #else
52 52 #define NANDARGS ""
53 53  
... ... @@ -61,8 +61,9 @@
61 61 "fdt_high=0xffffffff\0" \
62 62 "boot_fdt=try\0" \
63 63 "rdaddr=0x81000000\0" \
  64 + "bootpart=0:2\0" \
64 65 "bootdir=/boot\0" \
65   - "bootfile=uImageImage\0" \" \
  66 + "bootfile=zImageImage\0" \" \
66 67 "fdtfile=undefined\0" \
67 68 "console=ttyO0,115200n8\0" \
68 69 "optargs=\0" \
... ... @@ -71,7 +72,6 @@
71 72 "mmcdev=0\0" \
72 73 "mmcroot=/dev/mmcblk0p2 ro\0" \
73 74 "mmcrootfstype=ext4 rootwait\0" \
74   - "bootpart=0:2\0" \
75 75 "rootpath=/export/rootfs\0" \
76 76 "nfsopts=nolock\0" \
77 77 "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
78 78  
79 79  
80 80  
... ... @@ -105,21 +105,21 @@
105 105 "root=${ramroot} " \
106 106 "rootfstype=${ramrootfstype}\0" \
107 107 "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
108   - "loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}image=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \" \
  108 + "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}image=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \" \
109 109 "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
110 110 "mmcloados=run mmcargs; " \
111 111 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
112 112 "if run loadfdt; then " \
113   - "bootm ${loadaddr} - ${fdtaddr}; " \
  113 + "bootz ${loadaddr} - ${fdtaddr}; " \
114 114 "else " \
115 115 "if test ${boot_fdt} = try; then " \
116   - "bootm; " \
  116 + "bootz; " \
117 117 "else " \
118 118 "echo WARN: Cannot load the DT; " \
119 119 "fi; " \
120 120 "fi; " \
121 121 "else " \
122   - "bootm; " \
  122 + "bootz; " \
123 123 "fi;\0" \
124 124 "mmcboot=mmc dev ${mmcdev}; " \
125 125 "if mmc rescan; then " \
... ... @@ -132,7 +132,7 @@
132 132 "echo Running uenvcmd ...;" \
133 133 "run uenvcmd;" \
134 134 "fi;" \
135   - "if run loaduimage; then " \
  135 + "if run loadimage; then " \
136 136 "run mmcloados;" \
137 137 "fi;" \
138 138 "fi;\0" \
139 139  
140 140  
... ... @@ -140,17 +140,17 @@
140 140 "run spiargs; " \
141 141 "sf probe ${spibusno}:0; " \
142 142 "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \
143   - "bootm ${loadaddr} ${loadaddr}\0" \" \
  143 + "bootz ${loadaddr} ${loadaddr}\0" \" \
144 144 "netboot=echo Booting from network ...; " \
145 145 "setenv autoload no; " \
146 146 "dhcp; " \
147 147 "tftp ${loadaddr} ${bootfile}; " \
148 148 "tftp ${fdtaddr} ${fdtfile}; " \
149 149 "run netargs; " \
150   - "bootm ${loadaddr} - ${fdtaddr} ${loadaddr} - ${fdtaddr}\0" \" \
  150 + "bootz ${loadaddr} - ${fdtaddr} ${loadaddr} - ${fdtaddr}\0" \" \
151 151 "ramboot=echo Booting from ramdisk ...; " \
152 152 "run ramargs; " \
153   - "bootm ${loadaddr} ${rdaddr} ${fdtaddr} ${loadaddr} ${rdaddr} ${fdtaddr}\0" \" \
  153 + "bootz ${loadaddr} ${rdaddr} ${fdtaddr} ${loadaddr} ${rdaddr} ${fdtaddr}\0" \" \
154 154 "findfdt="\
155 155 "if test $board_name = A335BONE; then " \
156 156 "setenv fdtfile am335x-bone.dtb; fi; " \