mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-19 19:34:35 +00:00
Replace deprecated "ramdisk" with "ramdisk_size" kernel parameter.
The Linux commit fac8b209b1084bc85748bd54e13d00c1262b220f ("Remove final traces of long-deprecated "ramdisk" kernel parm") makes these changes neccessary. Signed-off-by: Detlev Zundel <dzu@denx.de>
This commit is contained in:
parent
d01b847c5c
commit
e5084af8de
4 changed files with 4 additions and 4 deletions
|
@ -39,7 +39,7 @@
|
||||||
#define FW_DIR "nx-fw"
|
#define FW_DIR "nx-fw"
|
||||||
#define RESCUE_IMAGE "nxrs.img"
|
#define RESCUE_IMAGE "nxrs.img"
|
||||||
#define LOAD_ADDR 0x400000
|
#define LOAD_ADDR 0x400000
|
||||||
#define RS_BOOTARGS "ramdisk=8192K"
|
#define RS_BOOTARGS "ramdisk_size=8192K"
|
||||||
|
|
||||||
/* Main function for fwupdate */
|
/* Main function for fwupdate */
|
||||||
void cm5200_fwupdate(void);
|
void cm5200_fwupdate(void);
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
|
|
||||||
#undef CONFIG_CLOCKS_IN_MHZ /* clocks passed to Linux in Hz */
|
#undef CONFIG_CLOCKS_IN_MHZ /* clocks passed to Linux in Hz */
|
||||||
|
|
||||||
#define CONFIG_BOOTARGS "root=/dev/ram rw ramdisk=4096"
|
#define CONFIG_BOOTARGS "root=/dev/ram rw ramdisk_size=4096"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BOOTP options
|
* BOOTP options
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
#undef CONFIG_8xx_CONS_NONE
|
#undef CONFIG_8xx_CONS_NONE
|
||||||
#define CONFIG_BAUDRATE 57600 /* console baudrate = 115kbps */
|
#define CONFIG_BAUDRATE 57600 /* console baudrate = 115kbps */
|
||||||
#define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
|
#define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
|
||||||
#define CONFIG_BOOTARGS "ramdisk=8000 "\
|
#define CONFIG_BOOTARGS "ramdisk_size=8000 "\
|
||||||
"root=/dev/nfs rw nfsroot=10.77.77.250:/ppcroot "\
|
"root=/dev/nfs rw nfsroot=10.77.77.250:/ppcroot "\
|
||||||
"nfsaddrs=10.77.77.20:10.77.77.250"
|
"nfsaddrs=10.77.77.20:10.77.77.250"
|
||||||
#define CONFIG_BOOTCOMMAND "bootm 400e0000"
|
#define CONFIG_BOOTCOMMAND "bootm 400e0000"
|
||||||
|
|
|
@ -333,7 +333,7 @@
|
||||||
"nfsargs=setenv bootargs root=/dev/nfs rw" \
|
"nfsargs=setenv bootargs root=/dev/nfs rw" \
|
||||||
" nfsroot=${serverip}:${rootpath}\0" \
|
" nfsroot=${serverip}:${rootpath}\0" \
|
||||||
"ramargs=setenv bootargs root=/dev/ram rw" \
|
"ramargs=setenv bootargs root=/dev/ram rw" \
|
||||||
" ramdisk=${ramdisk_size}\0" \
|
" ramdisk_size=${ramdisk_size}\0" \
|
||||||
"addip=setenv bootargs ${bootargs} " \
|
"addip=setenv bootargs ${bootargs} " \
|
||||||
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
|
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
|
||||||
":${hostname}:${netdev}:off panic=1\0" \
|
":${hostname}:${netdev}:off panic=1\0" \
|
||||||
|
|
Loading…
Add table
Reference in a new issue