GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://www.denx.de/git/u-boot-imx

Browse source
This commit is contained in:
Tom Rini 2014-07-09 09:21:51 -04:00
commit 22692ec0fb
4 changed files with 215 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv7/mx6/clock.c
View file

@ -80,7 +80,7 @@ static u32 decode_pll(enum pll_clocks pll, u32 infreq)
div = __raw_readl(&imx_ccm->analog_pll_sys); div = __raw_readl(&imx_ccm->analog_pll_sys);
div &= BM_ANADIG_PLL_SYS_DIV_SELECT; div &= BM_ANADIG_PLL_SYS_DIV_SELECT;
return infreq * (div >> 1); return (infreq * div) >> 1;
case PLL_BUS: case PLL_BUS:
div = __raw_readl(&imx_ccm->analog_pll_528); div = __raw_readl(&imx_ccm->analog_pll_528);
div &= BM_ANADIG_PLL_528_DIV_SELECT; div &= BM_ANADIG_PLL_528_DIV_SELECT;

5
arch/arm/cpu/armv7/mx6/soc.c
View file

@ -124,10 +124,9 @@ static void clear_ldo_ramp(void)
} }
/* /*
* Set the VDDSOC * Set the PMU_REG_CORE register
* *
* Mask out the REG_CORE[22:18] bits (REG2_TRIG) and set * Set LDO_SOC/PU/ARM regulators to the specified millivolt level.
* them to the specified millivolt level.
* Possible values are from 0.725V to 1.450V in steps of * Possible values are from 0.725V to 1.450V in steps of
* 0.025V (25mV). * 0.025V (25mV).
*/ */

114
include/configs/m28evk.h
View file

@ -12,17 +12,25 @@
#define MACH_TYPE_M28EVK 3613 #define MACH_TYPE_M28EVK 3613
#define CONFIG_MACH_TYPE MACH_TYPE_M28EVK #define CONFIG_MACH_TYPE MACH_TYPE_M28EVK
#define CONFIG_FIT
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
/* U-Boot Commands */ /* U-Boot Commands */
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#define CONFIG_FAT_WRITE
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_BMP
#define CONFIG_CMD_CACHE #define CONFIG_CMD_CACHE
#define CONFIG_CMD_DATE #define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_EEPROM #define CONFIG_CMD_EEPROM
#define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
#define CONFIG_CMD_GPIO #define CONFIG_CMD_GPIO
#define CONFIG_CMD_GREPENV #define CONFIG_CMD_GREPENV
@ -56,8 +64,8 @@
#if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND) #if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_RANGE (512 * 1024) #define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_OFFSET 0x300000 #define CONFIG_ENV_OFFSET (24 * CONFIG_ENV_SECT_SIZE) /* 3 MiB */
#define CONFIG_ENV_OFFSET_REDUND \ #define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
@ -71,13 +79,12 @@
#define MTDIDS_DEFAULT "nand0=gpmi-nand" #define MTDIDS_DEFAULT "nand0=gpmi-nand"
#define MTDPARTS_DEFAULT \ #define MTDPARTS_DEFAULT \
"mtdparts=gpmi-nand:" \ "mtdparts=gpmi-nand:" \
"3m(bootloader)ro," \ "3m(u-boot)," \
"512k(environment)," \ "512k(env1)," \
"512k(redundant-environment)," \ "512k(env2)," \
"4m(kernel)," \ "14m(boot)," \
"128k(fdt)," \ "238m(data)," \
"8m(ramdisk)," \ "-@4096k(UBI)"
"-(filesystem)"
#else #else
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#endif #endif
@ -145,19 +152,33 @@
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_GZIP #define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
#endif #endif
/* Booting Linux */ /* Booting Linux */
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "fitImage"
#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " #define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 "
#define CONFIG_BOOTCOMMAND "run bootcmd_net" #define CONFIG_BOOTCOMMAND "run mmc_mmc"
#define CONFIG_LOADADDR 0x42000000 #define CONFIG_LOADADDR 0x42000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Extra Environment */ /* Extra Environment */
#define CONFIG_PREBOOT "run try_bootscript"
#define CONFIG_HOSTNAME m28evk
#define CONFIG_EXTRA_ENV_SETTINGS \ #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_full_filename=u-boot.nand\0" \
"update_nand_firmware_filename=u-boot.sb\0" \ "update_nand_firmware_filename=u-boot.sb\0" \
"update_sd_firmware_filename=u-boot.sd\0" \ "update_sd_firmware_filename=u-boot.sd\0" \
@ -195,6 +216,73 @@
"setexpr fw_sz ${fw_sz} + 1 ; " \ "setexpr fw_sz ${fw_sz} + 1 ; " \
"mmc write ${loadaddr} 0x800 ${fw_sz} ; " \ "mmc write ${loadaddr} 0x800 ${fw_sz} ; " \
"fi ; " \ "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" "fi\0"
/* The rest of the configuration is shared */ /* The rest of the configuration is shared */

