]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - include/configs/tx48.h
kconfig: add Kconfig option for LCD
[karo-tx-uboot.git] / include / configs / tx48.h
index 63aa8268ed5380e926ca76870da3864c5c3ca28b..1e7f6af863a559732b2e0f1a89542debfdc5e3e3 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * tx48.h
  *
- * Copyright (C) 2012 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright (C) 2012-2014 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * based on: am335x_evm
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_OMAP
-#define CONFIG_AM33XX
+#define CONFIG_AM33XX                  /* must be set before including omap.h */
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/omap.h>
 
 /*
  * Ka-Ro TX48 board - SoC configuration
  */
+#define CONFIG_OMAP
 #define CONFIG_AM33XX_GPIO
-#define CONFIG_SYS_HZ                  1000            /* Ticks per second */
+#define CONFIG_SYS_HZ                  1000    /* Ticks per second */
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_LATE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 /* LCD Logo and Splash screen support */
-#define CONFIG_LCD
 #ifdef CONFIG_LCD
+#define CONFIG_VIDEO_DA8XX
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
-#define CONFIG_VIDEO_DA8XX
+#define CONFIG_AM335X_LCD
 #define DAVINCI_LCD_CNTL_BASE          0x4830e000
 #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 */
@@ -54,7 +55,7 @@
  * Memory configuration options
  */
 #define CONFIG_SYS_SDRAM_DDR3
-#define CONFIG_NR_DRAM_BANKS           1               /*  1 bank of SDRAM */
+#define CONFIG_NR_DRAM_BANKS           0x1             /* '1' would be converted to 'y' by define2mk.sed */
 #define PHYS_SDRAM_1                   0x80000000      /* SDRAM Bank #1 */
 #define CONFIG_MAX_RAM_BANK_SIZE       SZ_1G
 
  */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT              "TX48 U-Boot > "
-#define CONFIG_SYS_CBSIZE              2048            /* Console I/O buffer size */
+#define CONFIG_SYS_CBSIZE              2048    /* Console I/O buffer size */
 #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 */
 #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
-#ifdef CONFIG_OF_LIBFDT /* set via cmdline parameter thru boards.cfg */
-#define CONFIG_FDT_FIXUP_PARTITIONS
-#define CONFIG_OF_BOARD_SETUP
-#define CONFIG_MACH_TYPE               (-1)
-#define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
-#else
-#ifndef MACH_TYPE_TIAM335EVM
-#define MACH_TYPE_TIAM335EVM           3589     /* Until the next sync */
-#endif
-#define CONFIG_MACH_TYPE               MACH_TYPE_TIAM335EVM
-#endif
 
 /*
  * Boot Linux
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_SYS_AUTOLOAD            "no"
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_BOOTARGS                        "console=ttyO0,115200 ro debug panic=1"
-#define CONFIG_BOOTCOMMAND             "run bootcmd_nand"
+#define CONFIG_BOOTARGS                        "init=/linuxrc console=ttyO0,115200 ro debug panic=1"
+#define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        83000000
+#define CONFIG_FDTADDR                 81000000
 #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
 
 /*
- * Extra Environments
+ * Extra Environment Settings
  */
-#ifdef CONFIG_OF_LIBFDT
-#define TX48_BOOTM_CMD                                                 \
-       "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"
-#define TX48_MTDPARTS_CMD ""
-#else
-#define TX48_BOOTM_CMD                                                 \
-       "bootm_cmd=bootm\0"
-#define TX48_MTDPARTS_CMD " ${mtdparts}"
-#endif
+#define CONFIG_SYS_CPU_CLK_STR         xstr(CONFIG_SYS_MPU_CLK)
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
+       "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"  \
+       " root=/dev/mtdblock4 rootfstype=jffs2\0"                       \
        "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
        " root=/dev/mmcblk0p2 rootwait\0"                               \
-       "bootargs_nand=run default_bootargs;set bootargs ${bootargs}"   \
-       " root=/dev/mtdblock4 rootfstype=jffs2\0"                       \
-       "nfsroot=/tftpboot/rootfs\0"                                    \
        "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\
-       "bootcmd_mmc=set autostart no;run bootargs_mmc;"                \
-       " fatload mmc 0 ${loadaddr} uImage;run bootm_cmd\0"             \
-       "bootcmd_nand=set autostart no;run bootargs_nand;"              \
-       " nboot linux;run bootm_cmd\0"                                  \
-       "bootcmd_net=set autostart no;run bootargs_nfs;dhcp;"           \
-       " run bootm_cmd\0"                                              \
-       TX48_BOOTM_CMD                                                  \
+       " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
+       " ip=dhcp\0"                                                    \
+       "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"  \
+       " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
+       "bootcmd_jffs2=set autostart no;run bootargs_jffs2"             \
+       ";nboot linux\0"                                                \
+       "bootcmd_mmc=set 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"   \
+       ";dhcp\0"                                                       \
+       "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
+       "boot_mode=nand\0"                                              \
+       "cpu_clk=" CONFIG_SYS_CPU_CLK_STR "\0"                          \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
-       TX48_MTDPARTS_CMD                                               \
-       " ${append_bootargs}\0"                 \
-       "cpu_clk=" xstr(CONFIG_SYS_MPU_CLK) "\0"                        \
-       "fdtaddr=81000000\0"                                            \
-       "fdtsave=nand erase.part dtb;nand write ${fdtaddr} dtb ${fdtsize}\0" \
+       " ${append_bootargs}\0"                                         \
+       "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"
  * U-Boot Commands
  */
 #include <config_cmd_default.h>
-#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_MEMTEST
 
 /*
  * Serial Driver
  */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_DRIVER_TI_CPSW
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_GIGE
-#define CONFIG_PHY_SMSC
-#define CONFIG_PHYLIB
-#define CONFIG_MII
 #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
 /*
  * NAND flash driver
  */
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_MTD_DEVICE
-#define CONFIG_ENV_IS_IN_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_NAND_OMAP_GPMC
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_GPMC_PREFETCH_ENABLE
 #define CONFIG_SYS_NAND_OOBSIZE                64
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       14
-#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_SYS_NAND_MAX_CHIPS      1
+#define CONFIG_SYS_NAND_MAX_CHIPS      0x1
 #define CONFIG_SYS_NAND_MAXBAD         20 /* Max. number of bad blocks guaranteed by manufacturer */
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#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 + CONFIG_SYS_NAND_U_BOOT_OFFS)
  * 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_OMAP_HSMMC
 #define CONFIG_OMAP_MMC_DEV_1
 
-#define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
+#define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2
 
 /*
 #endif /* CONFIG_ENV_IS_IN_MMC */
 #endif /* CONFIG_CMD_MMC */
 
+#ifdef CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_SIZE                        SZ_4K
+#endif
+
 #ifdef CONFIG_ENV_OFFSET_REDUND
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "128k(u-boot-spl),"                                             \
        xstr(CONFIG_ENV_RANGE)                                          \
        "(env),"                                                        \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env2),4m(linux),16m(rootfs),107904k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env2),6m(linux),32m(rootfs),89216k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #else
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "128k(u-boot-spl),"                                             \
        "1m(u-boot),"                                                   \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),4m(linux),16m(rootfs),108288k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env),6m(linux),32m(rootfs),89600k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 
 /* Defines for SPL */
-#define CONFIG_SPL
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_GPIO_SUPPORT