[U-Boot] [PATCH 6/6] davinci: ea20: add some configs and default environmet variables

Stefano Babic
2012-08-15T17:03:49Z

On 10/08/2012 09:26, Bastian Ruppert wrote:
> Signed-off-by: Bastian Ruppert <Bastian.Ruppert@Sewerin.de>
> CC: Tom Rini <trini@ti.com>
> CC: Stefano Babic <sbabic@denx.de>
> ---
> include/configs/ea20.h | 106 ++++++++++++++++++++++++++++++------------------
> 1 files changed, 66 insertions(+), 40 deletions(-)
>
> diff --git a/include/configs/ea20.h b/include/configs/ea20.h
> index f9a1462..373db74 100644
> --- a/include/configs/ea20.h
> +++ b/include/configs/ea20.h
> @@ -30,6 +30,7 @@
> #define CONFIG_USE_SPIFLASH
> #define CONFIG_SYS_USE_NAND
> #define CONFIG_DRIVER_TI_EMAC_USE_RMII
> +#define CONFIG_DRIVER_TI_EMAC_RMII_NONEG
> #define CONFIG_BOARD_EARLY_INIT_F
> #define CONFIG_BOARD_LATE_INIT
> #define CONFIG_VIDEO
> @@ -98,6 +99,7 @@
> * Network & Ethernet Configuration
> */
> #ifdef CONFIG_DRIVER_TI_EMAC
> +#define CONFIG_EMAC_MDIO_PHY_NUM 0
> #define CONFIG_MII
> #define CONFIG_BOOTP_DEFAULT
> #define CONFIG_BOOTP_DNS
> @@ -121,9 +123,11 @@
> #define CONFIG_VIDEO_DA8XX
> #define CONFIG_CFB_CONSOLE
> #define CONFIG_VGA_AS_SINGLE_DEVICE
> -#define CONFIG_SPLASH_SCREEN
> +#define CONFIG_SPLASH_SCREEN_ALIGN
> #define CONFIG_VIDEO_LOGO
> +#define CONFIG_SYS_CONSOLE_INFO_QUIET
> #define CONFIG_VIDEO_BMP_RLE8
> +#define CONFIG_VIDEO_BMP_LOGO
> #define CONFIG_CMD_BMP
> #define CONFIG_SYS_CONSOLE_IS_IN_ENV
> #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
> @@ -197,6 +201,7 @@
>
> #define CONFIG_NAND_DAVINCI
> #define CONFIG_SYS_NAND_PAGE_2K
> +#define CONFIG_SYS_NAND_NO_SUBPAGE
> #define CONFIG_SYS_NAND_CS 2
> #define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE2_BASE
> #undef CONFIG_SYS_NAND_HW_ECC
> @@ -235,31 +240,39 @@
> #define xstr(s) str(s)
> #define str(s) #s
>
> -
> #define CONFIG_HOSTNAME ea20
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> "as=3\0" \
> - "netdev=eth0\0" \
> + "netdev=eth0\0" \
> "nfsargs=setenv bootargs root=/dev/nfs rw " \
> "nfsroot=${serverip}:${rootpath}\0" \
> "rfsbargs=setenv bootargs root=/dev/nfs rw " \
> "nfsroot=${serverip}:${rfsbpath}\0" \
> - "ramargs=setenv bootargs root=/dev/ram rw\0" \
> - "mtdids=nand0=davinci_nand.0\0" \
> - "mtdparts=mtdparts=davinci_nand.0:8m(Settings),8m(aKernel)," \
> - "8m(bKernel),76m(aRootfs),76m(bRootfs),-(MassSD)\0" \
> + "testrfsargs=setenv bootargs root=/dev/nfs rw " \
> + "nfsroot=${serverip}:${testrfspath}\0" \
> + "ramargs=setenv bootargs root=/dev/ram rw initrd=" \
> + "0x${ramdisk_addr_r},4M\0" \
> + "mtdids=nand0=davinci_nand.0\0" \
> + "serverip=192.168.5.249\0" \
> + "ipaddr=192.168.5.248\0" \
> + "rootpath=/opt/eldk/arm\0" \
> + "splashpos=230,180\0" \
> + "testrfspath=/opt/eldk/test_arm\0" \
> + "tempmac=setenv ethaddr 02:ea:20:ff:ff:ff\0" \
> "nandargs=setenv bootargs rootfstype=ubifs ro chk_data_crc " \
> "ubi.mtd=${as} root=ubi0:rootfs\0" \
> + "nandrwargs=setenv bootargs rootfstype=ubifs rw chk_data_crc " \
> + "ubi.mtd=${as} root=ubi0:rootfs\0" \
> "addip_sta=setenv bootargs ${bootargs} " \
> "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
> ":${hostname}:${netdev}:off panic=1\0" \
> "addip_dyn=setenv bootargs ${bootargs} ip=dhcp\0" \
> - "addip=if test -n ${ipdyn};then run addip_dyn;" \
> + "addip=if test -n ${ipdyn};then run addip_dyn;" \
> "else run addip_sta;fi\0" \
> "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
> "addtty=setenv bootargs ${bootargs}" \
> " console=${consoledev},${baudrate}n8\0" \
> - "addmisc=setenv bootargs ${bootargs} ${misc}\0" \
> + "addmisc=setenv bootargs ${bootargs} ${misc}\0" \
> "addmem=setenv bootargs ${bootargs} mem=${memory}\0" \
> "consoledev=ttyS0\0" \
> "loadaddr=c0000014\0" \
> @@ -267,44 +280,57 @@
> "kernel_addr_r=c0700000\0" \
> "hostname=" xstr(CONFIG_HOSTNAME) "\0" \
> "bootfile=" xstr(CONFIG_HOSTNAME) "/uImage\0" \
> - "ramdisk_file=" xstr(CONFIG_HOSTNAME) "/uRamdisk\0" \
> + "ramdisk_file=" xstr(CONFIG_HOSTNAME) "/image.ext2\0" \
> "flash_self=run ramargs addip addtty addmtd addmisc addmem;" \
> - "bootm ${kernel_addr} ${ramdisk_addr}\0" \
> + "bootm ${kernel_addr_r}\0" \
> "flash_nfs=run nfsargs addip addtty addmtd addmisc addmem;" \
> "bootm ${kernel_addr}\0" \
> - "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \
> + "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \
> "run nfsargs addip addtty addmtd addmisc addmem;" \
> - "bootm ${kernel_addr_r}\0" \
> - "net_rfsb=tftp ${kernel_addr_r} ${bootfile}; " \
> - "run rfsbargs addip addtty addmtd addmisc addmem; " \
> - "bootm ${kernel_addr_r}\0" \
> + "bootm ${kernel_addr_r}\0" \
> + "net_rfsb=tftp ${kernel_addr_r} ${bootfile}; " \
> + "run rfsbargs addip addtty addmtd addmisc addmem; " \
> + "bootm ${kernel_addr_r}\0" \
> + "net_testrfs=tftp ${kernel_addr_r} ${bootfile}; " \
> + "run testrfsargs addip addtty addmtd addmisc addmem; " \
> + "bootm ${kernel_addr_r}\0" \
> "net_self_load=tftp ${kernel_addr_r} ${bootfile};" \
> "tftp ${ramdisk_addr_r} ${ramdisk_file};\0" \
> - "nand_nand=ubi part nand0,${as};ubifsmount rootfs;" \
> - "ubifsload ${kernel_addr_r} /boot/uImage;" \
> - "ubifsumount; run nandargs addip addtty " \
> - "addmtd addmisc addmem;bootm ${kernel_addr_r}\0" \
> - "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin\0" \
> - "load_magic=if sf probe 0;then sf " \
> - "read c0000000 0x10000 0x60000;fi\0" \
> - "load_nand=ubi part nand0,${as};ubifsmount rootfs;" \
> - "if ubifsload c0000014 /boot/u-boot.bin;" \
> - "then mw c0000008 ${filesize};else echo Error reading " \
> - "u-boot from nand!;fi\0" \
> - "load_net=if sf probe 0;then sf read c0000000 0x10000 0x60000;" \
> - "tftp c0000014 ${u-boot};" \
> - "mw c0000008 ${filesize};" \
> - "fi\0" \
> - "upd=if sf probe 0;then sf erase 10000 60000;" \
> - "sf write c0000000 10000 60000;" \
> - "fi\0" \
> - "ubootupd_net=if run load_net;then echo Updating u-boot;" \
> - "if run upd; then echo U-Boot updated;" \
> + "nand_nand=ubi part nand0,${as};ubifsmount rootfs;" \
> + "ubifsload ${kernel_addr_r} /boot/uImage;" \
> + "ubifsumount; run nandargs addip addtty " \
> + "addmtd addmisc addmem;clrlogo;" \
> + "bootm ${kernel_addr_r}\0" \
> + "nand_nandrw=ubi part nand0,${as};ubifsmount rootfs;" \
> + "ubifsload ${kernel_addr_r} /boot/uImage;" \
> + "ubifsumount; run nandrwargs addip addtty " \
> + "addmtd addmisc addmem;clrlogo;" \
> + "bootm ${kernel_addr_r}\0" \
> + "net_nandrw=tftp ${kernel_addr_r} ${bootfile}; run nandrwargs" \
> + " addip addtty addmtd addmisc addmem;" \
> + "clrlogo;bootm ${kernel_addr_r}\0" \
> + "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin\0" \
> + "load_magic=if sf probe 0;then sf " \
> + "read c0000000 0x10000 0x60000;fi\0" \
> + "load_nand=ubi part nand0,${as};ubifsmount rootfs;" \
> + "if ubifsload c0000014 /boot/u-boot.bin;" \
> + "then mw c0000008 ${filesize};else echo Error reading" \
> + " u-boot from nand!;fi\0" \
> + "load_net=if sf probe 0;then sf read c0000000 0x10000 " \
> + "0x60000;tftp c0000014 ${u-boot};" \
> + "mw c0000008 ${filesize};fi\0" \
> + "upd=if sf probe 0;then sf erase 10000 60000;" \
> + "sf write c0000000 10000 60000;fi\0" \
> + "ublupdate=if tftp C0700000 ${ublname};then sf probe 0; " \
> + "sf erase 0 10000;" \
> + "sf write 0xc0700000 0 ${filesize};fi\0" \
> + "ubootupd_net=if run load_net;then echo Updating u-boot;" \
> + "if run upd; then echo U-Boot updated;" \
> "else echo Error updating u-boot !;" \
> "echo Board without bootloader !!;" \
> "fi;" \
> - "else echo U-Boot not downloaded..exiting;fi\0" \
> - "ubootupd_nand=echo run load_magic,run load_nand,run upd;\0" \
> - "bootcmd=run net_nfs\0"
> + "else echo U-Boot not downloaded..exiting;fi\0" \
> + "ubootupd_nand=echo run load_magic,run load_nand,run upd;\0" \
> + "bootcmd=run tempmac;run net_testrfs\0"
>
> #endif /* __CONFIG_H */
>

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================