0605737fd6
- cleanup duplicate defines
75 lines
2.6 KiB
Diff
75 lines
2.6 KiB
Diff
From c1ce44384122a284dad8efb084fe6f1c047633ea Mon Sep 17 00:00:00 2001
|
|
From: Dennis Gilmore <dennis@ausil.us>
|
|
Date: Thu, 17 Oct 2013 18:21:54 -0500
|
|
Subject: [PATCH 13/16] setup distro common variables on beaglebones
|
|
|
|
---
|
|
include/configs/am335x_evm.h | 21 ++++++++++++---------
|
|
1 file changed, 12 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
|
|
index c2ba7e3..25f5893 100644
|
|
--- a/include/configs/am335x_evm.h
|
|
+++ b/include/configs/am335x_evm.h
|
|
@@ -57,10 +57,13 @@
|
|
#ifndef CONFIG_SPL_BUILD
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"loadaddr=0x80200000\0" \
|
|
- "fdtaddr=0x80F80000\0" \
|
|
+ "pxefile_addr_r=0x80500000\0" \
|
|
+ "kernel_addr_r=0x80600000\0" \
|
|
+ "ramdisk_addr_r=0x82600000\0" \
|
|
+ "fdt_addr_r=0x80300000\0" \
|
|
+ "fdt_addr=0x80400000\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; " \
|
|
--
|
|
1.8.3.1
|
|
|