120
include/configs/m53evk.h
View file

@ -19,17 +19,26 @@
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH
#define CONFIG_FIT
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
/* /*
* U-Boot Commands * U-Boot Commands
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#define CONFIG_FAT_WRITE
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_BMP
#define CONFIG_CMD_DATE #define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
#define CONFIG_CMD_GREPENV
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
@ -37,6 +46,7 @@
#define CONFIG_CMD_NET #define CONFIG_CMD_NET
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_SATA #define CONFIG_CMD_SATA
#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_VIDEO #define CONFIG_VIDEO
@ -119,8 +129,8 @@
#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_RANGE (512 * 1024) #define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_OFFSET (8 * CONFIG_ENV_SECT_SIZE) /* 1 MiB */
#define CONFIG_ENV_OFFSET_REDUND \ #define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
@ -134,13 +144,12 @@
#define MTDIDS_DEFAULT "nand0=mxc_nand" #define MTDIDS_DEFAULT "nand0=mxc_nand"
#define MTDPARTS_DEFAULT \ #define MTDPARTS_DEFAULT \
"mtdparts=mxc_nand:" \ "mtdparts=mxc_nand:" \
"1m(bootloader)ro," \ "1024k(u-boot)," \
"512k(environment)," \ "512k(env1)," \
"512k(redundant-environment)," \ "512k(env2)," \
"4m(kernel)," \ "14m(boot)," \
"128k(fdt)," \ "240m(data)," \
"8m(ramdisk)," \ "-@2048k(UBI)"
"-(filesystem)"
#else #else
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#endif #endif
@ -157,6 +166,7 @@
#define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_XCV_TYPE RMII
#define CONFIG_PHYLIB #define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL #define CONFIG_PHY_MICREL
#define CONFIG_ETHPRIME "FEC0"
#endif #endif
/* /*
@ -214,9 +224,13 @@
#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASHIMAGE_GUARD
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
#define CONFIG_IPUV3_CLK 200000000 #define CONFIG_IPUV3_CLK 200000000
#endif #endif
@ -228,9 +242,10 @@
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "m53evk/uImage" #define CONFIG_BOOTFILE "fitImage"
#define CONFIG_BOOTARGS "console=ttymxc1,115200" #define CONFIG_BOOTARGS "console=ttymxc1,115200"
#define CONFIG_LOADADDR 0x70800000 #define CONFIG_LOADADDR 0x70800000
#define CONFIG_BOOTCOMMAND "run mmc_mmc"
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_OF_LIBFDT #define CONFIG_OF_LIBFDT
@ -257,4 +272,87 @@
#define CONFIG_SYS_NAND_SIZE (256 * 1024 * 1024) #define CONFIG_SYS_NAND_SIZE (256 * 1024 * 1024)
#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 #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__ */ #endif /* __M53EVK_CONFIG_H__ */