X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Fconfigs%2Ftx53.h;h=1e03ed719c7b391252221ff0850b1202e40260a3;hb=f029fa8f4eaf0c29d4e96ffe46cb91a4892b9fe0;hp=43471917e1c0b9004ba39f06d16c805f5be43a04;hpb=a49f34cfea52739488cd6b4d267f18382cd01926;p=karo-tx-uboot.git diff --git a/include/configs/tx53.h b/include/configs/tx53.h index 43471917e1..1e03ed719c 100644 --- a/include/configs/tx53.h +++ b/include/configs/tx53.h @@ -8,15 +8,12 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 /* must be set before including imx-regs.h */ - -#include +#include #include /* * Ka-Ro TX53 board - SoC configuration */ -#define CONFIG_TX53 /* TX53 SoM */ #define CONFIG_SYS_MX5_IOMUX_V3 #define CONFIG_MXC_GPIO /* GPIO control */ #define CONFIG_SYS_MX5_HCLK 24000000 @@ -26,37 +23,32 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_SYS_GENERIC_BOARD /* LCD Logo and Splash screen support */ -#define CONFIG_LCD #ifdef CONFIG_LCD #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_IPUV3 #define CONFIG_IPUV3_CLK 200000000 #define CONFIG_LCD_LOGO -#define LCD_BPP LCD_COLOR24 +#define LCD_BPP LCD_COLOR32 #define CONFIG_CMD_BMP #define CONFIG_VIDEO_BMP_RLE8 #endif /* CONFIG_LCD */ -#ifdef CONFIG_SYS_LVDS_IF -#define is_lvds() 1 -#else -#define is_lvds() 0 -#endif - /* * Memory configuration options */ +#ifndef CONFIG_SYS_SDRAM_SIZE +#define CONFIG_SYS_SDRAM_SIZE (SZ_512M * CONFIG_NR_DRAM_BANKS) +#endif + #define PHYS_SDRAM_1 0x70000000 /* Base address of bank 1 */ -#define PHYS_SDRAM_1_SIZE SZ_512M +#define PHYS_SDRAM_1_SIZE (CONFIG_SYS_SDRAM_SIZE / CONFIG_NR_DRAM_BANKS) #if CONFIG_NR_DRAM_BANKS > 1 #define PHYS_SDRAM_2 0xb0000000 /* Base address of bank 2 */ -#define PHYS_SDRAM_2_SIZE SZ_512M -#define TX53_MOD_SUFFIX "1" -#else -#define TX53_MOD_SUFFIX "0" +#define PHYS_SDRAM_2_SIZE PHYS_SDRAM_1_SIZE #endif #define CONFIG_STACKSIZE SZ_128K #define CONFIG_SYS_MALLOC_LEN SZ_8M @@ -73,7 +65,7 @@ #define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) /* Print buffer size */ -#define CONFIG_SYS_MAXARGS 64 /* Max number of command args */ +#define CONFIG_SYS_MAXARGS 256 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ #define CONFIG_VERSION_VARIABLE /* U-BOOT version */ @@ -81,16 +73,10 @@ #define CONFIG_CMDLINE_EDITING /* Command history etc */ #define CONFIG_SYS_64BIT_VSPRINTF -#define CONFIG_SYS_NO_FLASH /* * Flattened Device Tree (FDT) support */ -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_DEFAULT_DEVICE_TREE tx53 -#define CONFIG_ARCH_DEVICE_TREE mx53 -#define CONFIG_SYS_FDT_ADDR (PHYS_SDRAM_1 + SZ_16M) /* * Boot Linux @@ -109,9 +95,15 @@ #define CONFIG_BOOTARGS "init=/linuxrc console=ttymxc0,115200 ro debug panic=1" #define CONFIG_BOOTCOMMAND "run bootcmd_${boot_mode} bootm_cmd" #define CONFIG_LOADADDR 78000000 +#define CONFIG_FDTADDR 71000000 #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 -#define CONFIG_HW_WATCHDOG +#ifndef CONFIG_SYS_LVDS_IF +#define DEFAULT_VIDEO_MODE "VGA" +#else +#define DEFAULT_VIDEO_MODE "HSD100PXN1" +#endif /* * Extra Environment Settings @@ -141,32 +133,18 @@ "cpu_clk=800\0" \ "default_bootargs=set bootargs " CONFIG_BOOTARGS \ " ${append_bootargs}\0" \ - "fdtaddr=71000000\0" \ - "fdtsave=nand erase.part dtb" \ + "fdtaddr=" xstr(CONFIG_FDTADDR) "\0" \ + "fdtsave=fdt resize;nand erase.part dtb" \ ";nand write ${fdtaddr} dtb ${fdtsize}\0" \ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ "nfsroot=/tftpboot/rootfs\0" \ "otg_mode=device\0" \ "touchpanel=tsc2007\0" \ - "video_mode=VGA\0" + "video_mode=" DEFAULT_VIDEO_MODE "\0" #define MTD_NAME "mxc_nand" #define MTDIDS_DEFAULT "nand0=" MTD_NAME -#define CONFIG_FDT_FIXUP_PARTITIONS - -/* - * U-Boot Commands - */ -#include -#define CONFIG_CMD_CACHE -#define CONFIG_CMD_MMC -#define CONFIG_CMD_NAND -#define CONFIG_CMD_MTDPARTS -#define CONFIG_CMD_BOOTCE -#define CONFIG_CMD_TIME -#define CONFIG_CMD_I2C -#define CONFIG_CMD_MEMTEST /* * Serial Driver @@ -185,32 +163,18 @@ /* * Ethernet Driver */ -#define CONFIG_FEC_MXC #ifdef CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB -#define CONFIG_PHY_SMSC -#define CONFIG_MII #define CONFIG_FEC_XCV_TYPE MII100 -#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#define CONFIG_CMD_MII -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -/* Add for working with "strict" DHCP server */ -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS #endif /* * I2C Configs */ #ifdef CONFIG_CMD_I2C -#define CONFIG_HARD_I2C #define CONFIG_I2C_MXC #define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR -#define CONFIG_SYS_I2C_MX6_PORT1 #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SLAVE 0x34 #endif @@ -219,17 +183,12 @@ * NAND flash driver */ #ifdef CONFIG_CMD_NAND -#define CONFIG_MTD_DEVICE -#define CONFIG_ENV_IS_IN_NAND -#define CONFIG_NAND_MXC #define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI #define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CONFIG_MXC_NAND_HWECC -#define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_SYS_NAND_MAX_CHIPS 1 -#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#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_USE_FLASH_BBT #ifdef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OFFSET CONFIG_U_BOOT_IMG_SIZE @@ -237,24 +196,16 @@ #define CONFIG_ENV_RANGE 0x60000 #endif #define CONFIG_SYS_NAND_BASE 0x00000000 -#define CONFIG_CMD_ROMUPDATE #endif /* CONFIG_CMD_NAND */ /* * MMC Driver */ -#ifdef CONFIG_CMD_MMC -#ifndef CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_IS_IN_MMC -#endif -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_FAT +#define CONFIG_FAT_WRITE #define CONFIG_CMD_EXT2 /* @@ -276,12 +227,12 @@ xstr(CONFIG_ENV_RANGE) \ "(env)," \ xstr(CONFIG_ENV_RANGE) \ - "(env2),4m(linux),16m(rootfs),108032k(userfs),256k(dtb),512k@0x7f80000(bbt)ro" + "(env2),6m(linux),32m(rootfs),89344k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro" #else #define MTDPARTS_DEFAULT "mtdparts=" MTD_NAME ":" \ "1m(u-boot)," \ xstr(CONFIG_ENV_RANGE) \ - "(env),4m(linux),16m(rootfs),108416k(userfs),256k(dtb),512k@0x7f80000(bbt)ro" + "(env),6m(linux),32m(rootfs),89728k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro" #endif #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1