| Message ID | 1386296295-28658-6-git-send-email-dennis@ausil.us |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
> Signed-off-by: Dennis Gilmore <dennis@ausil.us> > --- > include/configs/am335x_evm.h | 23 +++++++++++++---------- > 1 file changed, 13 insertions(+), 10 deletions(-) > > diff --git a/include/configs/am335x_evm.h > b/include/configs/am335x_evm.h index d75df92..86623b1 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -56,11 +56,14 @@ > > #ifndef CONFIG_SPL_BUILD > #define CONFIG_EXTRA_ENV_SETTINGS \ > - "loadaddr=0x80200000\0" \ > - "fdtaddr=0x80F80000\0" \ > + "loadaddr=0x81000000\0" \ > + "pxefile_addr_r=0x81300000\0" \ > + "kernel_addr_r=0x81400000\0" \ > + "ramdisk_addr_r=0x83400000\0" \ > + "fdt_addr_r=0x81100000\0" \ > + "fdt_addr=0x81200000\0" \ > "fdt_high=0xffffffff\0" \ > "boot_fdt=try\0" \ > - "rdaddr=0x81000000\0" \ > "bootpart=0:2\0" \ > "bootdir=/boot\0" \ > "bootfile=zImage\0" \ > @@ -76,7 +79,7 @@ > "nfsopts=nolock\0" \ > "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" > \ "::off\0" \ > - "ramroot=/dev/ram0 rw ramdisk_size=65536 > initrd=${rdaddr},64M\0" \ > + "ramroot=/dev/ram0 rw ramdisk_size=65536 > initrd=${ramdisk_addr_r},64M\0" \ "ramrootfstype=ext2\0" \ > "mmcargs=setenv bootargs console=${console} " \ > "${optargs} " \ > @@ -105,13 +108,13 @@ > "${optargs} " \ > "root=${ramroot} " \ > "rootfstype=${ramrootfstype}\0" \ > - "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ > + "loadramdisk=load mmc ${mmcdev} ${ramdisk_addr_r} > ramdisk.gz\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} > ${bootdir}/${bootfile}\0" \ > - "loadfdt=load mmc ${bootpart} ${fdtaddr} > ${bootdir}/${fdtfile}\0" \ > + "loadfdt=load mmc ${bootpart} ${fdt_addr_r} > ${bootdir}/${fdtfile}\0" \ "mmcloados=run mmcargs; " \ > "if test ${boot_fdt} = yes || test ${boot_fdt} = > try; then " \ "if run loadfdt; then " \ > - "bootz ${loadaddr} - ${fdtaddr}; " \ > + "bootz ${loadaddr} - ${fdt_addr_r}; > " \ "else " \ > "if test ${boot_fdt} = try; then " \ > "bootz; " \ > @@ -146,12 +149,12 @@ > "setenv autoload no; " \ > "dhcp; " \ > "tftp ${loadaddr} ${bootfile}; " \ > - "tftp ${fdtaddr} ${fdtfile}; " \ > + "tftp ${fdt_addr_r} ${fdtfile}; " \ > "run netargs; " \ > - "bootz ${loadaddr} - ${fdtaddr}\0" \ > + "bootz ${loadaddr} - ${fdt_addr_r}\0" \ > "ramboot=echo Booting from ramdisk ...; " \ > "run ramargs; " \ > - "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ > + "bootz ${loadaddr} ${ramdisk_addr_r} > ${fdt_addr_r}\0" \ "findfdt="\ > "if test $board_name = A335BONE; then " \ > "setenv fdtfile am335x-bone.dtb; fi; " \ we are not enabling extlinux here right now because of how we have to do partitioning. though it is a solvable problem. Because the MLO only reads from fat we have a 20M fat partition that holds MLO u-boot.img and a uEnv.txt file. what I really want to do is teach the MLO to load u-boot.img from either ext2 or fat and use raw space for the MLO so then we can just go to standard partitioning. Dennis
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index d75df92..86623b1 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -56,11 +56,14 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=0x80200000\0" \ - "fdtaddr=0x80F80000\0" \ + "loadaddr=0x81000000\0" \ + "pxefile_addr_r=0x81300000\0" \ + "kernel_addr_r=0x81400000\0" \ + "ramdisk_addr_r=0x83400000\0" \ + "fdt_addr_r=0x81100000\0" \ + "fdt_addr=0x81200000\0" \ "fdt_high=0xffffffff\0" \ "boot_fdt=try\0" \ - "rdaddr=0x81000000\0" \ "bootpart=0:2\0" \ "bootdir=/boot\0" \ "bootfile=zImage\0" \ @@ -76,7 +79,7 @@ "nfsopts=nolock\0" \ "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ "::off\0" \ - "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \ + "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${ramdisk_addr_r},64M\0" \ "ramrootfstype=ext2\0" \ "mmcargs=setenv bootargs console=${console} " \ "${optargs} " \ @@ -105,13 +108,13 @@ "${optargs} " \ "root=${ramroot} " \ "rootfstype=${ramrootfstype}\0" \ - "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ + "loadramdisk=load mmc ${mmcdev} ${ramdisk_addr_r} ramdisk.gz\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ - "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadfdt=load mmc ${bootpart} ${fdt_addr_r} ${bootdir}/${fdtfile}\0" \ "mmcloados=run mmcargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdtaddr}; " \ + "bootz ${loadaddr} - ${fdt_addr_r}; " \ "else " \ "if test ${boot_fdt} = try; then " \ "bootz; " \ @@ -146,12 +149,12 @@ "setenv autoload no; " \ "dhcp; " \ "tftp ${loadaddr} ${bootfile}; " \ - "tftp ${fdtaddr} ${fdtfile}; " \ + "tftp ${fdt_addr_r} ${fdtfile}; " \ "run netargs; " \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ + "bootz ${loadaddr} - ${fdt_addr_r}\0" \ "ramboot=echo Booting from ramdisk ...; " \ "run ramargs; " \ - "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ + "bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \ "findfdt="\ "if test $board_name = A335BONE; then " \ "setenv fdtfile am335x-bone.dtb; fi; " \
Signed-off-by: Dennis Gilmore <dennis@ausil.us> --- include/configs/am335x_evm.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)