ARM: m28evk: add needed commands and options
PATCH 1/6 ARM: m28evk: add needed commands and options
- "env ask", "env grep" and "setexpr" are needed for commissioning
- add support for ext4 file systems
- adjust default environment to use ext4 commands
- add write support for (V)FAT and EXT4
- add bitmap and splashscreen support
- print timestamp information for images
--- include/configs/m28evk.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
include/configs/m28evk.h +10 -2
@@ -12,17 +12,25 @@#define MACH_TYPE_M28EVK 3613#define CONFIG_MACH_TYPE MACH_TYPE_M28EVK +#define CONFIG_FIT + +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ +/* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH #include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION +#define CONFIG_FAT_WRITE +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_BMP #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT #define CONFIG_CMD_GPIO #define CONFIG_CMD_GREPENV
@@ -145,7 +153,7 @@#define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP -#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) +#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)#endif /* Booting Linux */
Signature · 1 line
2.0.0.rc2
PATCH 1/6 ARM: m28evk: add needed commands and options
Quoted 9 lines · Marek Vasut
- "env ask", "env grep" and "setexpr" are needed for commissioning
- add support for ext4 file systems
- adjust default environment to use ext4 commands
- add write support for (V)FAT and EXT4
- add bitmap and splashscreen support
- print timestamp information for imagesSigned-off-by Marek Vasut <[email protected]>Cc Stefano Babic <[email protected]>
Tom, can you please pick those 6 for .07 ? Also, as pestered on IRC, which exact patches do I need to pick from Filipe ? He ignores my email inquiry ...
Best regards,
Marek Vasut
PATCH 1/6 ARM: m28evk: add needed commands and options
Quoted 8 lines · Marek Vasut
Quoted 7 lines · Marek Vasut
- "env ask", "env grep" and "setexpr" are needed for commissioning
- add support for ext4 file systems
- adjust default environment to use ext4 commands
- add write support for (V)FAT and EXT4
- add bitmap and splashscreen support
- print timestamp information for images
Quoted 6 lines
Quoted 2 lines
Signed-off-by Marek Vasut <[email protected]>Cc Stefano Babic <[email protected]>Tom, can you please pick those 6 for .07 ? Also, as pestered on IRC, which exact patches do I need to pick from Filipe ? He ignores my email inquiry ...
If Stefano gives me a PR, since these are i.MX things, yes.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140709/5d38a847/attachment.pgp>
PATCH 1/6 ARM: m28evk: add needed commands and options
Quoted 9 lines · Tom Rini
Quoted 7 lines · Marek Vasut
Quoted 6 lines · Marek Vasut
- "env ask", "env grep" and "setexpr" are needed for commissioning - add support for ext4 file systems - adjust default environment to use ext4 commands - add write support for (V)FAT and EXT4 - add bitmap and splashscreen support - print timestamp information for images
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
Signed-off-by Marek Vasut <[email protected]> Cc: Stefano BabicTom, can you please pick those 6 for .07 ? Also, as pestered on IRC, which exact patches do I need to pick from Filipe ? He ignores my email inquiry ...
If Stefano gives me a PR, since these are i.MX things, yes.
ok, I'll provide it.
Stefano
Signature · 5 lines
===================================================================== 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 =====================================================================
PATCH 2/6 ARM: m28evk: Adjust mtdparts
In reply to Marek VasutAdjust the mtdparts to also consider factory-programmed config block.
--- include/configs/m28evk.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
include/configs/m28evk.h +8 -9
@@ -64,8 +64,8 @@#if defined(CONFIG_CMD_NAND ) && defined(CONFIG_ENV_IS_IN_NAND )#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE#define CONFIG_ENV_SECT_SIZE (128 * 1024) -#define CONFIG_ENV_RANGE (512 * 1024) -#define CONFIG_ENV_OFFSET 0x300000 +#define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_OFFSET (24 * CONFIG_ENV_SECT_SIZE)/* 3 MiB */ #define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
@@ -79,13 +79,12 @@#define MTDIDS_DEFAULT "nand0=gpmi-nand"#define MTDPARTS_DEFAULT \ "mtdparts=gpmi-nand:" \ - "3m(bootloader)ro," \ - "512k(environment)," \ - "512k(redundant-environment)," \ - "4m(kernel)," \ - "128k(fdt)," \ - "8m(ramdisk)," \ - "-(filesystem)" + "3m(u-boot)," \ + "512k(env1)," \ + "512k(env2)," \ + "14m(boot)," \ + "238m(data)," \ + "- at 4096k(UBI)"#else #define CONFIG_ENV_IS_NOWHERE #endif
Signature · 1 line
2.0.0.rc2
PATCH 3/6 ARM: m28evk: Update default environment
In reply to Marek VasutFrom: Lothar Rubusch <[email protected]>
--- include/configs/m28evk.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 3 deletions(-)
include/configs/m28evk.h +84 -3
@@ -157,14 +157,28 @@/* Booting Linux */ #define CONFIG_BOOTDELAY 3 -#define CONFIG_BOOTFILE "uImage" +#define CONFIG_BOOTFILE "fitImage"#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " -#define CONFIG_BOOTCOMMAND "run bootcmd_net" +#define CONFIG_BOOTCOMMAND "run mmc_mmc"#define CONFIG_LOADADDR 0x42000000#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR/* Extra Environment */ +#define CONFIG_PREBOOT "run try_bootscript" +#define CONFIG_HOSTNAME m28evk +#define CONFIG_EXTRA_ENV_SETTINGS \ + "consdev=ttyAMA0\0" \ + "baudrate=115200\0" \ + "bootdev=/dev/mmcblk0p2\0" \ + "rootdev=/dev/mmcblk0p3\0" \ + "netdev=eth0\0" \ + "hostname=m28evk\0" \ + "rootpath=/opt/eldk-5.5/armv5te/rootfs-qte-sdk\0" \ + "kernel_addr_r=0x42000000\0" \ + "videomode=video=ctfb:x:800,y:480,depth:18,mode:0,pclk:30066," \ + "le:0,ri:256,up:0,lo:45,hs:1,vs:1,sync:100663296," \ + "vmode:0\0" \ "update_nand_full_filename=u-boot.nand\0" \ "update_nand_firmware_filename=u-boot.sb\0" \ "update_sd_firmware_filename=u-boot.sd\0" \
@@ -180,7 +194,7 @@"if tftp ${update_nand_full_filename} ; then " \"run update_nand_get_fcb_size ; " \"nand scrub -y 0x0 ${filesize} ; " \ -"nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; " \ +"nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; " \"setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \"setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \"nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \
@@ -202,6 +216,73 @@"setexpr fw_sz ${fw_sz} + 1 ; " \"mmc write ${loadaddr} 0x800 ${fw_sz} ; " \"fi ; " \ +"fi\0" \ +"addcons=" \ +"setenv bootargs ${bootargs} " \ +"console=${consdev},${baudrate}\0" \ +"addip=" \ +"setenv bootargs ${bootargs} " \ +"ip=${ipaddr}:${serverip}:${gatewayip}:" \ +"${netmask}:${hostname}:${netdev}:off\0" \ +"addmisc=" \ +"setenv bootargs ${bootargs} ${miscargs}\0" \ +"adddfltmtd=" \ +"if test \"x${mtdparts}\" == \"x\" ; then " \ +"mtdparts default ; " \ +"fi\0" \ +"addmtd=" \ +"run adddfltmtd ; " \ +"setenv bootargs ${bootargs} ${mtdparts}\0" \ +"addargs=run addcons addmtd addmisc\0" \ +"mmcload=" \ +"mmc rescan ; " \ +"ext4load mmc 0:2 ${kernel_addr_r} ${bootfile}\0" \ +"ubiload=" \ +"ubi part UBI ; ubifsmount ubi0:rootfs ; " \ +"ubifsload ${kernel_addr_r} /boot/${bootfile}\0" \ +"netload=" \ +"tftp ${kernel_addr_r} ${hostname}/${bootfile}\0" \ +"miscargs=nohlt panic=1\0" \ +"mmcargs=setenv bootargs root=${rootdev} rw rootwait\0" \ +"ubiargs=" \ +"setenv bootargs ubi.mtd=5 " \ +"root=ubi0:rootfs rootfstype=ubifs\0" \ +"nfsargs=" \ +"setenv bootargs root=/dev/nfs rw " \ +"nfsroot=${serverip}:${rootpath},v3,tcp\0" \ +"mmc_mmc=" \ +"run mmcload mmcargs addargs ; " \ +"bootm ${kernel_addr_r}\0" \ +"mmc_ubi=" \ +"run mmcload ubiargs addargs ; " \ +"bootm ${kernel_addr_r}\0" \ +"mmc_nfs=" \ +"run mmcload nfsargs addip addargs ; " \ +"bootm ${kernel_addr_r}\0" \ +"ubi_mmc=" \ +"run ubiload mmcargs addargs ; " \ +"bootm ${kernel_addr_r}\0" \ +"ubi_ubi=" \ +"run ubiload ubiargs addargs ; " \ +"bootm ${kernel_addr_r}\0" \ +"ubi_nfs=" \ +"run ubiload nfsargs addip addargs ; " \ +"bootm ${kernel_addr_r}\0" \ +"net_mmc=" \ +"run netload mmcargs addargs ; " \ +"bootm ${kernel_addr_r}\0" \ +"net_ubi=" \ +"run netload ubiargs addargs ; " \ +"bootm ${kernel_addr_r}\0" \ +"net_nfs=" \ +"run netload nfsargs addip addargs ; " \ +"bootm ${kernel_addr_r}\0" \ +"try_bootscript=" \ +"mmc rescan;" \ +"if ext4load mmc 0:2 ${kernel_addr_r} ${bootscript};" \ +"then;" \ +"\techo Running bootscript...;" \ +"\tsource ${kernel_addr_r};" \"fi\0" /* The rest of the configuration is shared */
Signature · 1 line
2.0.0.rc2
PATCH 4/6 ARM: m53evk: add needed commands and options
In reply to Marek Vasut- "env ask", "env grep" and "setexpr" are needed for commissioning
- add support for ext4 file systems
- adjust default environment to use ext4 commands
- add write support for (V)FAT and EXT4
- add bitmap and splashscreen support
- print timestamp information for images
--- include/configs/m53evk.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
include/configs/m53evk.h +16 -2
@@ -18,17 +18,26 @@#define CONFIG_REVISION_TAG #define CONFIG_SYS_NO_FLASH +#define CONFIG_FIT + +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ +/* * U-Boot Commands */ #include <config_cmd_default.h> #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DOS_PARTITION +#define CONFIG_FAT_WRITE +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_BMP #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP -#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT +#define CONFIG_CMD_GREPENV #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_MMC
@@ -36,6 +45,7 @@#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_SATA +#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_USB #define CONFIG_VIDEO
@@ -213,10 +223,14 @@#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASHIMAGE_GUARD +#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO -#define CONFIG_IPUV3_CLK 200000000 +#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) +#define CONFIG_IPUV3_CLK 200000000#endif /*
Signature · 1 line
2.0.0.rc2
PATCH 5/6 ARM: m53evk: Adjust mtdparts settings
In reply to Marek VasutAdjust the mtdparts settings to allow for alternative boot images and for using UBI.
--- include/configs/m53evk.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
include/configs/m53evk.h +8 -9
@@ -128,8 +128,8 @@#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE#define CONFIG_ENV_SECT_SIZE (128 * 1024) -#define CONFIG_ENV_RANGE (512 * 1024) -#define CONFIG_ENV_OFFSET 0x100000 +#define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_OFFSET (8 * CONFIG_ENV_SECT_SIZE)/* 1 MiB */ #define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
@@ -143,13 +143,12 @@#define MTDIDS_DEFAULT "nand0=mxc_nand"#define MTDPARTS_DEFAULT \ "mtdparts=mxc_nand:" \ - "1m(bootloader)ro," \ - "512k(environment)," \ - "512k(redundant-environment)," \ - "4m(kernel)," \ - "128k(fdt)," \ - "8m(ramdisk)," \ - "-(filesystem)" + "1024k(u-boot)," \ + "512k(env1)," \ + "512k(env2)," \ + "14m(boot)," \ + "240m(data)," \ + "- at 2048k(UBI)"#else #define CONFIG_ENV_IS_NOWHERE #endif
Signature · 1 line
2.0.0.rc2
PATCH 6/6 ARM: m53evk: Update default environment
In reply to Marek VasutFrom: Lothar Rubusch <[email protected]>
--- include/configs/m53evk.h | 87 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-)
include/configs/m53evk.h +86 -1
@@ -165,6 +165,7 @@#define CONFIG_FEC_XCV_TYPE RMII#define CONFIG_PHYLIB #define CONFIG_PHY_MICREL +#define CONFIG_ETHPRIME "FEC0"#endif /*
@@ -240,9 +241,10 @@#define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTDELAY 3 -#define CONFIG_BOOTFILE "m53evk/uImage" +#define CONFIG_BOOTFILE "fitImage"#define CONFIG_BOOTARGS "console=ttymxc1,115200"#define CONFIG_LOADADDR 0x70800000 +#define CONFIG_BOOTCOMMAND "run mmc_mmc"#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR#define CONFIG_OF_LIBFDT
@@ -269,4 +271,87 @@#define CONFIG_SYS_NAND_SIZE (256 * 1024 * 1024)#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 +/* +* Extra Environments +*/ +#define CONFIG_PREBOOT "run try_bootscript" +#define CONFIG_HOSTNAME m53evk + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "consdev=ttymxc1\0" \ + "baudrate=115200\0" \ + "bootscript=boot.scr\0" \ + "bootdev=/dev/mmcblk0p1\0" \ + "rootdev=/dev/mmcblk0p2\0" \ + "netdev=eth0\0" \ + "rootpath=/opt/eldk-5.5/armv7a-hf/rootfs-qte-sdk\0" \ + "kernel_addr_r=0x72000000\0" \ + "addcons=" \ + "setenv bootargs ${bootargs} " \ + "console=${consdev},${baudrate}\0" \ + "addip=" \ + "setenv bootargs ${bootargs} " \ + "ip=${ipaddr}:${serverip}:${gatewayip}:" \ + "${netmask}:${hostname}:${netdev}:off\0" \ + "addmisc=" \ + "setenv bootargs ${bootargs} ${miscargs}\0" \ + "adddfltmtd=" \ + "if test \"x${mtdparts}\" == \"x\" ; then " \ + "mtdparts default ; " \ + "fi\0" \ + "addmtd=" \ + "run adddfltmtd ; " \ + "setenv bootargs ${bootargs} ${mtdparts}\0" \ + "addargs=run addcons addmtd addmisc\0" \ + "mmcload=" \ + "mmc rescan ; " \ + "ext4load mmc 0:1 ${kernel_addr_r} ${bootfile}\0" \ + "ubiload=" \ + "ubi part UBI ; ubifsmount ubi0:rootfs ; " \ + "ubifsload ${kernel_addr_r} /boot/${bootfile}\0" \ + "netload=" \ + "tftp ${kernel_addr_r} ${hostname}/${bootfile}\0" \ + "miscargs=nohlt panic=1\0" \ + "mmcargs=setenv bootargs root=${rootdev} rw rootwait\0" \ + "ubiargs=" \ + "setenv bootargs ubi.mtd=5 " \ + "root=ubi0:rootfs rootfstype=ubifs\0" \ + "nfsargs=" \ + "setenv bootargs root=/dev/nfs rw " \ + "nfsroot=${serverip}:${rootpath},v3,tcp\0" \ + "mmc_mmc=" \ + "run mmcload mmcargs addargs ; " \ + "bootm ${kernel_addr_r}\0" \ + "mmc_ubi=" \ + "run mmcload ubiargs addargs ; " \ + "bootm ${kernel_addr_r}\0" \ + "mmc_nfs=" \ + "run mmcload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r}\0" \ + "ubi_mmc=" \ + "run ubiload mmcargs addargs ; " \ + "bootm ${kernel_addr_r}\0" \ + "ubi_ubi=" \ + "run ubiload ubiargs addargs ; " \ + "bootm ${kernel_addr_r}\0" \ + "ubi_nfs=" \ + "run ubiload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r}\0" \ + "net_mmc=" \ + "run netload mmcargs addargs ; " \ + "bootm ${kernel_addr_r}\0" \ + "net_ubi=" \ + "run netload ubiargs addargs ; " \ + "bootm ${kernel_addr_r}\0" \ + "net_nfs=" \ + "run netload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r}\0" \ + "try_bootscript=" \ + "mmc rescan;" \ + "if ext4load mmc 0:1 ${kernel_addr_r} ${bootscript};" \ + "then;" \ + "\techo Running bootscript...;" \ + "\tsource ${kernel_addr_r};" \ + "fi\0" +#endif /* __M53EVK_CONFIG_H__ */
Signature · 1 line
2.0.0.rc2