]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - include/configs/tseries.h
Merge branch 'tx28-update' into tx28-bugfix
[karo-tx-uboot.git] / include / configs / tseries.h
index e550afad4fa13b680500c75d2921bd319d4432a8..4265b8a4ffa2c76b4f34cdbe123a6e57a4b5d21e 100644 (file)
@@ -3,7 +3,7 @@
  *
  * specific parts for B&R T-Series Motherboard
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at> -
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> -
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:        GPL-2.0+
 
 #include <configs/bur_am335x_common.h>
 /* ------------------------------------------------------------------------- */
+#define CONFIG_AM335X_LCD
+#define CONFIG_LCD
+#define CONFIG_LCD_ROTATION
+#define CONFIG_LCD_DT_SIMPLEFB
+#define CONFIG_SYS_WHITE_ON_BLACK
+#define LCD_BPP                                LCD_COLOR32
+
+#define CONFIG_HW_WATCHDOG
+#define CONFIG_OMAP_WATCHDOG
+#define CONFIG_SPL_WATCHDOG_SUPPORT
+
+#define CONFIG_SPL_GPIO_SUPPORT
+/* Bootcount using the RTC block */
+#define CONFIG_SYS_BOOTCOUNT_ADDR      0x44E3E000
+#define CONFIG_BOOTCOUNT_LIMIT
+#define CONFIG_BOOTCOUNT_AM33XX
 /* Clock Defines */
 #define V_OSCK                         26000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
@@ -22,6 +38,8 @@
 
 /* Support both device trees and ATAGs. */
 #define CONFIG_OF_LIBFDT
+#define CONFIG_USE_FDT                 /* use fdt within board code */
+#define CONFIG_OF_BOARD_SETUP
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
@@ -79,8 +97,8 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
 #endif /* CONFIG_NAND */
 
-/* Always 128 KiB env size */
-#define CONFIG_ENV_SIZE                        (128 << 10)
+/* Always 64 KiB env size */
+#define CONFIG_ENV_SIZE                        (64 << 10)
 
 #ifdef CONFIG_NAND
 #define NANDARGS \
        "mtdparts=" MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
-               "root=${nandroot} " \
-               "rootfstype=${nandrootfstype}\0" \
-       "nandroot=ubi0:rootfs rw ubi.mtd=8,2048\0" \
-       "nandrootfstype=ubifs rootwait=1\0" \
-       "nandimgsize=0x500000\0" \
-       "nandboot=echo Booting from nand ...; " \
+               "${optargs_rot} " \
+               "root=mtd6 " \
+               "rootfstype=jffs2\0" \
+       "kernelsize=0x400000\0" \
+       "nandboot=echo booting from nand ...; " \
                "run nandargs; " \
-               "nand read ${loadaddr} kernel ${nandimgsize}; " \
-               "bootz ${loadaddr}\0"
+               "nand read ${loadaddr} kernel ${kernelsize}; " \
+               "bootz ${loadaddr} - ${dtbaddr}\0" \
+       "defboot=run nandboot\0" \
+       "bootlimit=1\0" \
+       "simplefb=1\0 " \
+       "altbootcmd=run usbscript\0"
 #else
 #define NANDARGS ""
 #endif /* CONFIG_NAND */
 
 #ifdef CONFIG_MMC
 #define MMCARGS \
