From: Hannes Schmelzer Date: Tue, 13 Jun 2017 12:11:33 +0000 (+0200) Subject: board/BuR/brxre1: refactor default environment X-Git-Tag: v2017.07-rc2~10 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=92100426cbf33c4e8afd8779a554726443a1ae34;p=u-boot board/BuR/brxre1: refactor default environment For better readability and setup-handling we refactor the default environment. Signed-off-by: Hannes Schmelzer Reviewed-by: Tom Rini --- diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 63f6ebc27e..f7d736939b 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -38,45 +38,36 @@ #define CONFIG_ENV_SIZE (64 << 10) #ifndef CONFIG_SPL_BUILD -#define CONFIG_EXTRA_ENV_SETTINGS \ + +/* Default environment */ +#define CONFIG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ +"autoload=0\0" \ +"scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bootaddr=0x80001100\0" \ "bootdev=cpsw(0,0)\0" \ "vx_romfsbase=0x800E0000\0" \ "vx_romfssize=0x20000\0" \ "vx_memtop=0x8FBEF000\0" \ -"loadromfs=mmc dev 1; mmc read ${vx_romfsbase} 700 100\0" \ -"autoload=0\0" \ +"loadromfs=mmc read ${vx_romfsbase} 700 100\0" \ "loadaddr=0x80100000\0" \ -"defaultARlen=0x8000\0" \ -"loaddefaultAR=mmc dev 1; mmc read ${loadaddr} 800 ${defaultARlen}\0" \ -"defaultAR=run loadromfs; run loaddefaultAR; bootvx ${loadaddr}\0" \ -"mmcboot=echo booting AR from eMMC-flash ...; "\ - "run loadromfs; " \ - "fatload mmc 1:1 ${loadaddr} arimg && bootvx ${loadaddr}; " \ - "run defaultAR;\0" \ -"netboot=echo booting AR from network ...; " \ - "run loadromfs; " \ - "tftp ${loadaddr} arimg && bootvx ${loadaddr}; " \ - "puts 'networkboot failed!';\0" \ -"netscript=echo running script from network (tftp) ...; " \ - "tftp 0x80000000 netscript.img && source; " \ - "puts 'netscript load failed!'\0" \ -"netupdate=tftp ${loadddr} MLO && mmc write ${loadaddr} 100 100; " \ - "tftp ${loadaddr} u-boot.img && mmc write ${loadaddr} 300 300\0" \ -"netupdatedefaultAR=echo updating defaultAR from network (tftp) ...; " \ - "if tftp 0x80100000 arimg.bin; " \ - "then mmc write 0x80100000 800 ${defaultARlen}; " \ - "else setcurs 1 8; puts 'defAR update failed (tftp)!'; fi;\0" \ -"netupdateROMFS=echo updating romfs from network (tftp) ...; " \ - "if tftp 0x80100000 romfs.bin; " \ - "then mmc write 0x80100000 700 100; " \ - "else setcurs 1 8; puts 'romfs update failed (tftp)!'; fi;\0" - +"startvx=run loadromfs; bootvx ${loadaddr}\0" \ +"b_break=0\0" \ +"b_tgts_std=mmc def net usb0\0" \ +"b_tgts_rcy=def net usb0\0" \ +"b_tgts_pme=net usb0 mmc\0" \ +"b_deftgts=if test ${b_mode} = 12; then setenv b_tgts ${b_tgts_pme};" \ +" elif test ${b_mode} = 0; then setenv b_tgts ${b_tgts_rcy};" \ +" else setenv b_tgts ${b_tgts_std}; fi\0" \ +"b_mmc=load mmc 1 ${loadaddr} arimg && run startvx\0" \ +"b_def=mmc read ${loadaddr} 800 8000; run startvx\0" \ +"b_net=tftp ${scradr} netscript.img && source ${scradr}\0" \ +"b_usb0=usb start && load usb 0 ${scradr} usbscript.img && source ${scradr}\0" \ +"b_default=run b_deftgts; for target in ${b_tgts};"\ +" do run b_${target}; if test ${b_break} = 1; then; exit; fi; done\0" #endif /* !CONFIG_SPL_BUILD*/ -#define CONFIG_BOOTCOMMAND \ - "run usbscript;" +#define CONFIG_BOOTCOMMAND "mmc dev 1; run b_default" /* undefine command which we not need here */ #undef CONFIG_BOOTM_NETBSD