Commit 8d566e0c authored by Sergei Poselenov's avatar Sergei Poselenov

RT #107358. Don't clobber "bootargs" in "netboot" and "flashboot"

parent 098aca41
......@@ -285,14 +285,15 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=70000000\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"flashaddr=74020000\0" \
"flashboot=run addip;bootm ${flashaddr}\0" \
"flashboot=run args addip;bootm ${flashaddr}\0" \
"ethaddr=C0:B1:3C:88:88:88\0" \
"ipaddr=172.17.4.206\0" \
"serverip=172.17.0.1\0" \
"image=a2f/uImage\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
"update=tftp ${image};" \
"prot off ${flashaddr} +${filesize};" \
"era ${flashaddr} +${filesize};" \
......
......@@ -436,14 +436,15 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0xA0000000\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"flashaddr=80020000\0" \
"flashboot=run addip;bootm ${flashaddr}\0" \
"flashboot=run args addip;bootm ${flashaddr}\0" \
"ethaddr=C0:B1:3C:88:88:84\0" \
"ipaddr=172.17.4.206\0" \
"serverip=172.17.0.1\0" \
"image=lpc178x/uImage\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
"update=tftp ${image};" \
"prot off ${flashaddr} +${filesize};" \
"era ${flashaddr} +${filesize};" \
......
......@@ -377,14 +377,15 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x28000000\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"flashaddr=0x14001000\0" \
"flashboot=run addip;bootm ${flashaddr}\0" \
"flashboot=run args addip;bootm ${flashaddr}\0" \
"ethaddr=C0:B1:3C:88:78:93\0" \
"ipaddr=172.17.4.215\0" \
"serverip=172.17.0.1\0" \
"image=lpc18xx/uImage\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
"update=tftp ${image};" \
"prot off ${flashaddr} +${filesize};" \
"era ${flashaddr} +${filesize};" \
......
......@@ -444,6 +444,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x08007fc0\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:" \
"${netmask}:${hostname}:eth0:off\0" \
......@@ -451,10 +452,10 @@
"ipaddr=172.17.6.46\0" \
"serverip=172.17.0.1\0" \
"image=k70/uImage\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
"flashaddr=00100000\0" \
"flashboot=nboot ${loadaddr} 0 ${flashaddr};" \
"run addip;bootm\0" \
"run args addip;bootm\0" \
"update=tftp ${image};" \
"nand erase ${flashaddr} ${filesize};" \
"nand write ${loadaddr} ${flashaddr} ${filesize}\0"
......
......@@ -333,14 +333,15 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x28000000\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"flashaddr=1C040000\0" \
"flashboot=run addip;bootm ${flashaddr}\0" \
"flashboot=run args addip;bootm ${flashaddr}\0" \
"ethaddr=C0:B1:3C:88:88:91\0" \
"ipaddr=172.17.4.217\0" \
"serverip=172.17.0.1\0" \
"image=lpc18xx/uImage\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
"update=tftp ${image};" \
"prot off ${flashaddr} +${filesize};" \
"era ${flashaddr} +${filesize};" \
......
......@@ -372,14 +372,15 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x28000000\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"flashaddr=1C040000\0" \
"flashboot=run addip;bootm ${flashaddr}\0" \
"flashboot=run args addip;bootm ${flashaddr}\0" \
"ethaddr=C0:B1:3C:88:88:90\0" \
"ipaddr=172.17.4.215\0" \
"serverip=172.17.0.1\0" \
"image=lpc18xx/uImage\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
"update=tftp ${image};" \
"prot off ${flashaddr} +${filesize};" \
"era ${flashaddr} +${filesize};" \
......
......@@ -305,6 +305,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=" MK_STR(UIMAGE_LOADADDR) "\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"ethaddr=C0:B1:3C:83:83:83\0" \
"ipaddr=172.17.4.219\0" \
"serverip=172.17.0.1\0" \
......@@ -315,10 +316,10 @@
"addip=setenv bootargs ${bootargs}" \
" ip=${ipaddr}:${serverip}:${gatewayip}:" \
"${netmask}:${hostname}:eth0:off\0" \
"flashboot=run addip;run spiprobe;" \
"flashboot=run args addip;run spiprobe;" \
" sf read ${loadaddr} ${spiaddr} ${spisize};" \
" bootm ${loadaddr}\0" \
"netboot=tftp ${loadaddr} ${image};run addip;bootm\0" \
"netboot=tftp ${loadaddr} ${image};run args addip;bootm\0" \
"update=tftp ${loadaddr} ${image};run spiprobe;" \
" sf erase ${spiaddr} ${filesize};" \
" sf write ${loadaddr} ${spiaddr} ${filesize};" \
......
......@@ -310,6 +310,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=" MK_STR(UIMAGE_LOADADDR) "\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"ethaddr=C0:B1:3C:83:83:83\0" \
"ipaddr=172.17.4.219\0" \
"serverip=172.17.0.1\0" \
......@@ -317,13 +318,13 @@
"spiaddr=" MK_STR(CONFIG_ENV_IMG_OFFSET) "\0" \
"spisize=400000\0" \
"spiprobe=sf probe " MK_STR(CONFIG_SPI_FLASH_BUS) "\0" \
"addip=setenv bootargs ${bootargs}" \
"addip=setenv bootargs ${bootargs}" \
" ip=${ipaddr}:${serverip}:${gatewayip}:" \
"${netmask}:${hostname}:eth0:off\0" \
"flashboot=run addip;run spiprobe;" \
"${netmask}:${hostname}:eth0:off\0" \
"flashboot=run args addip;run spiprobe;" \
" sf read ${loadaddr} ${spiaddr} ${spisize};" \
" bootm ${loadaddr}\0" \
"netboot=tftp ${loadaddr} ${image};run addip;bootm\0" \
"netboot=tftp ${loadaddr} ${image};run args addip;bootm\0" \
"update=tftp ${loadaddr} ${image};run spiprobe;" \
" sf erase ${spiaddr} ${filesize};" \
" sf write ${loadaddr} ${spiaddr} ${filesize};" \
......
......@@ -302,6 +302,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=" MK_STR(UIMAGE_LOADADDR) "\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"ethaddr=C0:B1:3C:88:88:88\0" \
"ipaddr=172.17.4.221\0" \
"serverip=172.17.0.1\0" \
......@@ -312,10 +313,10 @@
"addip=setenv bootargs ${bootargs}" \
" ip=${ipaddr}:${serverip}:${gatewayip}:" \
"${netmask}:${hostname}:eth0:off\0" \
"flashboot=run addip;run spiprobe;" \
"flashboot=run args addip;run spiprobe;" \
" sf read ${loadaddr} ${spiaddr} ${spisize};" \
" bootm ${loadaddr}\0" \
"netboot=tftp ${loadaddr} ${image};run addip;bootm\0" \
"netboot=tftp ${loadaddr} ${image};run args addip;bootm\0" \
"update=tftp ${loadaddr} ${image};run spiprobe;" \
" sf erase ${spiaddr} ${filesize};" \
" sf write ${loadaddr} ${spiaddr} ${filesize};" \
......
......@@ -414,10 +414,10 @@
# define LOADADDR "0xC0007FC0"
# define REV_EXTRA_ENV \
"envmboot=run addip;bootm ${envmaddr}\0" \
"envmboot=run args addip;bootm ${envmaddr}\0" \
"envmupdate=tftp ${image};" \
"cptf ${envmaddr} ${loadaddr} ${filesize}\0" \
"flashboot=run addip;" \
"flashboot=run args addip;" \
"stmbufcopy ${loadaddr} ${flashaddr} ${kernelsize};" \
"bootm ${loadaddr}\0" \
"update=tftp ${image};" \
......@@ -436,7 +436,7 @@
# define LOADADDR "0x60000000"
# define REV_EXTRA_ENV \
"flashboot=run addip;bootm ${flashaddr}\0" \
"flashboot=run args addip;bootm ${flashaddr}\0" \
"update=tftp ${image};" \
"prot off ${flashaddr} +${filesize};" \
"era ${flashaddr} +${filesize};" \
......@@ -451,6 +451,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=" LOADADDR "\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"flashaddr=64020000\0" \
"envmaddr=08040000\0" \
......@@ -459,7 +460,7 @@
"serverip=172.17.0.1\0" \
"image=stm32f4x9/uImage\0" \
"stdin=serial\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
REV_EXTRA_ENV
/*
......
......@@ -301,15 +301,16 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x64000000\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"flashaddr=60020000\0" \
"flashboot=run addip;bootm ${flashaddr}\0" \
"flashboot=run args addip;bootm ${flashaddr}\0" \
"ethaddr=C0:B1:3C:88:88:85\0" \
"ipaddr=172.17.4.206\0" \
"serverip=172.17.0.1\0" \
"image=stm32/uImage\0" \
"stdin=serial\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
"update=tftp ${image};" \
"prot off ${flashaddr} +${filesize};" \
"era ${flashaddr} +${filesize};" \
......
......@@ -259,7 +259,7 @@
#define LOADADDR "0xD0007FC0"
#define REV_EXTRA_ENV \
"envmboot=run addip;bootm ${envmaddr}\0" \
"envmboot=run args addip;bootm ${envmaddr}\0" \
"update=tftp ${image};" \
"cptf ${envmaddr} ${loadaddr} ${filesize}\0"
......@@ -270,6 +270,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=" LOADADDR "\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"envmaddr=08040000\0" \
"ethaddr=C0:B1:3C:88:88:85\0" \
......@@ -277,7 +278,7 @@
"serverip=172.17.0.1\0" \
"image=stm32f429/uImage\0" \
"stdin=serial\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
REV_EXTRA_ENV
/*
......
......@@ -393,10 +393,10 @@
#define LOADADDR "0xC0007FC0"
#define REV_EXTRA_ENV \
"envmboot=run addip;bootm ${envmaddr}\0" \
"envmboot=run args addip;bootm ${envmaddr}\0" \
"envmupdate=tftp ${image};" \
"cptf ${envmaddr} ${loadaddr} ${filesize}\0" \
"flashboot=run addip;bootm ${flashaddr}\0" \
"flashboot=run args addip;bootm ${flashaddr}\0" \
"update=tftp ${image};" \
"prot off ${flashaddr} +${filesize};" \
"era ${flashaddr} +${filesize};" \
......@@ -412,6 +412,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=" LOADADDR "\0" \
"args=setenv bootargs " CONFIG_BOOTARGS "\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"flashaddr=60020000\0" \
"envmaddr=08040000\0" \
......@@ -420,7 +421,7 @@
"serverip=172.17.0.1\0" \
"image=stm32f7/uImage\0" \
"stdin=serial\0" \
"netboot=tftp ${image};run addip;bootm\0" \
"netboot=tftp ${image};run args addip;bootm\0" \
REV_EXTRA_ENV
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment