From 1b8ae04b120f2bb20077841fd62f2880a6de6c0d Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Fri, 27 May 2016 12:20:06 -0500 Subject: [PATCH] am335x_evm: uEnv.txt, bootz, n fixes Signed-off-by: Robert Nelson --- board/ti/am335x/board.c | 29 ++++- board/ti/am335x/board.h | 6 + board/ti/am335x/mux.c | 18 ++- common/spl/spl.c | 8 ++ configs/am335x_evm_defconfig | 1 - include/configs/am335x_evm.h | 62 ++++++--- include/configs/ti_armv7_common.h | 255 +++++++++++++++++++++++++++++++++++++- 7 files changed, 356 insertions(+), 23 deletions(-) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index f56d17e..e5608ac 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -481,6 +481,24 @@ void sdram_init(void) */ int board_init(void) { + u32 sys_reboot; + + sys_reboot = readl(PRM_RSTST); + if (sys_reboot & (1 << 9)) + puts("Reset Source: IcePick reset has occurred.\n"); + + if (sys_reboot & (1 << 5)) + puts("Reset Source: Global external warm reset has occurred.\n"); + + if (sys_reboot & (1 << 4)) + puts("Reset Source: watchdog reset has occurred.\n"); + + if (sys_reboot & (1 << 1)) + puts("Reset Source: Global warm SW reset has occurred.\n"); + + if (sys_reboot & (1 << 0)) + puts("Reset Source: Power-on reset has occurred.\n"); + #if defined(CONFIG_HW_WATCHDOG) hw_watchdog_init(); #endif @@ -511,6 +529,13 @@ int board_late_init(void) if ( (header.version[0] == 0x1a) && (header.version[1] == 0x00) && (header.version[2] == 0x00) && (header.version[3] == 0x00) ) { setenv("board_rev", "BBG1"); + } else if ( (header.version[0] == 0x30) && (header.version[1] == 0x30) && + (header.version[2] == 0x41) && (header.version[3] == 0x35) ) { + setenv("board_rev", "SE0A"); + header.version[0] = 0x53; + header.version[1] = 0x45; + header.version[2] = 0x30; + header.version[3] = 0x41; } else { strncpy(safe_string, (char *)header.version, sizeof(header.version)); safe_string[sizeof(header.version)] = 0; @@ -627,7 +652,7 @@ int board_eth_init(bd_t *bis) if (read_eeprom(&header) < 0) puts("Could not get board ID.\n"); - if (board_is_bone(&header) || board_is_bone_lt(&header) || + if (board_is_bone(&header) || (board_is_bone_lt(&header) && !board_is_bone_lt_enhanced(&header)) || board_is_idk(&header)) { writel(MII_MODE_ENABLE, &cdev->miisel); cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if = @@ -657,7 +682,7 @@ int board_eth_init(bd_t *bis) #define AR8051_DEBUG_RGMII_CLK_DLY_REG 0x5 #define AR8051_RGMII_TX_CLK_DLY 0x100 - if (board_is_evm_sk(&header) || board_is_gp_evm(&header)) { + if (board_is_evm_sk(&header) || board_is_gp_evm(&header) || board_is_bone_lt_enhanced(&header)) { const char *devname; devname = miiphy_get_current_dev(); diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h index bc700d5..f083483 100644 --- a/board/ti/am335x/board.h +++ b/board/ti/am335x/board.h @@ -39,6 +39,12 @@ static inline int board_is_bone_lt(struct am335x_baseboard_id *header) return !strncmp(header->name, "A335BNLT", HDR_NAME_LEN); } +static inline int board_is_bone_lt_enhanced(struct am335x_baseboard_id *header) +{ + return (board_is_bone_lt(header) && + strncmp("SE", header->version, 2) <= 0); +} + static inline int board_is_evm_sk(struct am335x_baseboard_id *header) { return !strncmp("A335X_SK", header->name, HDR_NAME_LEN); diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 79ed02f..efeabd7 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -236,6 +236,13 @@ static struct module_pin_mux bone_norcape_pin_mux[] = { }; #endif +static struct module_pin_mux bbb_p9_15_pin_mux[] = { + /* P9.15 shared pin */ + {OFFSET(gpmc_a0), MODE(0) | PULLUDDIS}, + {OFFSET(gpmc_csn3), (MODE(3) | RXACTIVE | PULLUP_EN)}, + {-1}, +}; + #if defined(CONFIG_NOR_BOOT) void enable_norboot_pin_mux(void) { @@ -354,8 +361,14 @@ void enable_board_pin_mux(struct am335x_baseboard_id *header) configure_module_pin_mux(rgmii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux_sk_evm); } else if (board_is_bone_lt(header)) { - /* Beaglebone LT pinmux */ - configure_module_pin_mux(mii1_pin_mux); + if(board_is_bone_lt_enhanced(header)) { + /* SanCloud Beaglebone LT Enhanced pinmux */ + configure_module_pin_mux(rgmii1_pin_mux); + } + else { + /* Beaglebone LT pinmux */ + configure_module_pin_mux(mii1_pin_mux); + } configure_module_pin_mux(mmc0_pin_mux); #if defined(CONFIG_NAND) && defined(CONFIG_EMMC_BOOT) configure_module_pin_mux(nand_pin_mux); @@ -363,6 +376,7 @@ void enable_board_pin_mux(struct am335x_baseboard_id *header) configure_module_pin_mux(bone_norcape_pin_mux); #else configure_module_pin_mux(mmc1_pin_mux); + configure_module_pin_mux(bbb_p9_15_pin_mux); #endif } else { puts("Unknown board, cannot configure pinmux."); diff --git a/common/spl/spl.c b/common/spl/spl.c index e5167bf..07b77b1 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -465,6 +465,14 @@ ulong spl_relocate_stack_gd(void) #if !defined(CONFIG_ARM) gd = new_gd; #endif + + /* revert: + * http://git.denx.de/?p=u-boot.git;a=commit;h=8656c4f76f012254a1a01d6d7956d85d7d3d73bf + * fixes 1GB am335x + */ + /* Clear the BSS. */ + memset(__bss_start, 0, __bss_end - __bss_start); + return ptr; #else return 0; diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 7753ab5..8699953 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -3,7 +3,6 @@ CONFIG_TARGET_AM335X_EVM=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y -CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 6ebe0b3..c215e31 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -17,6 +17,7 @@ #define __CONFIG_AM335X_EVM_H #include +#define CONFIG_ENV_IS_NOWHERE #ifndef CONFIG_SPL_BUILD #ifndef CONFIG_FIT @@ -69,9 +70,14 @@ #define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=" \ + "gpio clear 56; " \ + "gpio clear 55; " \ + "gpio clear 54; " \ + "gpio set 53; " \ + "setenv interface mmc; " \ "setenv mmcdev " #instance"; "\ - "setenv bootpart " #instance":2 ; "\ - "run mmcboot\0" + "setenv bootpart " #instance":1 ; "\ + "run boot\0" #define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ #devtypel #instance " " @@ -124,19 +130,24 @@ "root=${spiroot} " \ "rootfstype=${spirootfstype}\0" \ "bootenv=uEnv.txt\0" \ - "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ - "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "script=boot.scr\0" \ + "scriptfile=${script}\0" \ + "loadbootscript=load ${interface} ${bootpart} ${loadaddr} ${scriptfile};\0" \ + "bootscript=echo Running bootscript from mmc${bootpart} ...; " \ "source ${loadaddr}\0" \ - "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ - "importbootenv=echo Importing environment from mmc ...; " \ + "loadbootenv=load ${interface} ${bootpart} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from ${interface} ...; " \ "env import -t -r $loadaddr $filesize\0" \ "ramargs=setenv bootargs console=${console} " \ "${optargs} " \ "root=${ramroot} " \ "rootfstype=${ramrootfstype}\0" \ - "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ - "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ - "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadramdisk=load ${interface} ${mmcdev} ${rdaddr} ramdisk.gz\0" \ + "loadimage=load ${interface} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loadrd=load ${interface} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}; setenv rdsize ${filesize}\0" \ + "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${interface} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ + "failumsboot=echo; echo FAILSAFE: U-Boot UMS (USB Mass Storage) enabled, media now available over the usb slave port ...; " \ + "ums 0 ${interface} 1;\0" \ "mmcloados=run args_mmc; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ @@ -151,8 +162,8 @@ "else " \ "bootz; " \ "fi;\0" \ - "mmcboot=mmc dev ${mmcdev}; " \ - "if mmc rescan; then " \ + "mmcboot=${interface} dev ${mmcdev}; " \ + "if ${interface} rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ "if run loadbootscript; then " \ "run bootscript;" \ @@ -180,12 +191,28 @@ "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ "findfdt="\ "if test $board_name = A335BONE; then " \ - "setenv fdtfile am335x-bone.dtb; fi; " \ + "setenv fdtfile am335x-bone.dtb; setenv fdtbase am335x-bone; fi; " \ "if test $board_name = A335BNLT; then " \ - "if test $board_rev = BBG1; then " \ - "setenv fdtfile am335x-bonegreen.dtb; " \ + "if test $board_rev = BLA0; then " \ + "setenv fdtfile am335x-boneblue.dtb; setenv fdtbase am335x-boneblue; " \ + "elif test $board_rev = BBG1; then " \ + "setenv fdtfile am335x-bonegreen.dtb; setenv fdtbase am335x-bonegreen; " \ + "elif test $board_rev = GW1A; then " \ + "setenv fdtfile am335x-bonegreen-wireless.dtb; setenv fdtbase am335x-bonegreen-wireless; " \ + "elif test $board_rev = AIA0; then " \ + "setenv fdtfile am335x-abbbi.dtb; setenv fdtbase am335x-abbbi; " \ + "elif test $board_rev = EIA0; then " \ + "setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; " \ + "elif test $board_rev = SE0A; then " \ + "setenv fdtfile am335x-sancloud-bbe.dtb; setenv fdtbase am335x-sancloud-bbe; " \ + "elif test $board_rev = ME06; then " \ + "setenv fdtfile am335x-bonegreen.dtb; setenv fdtbase am335x-bonegreen; " \ + "elif test $board_rev = M10A; then " \ + "setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; " \ + "elif test $board_rev = GH01; then " \ + "setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; " \ "else " \ - "setenv fdtfile am335x-boneblack.dtb; " \ + "setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; " \ "fi; " \ "fi; " \ "if test $board_name = A33515BB; then " \ @@ -194,6 +221,9 @@ "setenv fdtfile am335x-evmsk.dtb; fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ + EEWIKI_NFS \ + EEWIKI_BOOT \ + EEWIKI_UNAME_BOOT \ NANDARGS \ NETARGS \ DFUARGS \ @@ -471,6 +501,8 @@ #define CONFIG_PHY_GIGE #define CONFIG_PHYLIB #define CONFIG_PHY_SMSC +#define CONFIG_PHY_ATHEROS +#define CONFIG_PHY_VITESSE /* * NOR Size = 16 MiB diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 199612b..491f822 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -60,11 +60,260 @@ #define DEFAULT_MMC_TI_ARGS \ "mmcdev=0\0" \ "mmcrootfstype=ext4 rootwait\0" \ - "finduuid=part uuid mmc 0:2 uuid\0" \ + "finduuid=part uuid ${interface} ${bootpart} uuid\0" \ "args_mmc=run finduuid;setenv bootargs console=${console} " \ "${optargs} " \ - "root=PARTUUID=${uuid} rw " \ - "rootfstype=${mmcrootfstype}\0" + "${cape_disable} " \ + "${cape_enable} " \ + "root=PARTUUID=${uuid} ro " \ + "rootfstype=${mmcrootfstype} " \ + "${cmdline}\0" \ + "args_mmc_old=setenv bootargs console=${console} " \ + "${optargs} " \ + "${cape_disable} " \ + "${cape_enable} " \ + "root=${oldroot} ro " \ + "rootfstype=${mmcrootfstype} " \ + "${cmdline}\0" \ + "args_mmc_uuid=setenv bootargs console=${console} " \ + "${optargs} " \ + "${cape_disable} " \ + "${cape_enable} " \ + "root=UUID=${uuid} ro " \ + "rootfstype=${mmcrootfstype} " \ + "${cmdline}\0" \ + "args_uenv_root=setenv bootargs console=${console} " \ + "${optargs} " \ + "${cape_disable} " \ + "${cape_enable} " \ + "root=${uenv_root} ro " \ + "rootfstype=${mmcrootfstype} " \ + "${cmdline}\0" \ + "args_netinstall=setenv bootargs ${netinstall_bootargs} " \ + "${optargs} " \ + "${cape_disable} " \ + "${cape_enable} " \ + "root=/dev/ram rw " \ + "${cmdline}\0" + +#define EEWIKI_NFS \ + "server_ip=192.168.1.100\0" \ + "gw_ip=192.168.1.1\0" \ + "netmask=255.255.255.0\0" \ + "hostname=\0" \ + "device=eth0\0" \ + "autoconf=off\0" \ + "root_dir=/home/userid/targetNFS\0" \ + "tftp_dir=\0" \ + "nfs_options=,vers=3\0" \ + "nfsrootfstype=ext4 rootwait fixrtc\0" \ + "nfsargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "${cape_disable} " \ + "${cape_enable} " \ + "root=/dev/nfs rw " \ + "rootfstype=${nfsrootfstype} " \ + "nfsroot=${nfsroot} " \ + "ip=${ip} " \ + "${cmdline}\0" \ + "nfsboot=echo Booting from ${server_ip} ...; " \ + "setenv nfsroot ${server_ip}:${root_dir}${nfs_options}; " \ + "setenv ip ${client_ip}:${server_ip}:${gw_ip}:${netmask}:${hostname}:${device}:${autoconf}; " \ + "setenv autoload no; " \ + "setenv serverip ${server_ip}; " \ + "setenv ipaddr ${client_ip}; " \ + "tftp ${loadaddr} ${tftp_dir}${bootfile}; " \ + "tftp ${fdtaddr} ${tftp_dir}dtbs/${fdtfile}; " \ + "run nfsargs; " \ + "bootz ${loadaddr} - ${fdtaddr}\0" \ + "nfsboot_uname_r=echo Booting from ${server_ip} ...; " \ + "setenv nfsroot ${server_ip}:${root_dir}${nfs_options}; " \ + "setenv ip ${client_ip}:${server_ip}:${gw_ip}:${netmask}:${hostname}:${device}:${autoconf}; " \ + "setenv autoload no; " \ + "setenv serverip ${server_ip}; " \ + "setenv ipaddr ${client_ip}; " \ + "tftp ${loadaddr} ${tftp_dir}vmlinuz-${uname_r}; " \ + "tftp ${fdtaddr} ${tftp_dir}dtbs/${uname_r}/${fdtfile}; " \ + "run nfsargs; " \ + "bootz ${loadaddr} - ${fdtaddr}\0" \ + +#define EEWIKI_BOOT \ + "boot=${interface} dev ${mmcdev}; " \ + "if ${interface} rescan; then " \ + "gpio set 54;" \ + "setenv bootpart ${mmcdev}:1; " \ + "if test -e ${interface} ${bootpart} /etc/fstab; then " \ + "setenv mmcpart 1;" \ + "fi; " \ + "echo Checking for: /uEnv.txt ...;" \ + "if test -e ${interface} ${bootpart} /uEnv.txt; then " \ + "if run loadbootenv; then " \ + "gpio set 55;" \ + "echo Loaded environment from ${bootenv};" \ + "run importbootenv;" \ + "fi;" \ + "if test -n ${cape}; then " \ + "if test -e ${interface} ${bootpart} ${fdtdir}/${fdtbase}-${cape}.dtb; then " \ + "setenv fdtfile ${fdtbase}-${cape}.dtb; " \ + "fi; " \ + "echo using: $fdtfile...; " \ + "fi; " \ + "echo Checking if uenvcmd is set ...;" \ + "if test -n ${uenvcmd}; then " \ + "gpio set 56; " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "echo Checking if client_ip is set ...;" \ + "if test -n ${client_ip}; then " \ + "if test -n ${dtb}; then " \ + "setenv fdtfile ${dtb};" \ + "echo using ${fdtfile} ...;" \ + "fi;" \ + "gpio set 56; " \ + "if test -n ${uname_r}; then " \ + "echo Running nfsboot_uname_r ...;" \ + "run nfsboot_uname_r;" \ + "fi;" \ + "echo Running nfsboot ...;" \ + "run nfsboot;" \ + "fi;" \ + "fi; " \ + "echo Checking for: /${script} ...;" \ + "if test -e ${interface} ${bootpart} /${script}; then " \ + "gpio set 55;" \ + "setenv scriptfile ${script};" \ + "run loadbootscript;" \ + "echo Loaded script from ${scriptfile};" \ + "gpio set 56; " \ + "run bootscript;" \ + "fi; " \ + "echo Checking for: /boot/${script} ...;" \ + "if test -e ${interface} ${bootpart} /boot/${script}; then " \ + "gpio set 55;" \ + "setenv scriptfile /boot/${script};" \ + "run loadbootscript;" \ + "echo Loaded script from ${scriptfile};" \ + "gpio set 56; " \ + "run bootscript;" \ + "fi; " \ + "echo Checking for: /boot/uEnv.txt ...;" \ + "for i in 1 2 3 4 5 6 7 ; do " \ + "setenv mmcpart ${i};" \ + "setenv bootpart ${mmcdev}:${mmcpart};" \ + "if test -e ${interface} ${bootpart} /boot/uEnv.txt; then " \ + "gpio set 55;" \ + "load ${interface} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ + "env import -t ${loadaddr} ${filesize};" \ + "echo Loaded environment from /boot/uEnv.txt;" \ + "if test -n ${cape}; then " \ + "echo debug: [cape=${cape}] ... ;" \ + "setenv fdtfile ${fdtbase}-${cape}.dtb; " \ + "echo Using: dtb=${fdtfile} ...;" \ + "fi; " \ + "if test -n ${dtb}; then " \ + "echo debug: [dtb=${dtb}] ... ;" \ + "setenv fdtfile ${dtb};" \ + "echo Using: dtb=${fdtfile} ...;" \ + "fi;" \ + "echo Checking if uname_r is set in /boot/uEnv.txt...;" \ + "if test -n ${uname_r}; then " \ + "gpio set 56; " \ + "setenv oldroot /dev/mmcblk${mmcdev}p${mmcpart};" \ + "echo Running uname_boot ...;" \ + "run uname_boot;" \ + "fi;" \ + "fi;" \ + "done;" \ + "fi;\0" \ + +#define EEWIKI_UNAME_BOOT \ + "uname_boot="\ + "setenv bootdir /boot; " \ + "setenv bootfile vmlinuz-${uname_r}; " \ + "if test -e ${interface} ${bootpart} ${bootdir}/${bootfile}; then " \ + "echo loading ${bootdir}/${bootfile} ...; "\ + "run loadimage;" \ + "setenv fdtdir /boot/dtbs/${uname_r}; " \ + "if test -e ${interface} ${bootpart} ${fdtdir}/${fdtfile}; then " \ + "run loadfdt;" \ + "else " \ + "setenv fdtdir /usr/lib/linux-image-${uname_r}; " \ + "if test -e ${interface} ${bootpart} ${fdtdir}/${fdtfile}; then " \ + "run loadfdt;" \ + "else " \ + "setenv fdtdir /lib/firmware/${uname_r}/device-tree; " \ + "if test -e ${interface} ${bootpart} ${fdtdir}/${fdtfile}; then " \ + "run loadfdt;" \ + "else " \ + "setenv fdtdir /boot/dtb-${uname_r}; " \ + "if test -e ${interface} ${bootpart} ${fdtdir}/${fdtfile}; then " \ + "run loadfdt;" \ + "else " \ + "setenv fdtdir /boot/dtbs; " \ + "if test -e ${interface} ${bootpart} ${fdtdir}/${fdtfile}; then " \ + "run loadfdt;" \ + "else " \ + "setenv fdtdir /boot/dtb; " \ + "if test -e ${interface} ${bootpart} ${fdtdir}/${fdtfile}; then " \ + "run loadfdt;" \ + "else " \ + "setenv fdtdir /boot; " \ + "if test -e ${interface} ${bootpart} ${fdtdir}/${fdtfile}; then " \ + "run loadfdt;" \ + "else " \ + "if test -e ${interface} ${bootpart} ${fdtfile}; then " \ + "run loadfdt;" \ + "else " \ + "echo; echo unable to find [dtb=${fdtfile}] did you name it correctly? ...; " \ + "run failumsboot;" \ + "fi;" \ + "fi;" \ + "fi;" \ + "fi;" \ + "fi;" \ + "fi;" \ + "fi;" \ + "fi; " \ + "setenv rdfile initrd.img-${uname_r}; " \ + "if test -e ${interface} ${bootpart} ${bootdir}/${rdfile}; then " \ + "echo loading ${bootdir}/${rdfile} ...; "\ + "run loadrd;" \ + "if test -n ${netinstall_enable}; then " \ + "run args_netinstall; run message;" \ + "echo debug: [${bootargs}] ... ;" \ + "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ + "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ + "fi;" \ + "if test -n ${uenv_root}; then " \ + "run args_uenv_root;" \ + "echo debug: [${bootargs}] ... ;" \ + "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ + "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ + "fi;" \ + "if test -n ${uuid}; then " \ + "run args_mmc_uuid;" \ + "echo debug: [${bootargs}] ... ;" \ + "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ + "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ + "fi;" \ + "run args_mmc_old;" \ + "echo debug: [${bootargs}] ... ;" \ + "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ + "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ + "else " \ + "if test -n ${uenv_root}; then " \ + "run args_uenv_root;" \ + "echo debug: [${bootargs}] ... ;" \ + "echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \ + "bootz ${loadaddr} - ${fdtaddr}; " \ + "fi;" \ + "run args_mmc_old;" \ + "echo debug: [${bootargs}] ... ;" \ + "echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \ + "bootz ${loadaddr} - ${fdtaddr}; " \ + "fi;" \ + "fi;\0" \ /* * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, -- 2.8.1