X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=include%2Fconfigs%2Ftx28.h;h=f7877dfccb0ac5d2da98e39a10cf03f5518915ad;hp=c7e54471acca9d4da89716b96fd183cb2df4211c;hb=3a926a304b9f7a74dbe67ae7dc4cb6c7a174c6c0;hpb=e0bbf95696eb163298aa8fe6449e0ae5955a7637 diff --git a/include/configs/tx28.h b/include/configs/tx28.h index c7e54471ac..f7877dfccb 100644 --- a/include/configs/tx28.h +++ b/include/configs/tx28.h @@ -8,8 +8,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX28 /* must be defined before including regs-base.h */ - +#include #include #include @@ -18,7 +17,7 @@ */ #define CONFIG_MXS_GPIO /* GPIO control */ #define CONFIG_SYS_HZ 1000 /* Ticks per second */ -#define PHYS_SDRAM_1_SIZE CONFIG_SDRAM_SIZE +#define PHYS_SDRAM_1_SIZE CONFIG_SYS_SDRAM_SIZE #ifdef CONFIG_TX28_S #define TX28_MOD_SUFFIX "1" #else @@ -64,7 +63,6 @@ * U-Boot general configurations */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_PROMPT "TX28 U-Boot > " #define CONFIG_SYS_CBSIZE 2048 /* Console I/O buffer size */ #define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) @@ -105,7 +103,7 @@ #else #define CONFIG_LOADADDR 43000000 #endif -#define CONFIG_FDTADDR 41000000 +#define CONFIG_FDTADDR 40800000 #define CONFIG_SYS_LOAD_ADDR _pfx(0x, CONFIG_LOADADDR) #define CONFIG_SYS_FDT_ADDR _pfx(0x, CONFIG_FDTADDR) #define CONFIG_U_BOOT_IMG_SIZE SZ_1M @@ -113,36 +111,42 @@ /* * Extra Environment Settings */ -#ifdef CONFIG_ENV_IS_NOWHERE +#ifdef CONFIG_TX28_UBOOT_NOENV #define CONFIG_EXTRA_ENV_SETTINGS \ "autostart=no\0" \ "autoload=no\0" \ + "baseboard=stk5-v3\0" \ "bootdelay=-1\0" \ + "fdtaddr=" xstr(CONFIG_FDTADDR) "\0" \ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" #else #define CONFIG_EXTRA_ENV_SETTINGS \ "autostart=no\0" \ "baseboard=stk5-v3\0" \ - "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}" \ + "bootargs_jffs2=run default_bootargs" \ + ";setenv bootargs ${bootargs}" \ " root=/dev/mtdblock3 rootfstype=jffs2\0" \ - "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}" \ + "bootargs_mmc=run default_bootargs;setenv bootargs ${bootargs}" \ " root=/dev/mmcblk0p3 rootwait\0" \ - "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}" \ + "bootargs_nfs=run default_bootargs;setenv bootargs ${bootargs}" \ " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock" \ " ip=dhcp\0" \ - "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}" \ + "bootargs_ubifs=run default_bootargs" \ + ";setenv bootargs ${bootargs}" \ " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \ - "bootcmd_jffs2=set autostart no;run bootargs_jffs2" \ + "bootcmd_jffs2=setenv autostart no;run bootargs_jffs2" \ ";nboot linux\0" \ - "bootcmd_mmc=set autostart no;run bootargs_mmc" \ + "bootcmd_mmc=setenv autostart no;run bootargs_mmc" \ ";fatload mmc 0 ${loadaddr} uImage\0" \ - "bootcmd_nand=set autostart no;run bootargs_ubifs;nboot linux\0"\ - "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs" \ + "bootcmd_nand=setenv autostart no;run bootargs_ubifs" \ + ";nboot linux\0" \ + "bootcmd_net=setenv autoload y;setenv autostart n" \ + ";run bootargs_nfs" \ ";dhcp\0" \ "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0" \ "boot_mode=nand\0" \ - "default_bootargs=set bootargs " CONFIG_BOOTARGS \ + "default_bootargs=setenv bootargs " CONFIG_BOOTARGS \ " ${append_bootargs}\0" \ "fdtaddr=" xstr(CONFIG_FDTADDR) "\0" \ "fdtsave=fdt resize;nand erase.part dtb" \ @@ -158,11 +162,6 @@ #define MTD_NAME "gpmi-nand" #define MTDIDS_DEFAULT "nand0=" MTD_NAME -/* - * U-Boot Commands - */ -#include - /* * Serial Driver */ @@ -184,42 +183,25 @@ #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH #define CONFIG_SYS_CACHELINE_SIZE 32 -#ifdef CONFIG_FEC_MXC_PHYADDR +#ifdef CONFIG_TX28_S +#define CONFIG_FEC_MXC_PHYADDR 0 #define IMX_FEC_BASE MXS_ENET0_BASE #endif #define CONFIG_FEC_XCV_TYPE RMII -#define CONFIG_CMD_MII -/* Add for working with "strict" DHCP server */ -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS -#define CONFIG_BOOTP_RANDOM_ID #endif -#ifndef CONFIG_ENV_IS_NOWHERE -/* define one of the following options: -*/ -#endif -#define CONFIG_ENV_OVERWRITE - /* * NAND flash driver */ #ifdef CONFIG_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE SZ_128K -#define CONFIG_NAND_MXS -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 #define CONFIG_SYS_NAND_U_BOOT_OFFS CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_SYS_MXS_DMA_CHANNEL 4 #define CONFIG_SYS_NAND_MAX_CHIPS 0x1 #define CONFIG_SYS_MAX_NAND_DEVICE 0x1 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_BASE 0x00000000 -#else -#undef CONFIG_ENV_IS_IN_NAND #endif /* CONFIG_CMD_NAND */ #ifdef CONFIG_ENV_IS_IN_NAND @@ -243,33 +225,25 @@ /* * MMC Driver */ +#ifdef CONFIG_MXS_MMC #ifdef CONFIG_CMD_MMC -#define CONFIG_MXS_MMC -#define CONFIG_BOUNCE_BUFFER - -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_FAT #define CONFIG_FAT_WRITE #define CONFIG_CMD_EXT2 +#endif /* * Environments on MMC */ #ifdef CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_ENV_OVERWRITE /* Associated with the MMC layout defined in mmcops.c */ #define CONFIG_ENV_OFFSET SZ_1K #define CONFIG_ENV_SIZE (SZ_128K - CONFIG_ENV_OFFSET) #define CONFIG_DYNAMIC_MMC_DEVNO #endif /* CONFIG_ENV_IS_IN_MMC */ -#else -#undef CONFIG_ENV_IS_IN_MMC -#endif /* CONFIG_CMD_MMC */ - -#ifdef CONFIG_ENV_IS_NOWHERE -#undef CONFIG_ENV_SIZE -#define CONFIG_ENV_SIZE SZ_4K -#endif +#endif /* CONFIG_MXS_MMC */ #define MTDPARTS_DEFAULT "mtdparts=" MTD_NAME ":" \ "1m@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) "(u-boot)," \ @@ -290,7 +264,8 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SYS_SPL_VDDD_VAL 1500 -#define CONFIG_SYS_SPL_BATT_BO_LEVEL 2800 +#define CONFIG_SYS_SPL_BATT_BO_LEVEL 2400 +#define CONFIG_SYS_SPL_VDDA_BO_VAL 100 #define CONFIG_SYS_SPL_VDDMEM_VAL 0 /* VDDMEM is not utilized on TX28 */ -#endif /* __CONFIGS_TX28_H */ +#endif /* __CONFIG_H */