| Message ID | 1314805054-16250-12-git-send-email-jason.hobbs@calxeda.com |
|---|---|
| State | Accepted |
| Headers | show |
On 08/31/2011 09:37 AM, Jason Hobbs wrote: > Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com> > Cc: Matt Waddel <matt.waddel at linaro.org> Tested-by: Matt Waddel <matt.waddel@linaro.org> > --- > new in v4 > > changes for v5: > - none > > include/configs/ca9x4_ct_vxp.h | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h > index 8c57eab..7e5dc66 100644 > --- a/include/configs/ca9x4_ct_vxp.h > +++ b/include/configs/ca9x4_ct_vxp.h > @@ -129,10 +129,10 @@ > #define CONFIG_BOOTCOMMAND "run bootflash;" > #define CONFIG_EXTRA_ENV_SETTINGS \ > "loadaddr=0x80008000\0" \ > - "initrd=0x61000000\0" \ > - "kerneladdr=0x44100000\0" \ > - "initrdaddr=0x44800000\0" \ > - "maxinitrd=0x1800000\0" \ > + "ramdisk_addr_r=0x61000000\0" \ > + "kernel_addr=0x44100000\0" \ > + "ramdisk_addr=0x44800000\0" \ > + "maxramdisk=0x1800000\0" \ > "console=ttyAMA0,38400n8\0" \ > "dram=1024M\0" \ > "root=/dev/sda1 rw\0" \ > @@ -142,8 +142,8 @@ > "mem=${dram} mtdparts=${mtd} mmci.fmax=190000 " \ > "devtmpfs.mount=0 vmalloc=256M\0" \ > "bootflash=run flashargs; " \ > - "cp ${initrdaddr} ${initrd} ${maxinitrd}; " \ > - "bootm ${kerneladdr} ${initrd}\0" > + "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ > + "bootm ${kernel_addr} ${ramdisk_addr_r}\0" > > /* FLASH and environment organization */ > #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */
Dear "Jason Hobbs", In message <1314805054-16250-12-git-send-email-jason.hobbs@calxeda.com> you wrote: > Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com> > Cc: Matt Waddel <matt.waddel at linaro.org> > --- > new in v4 > > changes for v5: > - none > > include/configs/ca9x4_ct_vxp.h | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h index 8c57eab..7e5dc66 100644 --- a/include/configs/ca9x4_ct_vxp.h +++ b/include/configs/ca9x4_ct_vxp.h @@ -129,10 +129,10 @@ #define CONFIG_BOOTCOMMAND "run bootflash;" #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80008000\0" \ - "initrd=0x61000000\0" \ - "kerneladdr=0x44100000\0" \ - "initrdaddr=0x44800000\0" \ - "maxinitrd=0x1800000\0" \ + "ramdisk_addr_r=0x61000000\0" \ + "kernel_addr=0x44100000\0" \ + "ramdisk_addr=0x44800000\0" \ + "maxramdisk=0x1800000\0" \ "console=ttyAMA0,38400n8\0" \ "dram=1024M\0" \ "root=/dev/sda1 rw\0" \ @@ -142,8 +142,8 @@ "mem=${dram} mtdparts=${mtd} mmci.fmax=190000 " \ "devtmpfs.mount=0 vmalloc=256M\0" \ "bootflash=run flashargs; " \ - "cp ${initrdaddr} ${initrd} ${maxinitrd}; " \ - "bootm ${kerneladdr} ${initrd}\0" + "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ + "bootm ${kernel_addr} ${ramdisk_addr_r}\0" /* FLASH and environment organization */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */
Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com> Cc: Matt Waddel <matt.waddel at linaro.org> --- new in v4 changes for v5: - none include/configs/ca9x4_ct_vxp.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)