X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=include%2Fconfigs%2Ftx53.h;h=fad1b28d3af4bb41b658eb0dcfdc02fc10d24315;hp=c1357bf9799ed53a487d4db0da5b457caad1b437;hb=cce4dee35eced4de9217a21bb7a6055205d759d6;hpb=fab73707b45bdd7ab4d0ecdcf25fc674d6f13ee8 diff --git a/include/configs/tx53.h b/include/configs/tx53.h index c1357bf979..fad1b28d3a 100644 --- a/include/configs/tx53.h +++ b/include/configs/tx53.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012-2014 * * SPDX-License-Identifier: GPL-2.0 * @@ -40,28 +40,23 @@ #define CONFIG_VIDEO_BMP_RLE8 #endif /* CONFIG_LCD */ -#ifdef CONFIG_SYS_LVDS_IF -#define is_lvds() 1 -#else -#define is_lvds() 0 -#endif - /* - * Memory configurations + * 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 #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 /* Memtest start address */ -#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + SZ_4M) /* 4 MB RAM test */ +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_4M) #define CONFIG_SYS_SDRAM_CLK 400 /* @@ -73,7 +68,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 */ @@ -88,9 +83,6 @@ */ #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,12 +101,19 @@ #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 Environments + * Extra Environment Settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ "autostart=no\0" \ @@ -122,7 +121,7 @@ "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}" \ " root=/dev/mtdblock3 rootfstype=jffs2\0" \ "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}" \ - " root=/dev/mmcblk0p3 rootwait\0" \ + " root=/dev/mmcblk0p2 rootwait\0" \ "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}" \ " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock" \ " ip=dhcp\0" \ @@ -131,7 +130,7 @@ "bootcmd_jffs2=set autostart no;run bootargs_jffs2" \ ";nboot linux\0" \ "bootcmd_mmc=set autostart no;run bootargs_mmc" \ - ";mmc read ${loadaddr} 100 3000\0" \ + ";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" \ @@ -141,15 +140,15 @@ "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 @@ -173,11 +172,15 @@ */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_MXC_GPIO #define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, } #define CONFIG_SYS_CONSOLE_INFO_QUIET +/* + * GPIO driver + */ +#define CONFIG_MXC_GPIO + /* * Ethernet Driver */ @@ -222,8 +225,6 @@ #define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CONFIG_MXC_NAND_HWECC #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_SYS_MAX_FLASH_SECT 1024 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_5_ADDR_CYCLE @@ -234,14 +235,8 @@ #define CONFIG_ENV_SIZE 0x20000 /* 128 KiB */ #define CONFIG_ENV_RANGE 0x60000 #endif -#ifndef CONFIG_SYS_NO_FLASH -#define CONFIG_CMD_FLASH -#define CONFIG_SYS_NAND_BASE 0xa0000000 -#define CONFIG_FIT -#else #define CONFIG_SYS_NAND_BASE 0x00000000 #define CONFIG_CMD_ROMUPDATE -#endif #endif /* CONFIG_CMD_NAND */ /* @@ -255,10 +250,10 @@ #define CONFIG_GENERIC_MMC #define 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 /* @@ -280,12 +275,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