-       "silent=1\0"
+"dtbdev=mmc\0" \
+"dtbpart=0:1\0" \
+"mmcroot0=setenv bootargs ${optargs_rot} ${optargs} console=${console}\0" \
+"mmcroot1=setenv bootargs ${optargs_rot} ${optargs} console=${console} " \
+       "root=/dev/mmcblk0p2 rootfstype=ext4\0" \
+"mmcboot0=echo booting Updatesystem from mmc (ext4-fs) ...; " \
+       "setenv simplefb 1; " \
+       "ext4load mmc 0:1 ${loadaddr} /${kernel}; " \
+       "ext4load mmc 0:1 ${ramaddr} /${ramdisk}; " \
+       "run mmcroot0; bootz ${loadaddr} ${ramaddr} ${dtbaddr};\0" \
+"mmcboot1=echo booting PPT-OS from mmc (ext4-fs) ...; " \
+       "setenv simplefb 0; " \
+       "ext4load mmc 0:2 ${loadaddr} /boot/${kernel}; " \
+       "run mmcroot1; bootz ${loadaddr} - ${dtbaddr};\0" \
+"defboot=ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \
+       "ext4load mmc 0:1 ${dtbaddr} /$dtb && run mmcboot0; " \
+       "run ramboot; run usbscript;\0" \
+"bootlimit=1\0" \
+"altbootcmd=run mmcboot0;\0" \
+"upduboot=dhcp; " \
+       "tftp ${loadaddr} MLO && mmc write ${loadaddr} 100 100; " \
+       "tftp ${loadaddr} u-boot.img && mmc write ${loadaddr} 300 400;\0"
 #else
 #define MMCARGS ""
 #endif /* CONFIG_MMC */
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "autoload=0\0" \
-       "loadaddr=0x80200000\0" \
-       "bootfile=zImage\0" \
-       "console=ttyO0,115200n8\0" \
-       "optargs=\0" \
-       "rootpath=/tftpboot/tseries/rootfs-small\0" \
-       "nfsopts=nolock\0" \
-       "netargs=setenv bootargs console=${console} " \
-               "${optargs} " \
-               "root=/dev/nfs " \
-               "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
-               "ip=dhcp\0" \
-       "netboot=echo Booting from network ...; " \
-               "setenv autoload no; " \
-               "dhcp; " \
-               "tftp ${loadaddr} ${bootfile}; " \
-               "run netargs; " \
-               "bootm ${loadaddr}\0" \
-       "usbupdate=echo Updating UBOOT from USB-Stick ...; " \
-               "usb start; " \
-               "fatload usb 0 0x80000000 updateubootusb.img; " \
-               "source;\0" \
-       "netupdate=echo Updating UBOOT from Network (TFTP) ...; " \
-               "setenv autoload 0; " \
-               "dhcp;" \
-               "tftp 0x80000000 updateUBOOT.img;" \
-               "source;\0" \
-       NANDARGS \
-       MMCARGS
+BUR_COMMON_ENV \
+"verify=no\0" \
+"autoload=0\0" \
+"dtb=bur-ppt-ts30.dtb\0" \
+"dtbaddr=0x80100000\0" \
+"loadaddr=0x80200000\0" \
+"ramaddr=0x80A00000\0" \
+"kernel=zImage\0" \
+"ramdisk=rootfs.cpio.uboot\0" \
+"console=ttyO0,115200n8\0" \
+"optargs=consoleblank=0 quiet panic=2\0" \
+"nfsroot=/tftpboot/tseries/rootfs-small\0" \
+"nfsopts=nolock\0" \
+"ramargs=setenv bootargs ${optargs} console=${console} root=/dev/ram0\0" \
+"netargs=setenv bootargs console=${console} " \
+       "${optargs} " \
+       "root=/dev/nfs " \
+       "nfsroot=${serverip}:${nfsroot},${nfsopts} rw " \
+       "ip=dhcp\0" \
+"netboot=echo Booting from network ...; " \
+       "dhcp; " \
+       "tftp ${loadaddr} ${kernel}; " \
+       "tftp ${dtbaddr} ${dtb}; " \
+       "run netargs; " \
+       "bootz ${loadaddr} - ${dtbaddr}\0" \
+"ramboot=echo Booting from network into RAM ...; "\
+       "if dhcp; then; " \
+       "tftp ${loadaddr} ${kernel}; " \
+       "tftp ${ramaddr} ${ramdisk}; " \
+       "if ext4load ${dtbdev} ${dtbpart} ${dtbaddr} /${dtb}; " \
+       "then; else tftp ${dtbaddr} ${dtb}; fi;" \
+       "run mmcroot0; " \
+       "bootz ${loadaddr} ${ramaddr} ${dtbaddr}; fi;\0" \
+"netupdate=echo Updating UBOOT from Network (TFTP) ...; " \
+       "setenv autoload 0; " \
+       "dhcp && tftp 0x80000000 updateUBOOT.img && source;\0" \
+NANDARGS \
+MMCARGS
 #endif /* !CONFIG_SPL_BUILD*/
 
 #define CONFIG_BOOTCOMMAND \
-       "run mmcboot1;"
-#define CONFIG_BOOTDELAY               1 /* TODO: für release auf 0 setzen */
+       "run defboot;"
+#define CONFIG_BOOTDELAY               0
 
 #ifdef CONFIG_NAND
 /*
 /* don't change OMAP_ELM, ECCSCHEME. ROM code only supports this */
 #define CONFIG_NAND_OMAP_ELM
 #define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH8_CODE_HW
-#define GPMC_NAND_ECC_LP_x16_LAYOUT    1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_BLOCK_SIZE     (128*1024)
 #define CONFIG_SYS_NAND_PAGE_SIZE      2048
 
 #define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
 #define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:" \
-                                       "128k(SPL)," \
-                                       "128k(SPL.backup1)," \
-                                       "128k(SPL.backup2)," \
-                                       "128k(SPL.backup3)," \
-                                       "512k(u-boot)," \
-                                       "128k(u-boot-spl-os)," \
+                                       "128k(MLO)," \
+                                       "128k(MLO.backup)," \
+                                       "128k(dtb)," \
                                        "128k(u-boot-env)," \
-                                       "5m(kernel),"\
-                                       "-(rootfs)"
+                                       "512k(u-boot)," \
+                                       "4m(kernel),"\
+                                       "128m(rootfs),"\
+                                       "-(user)"
+#define CONFIG_NAND_OMAP_GPMC_WSCFG    1
 #endif /* CONFIG_NAND */
 
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_MUSB_PIO_ONLY
-#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
+#define CONFIG_USB_MUSB_PIO_ONLY
+#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 /* attention! not only for gadget, enables also highspeed in hostmode */
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_MUSB_HOST
+#define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_HOST
 #define CONFIG_AM335X_USB1
 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
 
-#ifdef CONFIG_MUSB_HOST
+#ifdef CONFIG_USB_MUSB_HOST
 #define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE
-#endif /* CONFIG_MUSB_HOST */
+#endif /* CONFIG_USB_MUSB_HOST */
 
 #if defined(CONFIG_SPI_BOOT)
 /* McSPI IP block */
 #define CONFIG_OMAP3_SPI
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SF_DEFAULT_SPEED                24000000
 
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_BUS             0
-#define CONFIG_SPL_SPI_CS              0
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 #undef CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
 #elif defined(CONFIG_NAND)
-#undef CONFIG_ENV_IS_NOWHERE
+/* No NAND env support in SPL */
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_ENV_IS_NOWHERE
+#else
 #define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET              0x120000 /* TODO: Adresse definieren */
+#endif
+#define CONFIG_ENV_OFFSET              0x60000
 #define CONFIG_SYS_ENV_SECT_SIZE       CONFIG_ENV_SIZE
 #else
 #error "no storage for Environment defined!"
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
 #define CONFIG_FAT_WRITE
+#define CONFIG_FS_EXT4
+#define CONFIG_EXT4_WRITE
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FS_GENERIC
 #endif /* CONFIG_MMC, ... */