X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fm53evk.h;h=781a1623ddebd95a556e0cb171e94a7e10d335eb;hb=2290fe06421720d1c54523a9acf1052181bc6e87;hp=97196c6031096be0c24d998523a0a3bda8d4c594;hpb=22692ec0fbdb455ca16d4d0e27768c6b6deb4243;p=u-boot diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 97196c6031..781a1623dd 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -9,7 +9,6 @@ #define __M53EVK_CONFIG_H__ #define CONFIG_MX53 -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_MXC_GPIO #include @@ -18,40 +17,24 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_REVISION_TAG #define CONFIG_SYS_NO_FLASH - -#define CONFIG_FIT +#define CONFIG_SYS_FSL_CLK #define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* * U-Boot Commands */ -#include #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_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 #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET -#define CONFIG_CMD_PING +#define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_CMD_SATA -#define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_USB #define CONFIG_VIDEO -#define CONFIG_REGEX /* Enable regular expression support */ - /* * Memory configurations */ @@ -90,7 +73,6 @@ #define CONFIG_VERSION_VARIABLE /* U-BOOT version */ #define CONFIG_AUTO_COMPLETE /* Command auto complete */ #define CONFIG_CMDLINE_EDITING /* Command history etc */ -#define CONFIG_SYS_HUSH_PARSER /* * Serial Driver @@ -175,7 +157,10 @@ #ifdef CONFIG_CMD_I2C #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC -#define CONFIG_SYS_SPD_BUS_NUM 1 /* I2C2 */ +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ +#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ +#define CONFIG_SYS_RTC_BUS_NUM 1 /* I2C2 */ #endif /* @@ -241,18 +226,15 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_BOOTDELAY 3 #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 /* * NAND SPL */ -#define CONFIG_SPL #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TARGET "u-boot-with-nand-spl.imx" #define CONFIG_SPL_BOARD_INIT @@ -306,7 +288,7 @@ "addargs=run addcons addmtd addmisc\0" \ "mmcload=" \ "mmc rescan ; " \ - "ext4load mmc 0:1 ${kernel_addr_r} ${bootfile}\0" \ + "load mmc 0:1 ${kernel_addr_r} ${bootfile}\0" \ "ubiload=" \ "ubi part UBI ; ubifsmount ubi0:rootfs ; " \ "ubifsload ${kernel_addr_r} /boot/${bootfile}\0" \ @@ -349,10 +331,12 @@ "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};" \ + "if test -e mmc 0:1 ${bootscript} ; then " \ + "if load mmc 0:1 ${kernel_addr_r} ${bootscript};" \ + "then ; " \ + "echo Running bootscript... ; " \ + "source ${kernel_addr_r} ; " \ + "fi ; " \ "fi\0" #endif /* __M53EVK_CONFIG_H__ */