OMAP3: omap3_logic: Remove display parameter
[platform/kernel/u-boot.git] / include / configs / omap3_logic.h
index a153928..b38811e 100644 (file)
 
 #define CONFIG_NR_DRAM_BANKS   2       /* CS1 may or may not be populated */
 
-/*
- * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
- * 64 bytes before this address should be set aside for u-boot.img's
- * header. That is 0x800FFFC0--0x80100000 should not be used for any
- * other needs.  We use this rather than the inherited defines from
- * ti_armv7_common.h for backwards compatibility.
- */
-#define CONFIG_SYS_TEXT_BASE           0x80100000
-#define CONFIG_SPL_BSS_START_ADDR      0x80000000
-#define CONFIG_SPL_BSS_MAX_SIZE                (512 << 10)     /* 512 KB */
-#define CONFIG_SYS_SPL_MALLOC_START    0x80208000
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000
-
 #include <configs/ti_omap3_common.h>
 
-/* Display CPU and Board information */
-
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
+/*
+ * We are only ever GP parts and will utilize all of the "downloaded image"
+ * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB) in
+ * order to allow for BCH8 to fit in.
+ */
+#undef CONFIG_SPL_TEXT_BASE
+#define CONFIG_SPL_TEXT_BASE           0x40200000
 
+#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MISC_INIT_R             /* misc_init_r dumps the die id */
 #define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 #define CONFIG_CMDLINE_EDITING         /* cmd line edit/history */
-#define CONFIG_ZERO_BOOTDELAY_CHECK    /* check keypress w/no delay */
 
 /* Hardware drivers */
 
 
 /* commands to include */
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_NAND_LOCK_UNLOCK    /* nand (un)lock commands       */
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-
-#define CONFIG_YAFFS2
 
 /* I2C */
 #define CONFIG_SYS_I2C_OMAP34XX
 #define CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID
 
 /* USB */
-#define CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_MUSB_OMAP2PLUS
 #define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_VBUS_DRAW    0
-#define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_G_DNL_VENDOR_NUM                0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM       0xd022
-#define CONFIG_G_DNL_MANUFACTURER      "TI"
 #define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
 #define CONFIG_ANDROID_BOOT_IMAGE
 #define CONFIG_FASTBOOT_BUF_ADDR       CONFIG_SYS_LOAD_ADDR
 #define CONFIG_FASTBOOT_BUF_SIZE       0x07000000
-#define CONFIG_SYS_CACHELINE_SIZE      64
 
 /* TWL4030 */
 #define CONFIG_TWL4030_PWM
 #ifdef CONFIG_NAND
 #define CONFIG_NAND_OMAP_GPMC
 
-#define CONFIG_CMD_UBI                 /* UBI-formated MTD partition support */
 #define CONFIG_CMD_UBIFS               /* Read-only UBI volume operations */
 #define CONFIG_RBTREE                  /* required by CONFIG_CMD_UBI */
 #define CONFIG_LZO                     /* required by CONFIG_CMD_UBIFS */
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS          /* required for UBI partition support */
 #define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:512k(MLO),"\
-                                       "1920k(u-boot),128k(u-boot-env),"\
-                                       "4m(kernel),-(fs)"
+#define MTDPARTS_DEFAULT       "mtdparts=omap2-nand.0:"\
+                                                       "512k(MLO),"\
+                                                       "1792k(u-boot),"\
+                                                       "128k(spl-os)," \
+                                                       "128k(u-boot-env),"\
+                                                       "6m(kernel),-(fs)"
 #endif
 
 /* Environment information */
 
-/*
- * PREBOOT assumes the 4.3" display is attached.  User can interrupt
- * and modify display variable to suit their needs.
- */
 #define CONFIG_PREBOOT \
-       "echo ======================NOTICE============================;"\
-       "echo \"The u-boot environment is not set.\";"                  \
-       "echo \"If using a display a valid display varible for your panel\";" \
-       "echo \"needs to be set.\";"                                    \
-       "echo \"Valid display options are:\";"                          \
-       "echo \"  2 == LQ121S1DG31     TFT SVGA    (12.1)  Sharp\";"    \
-       "echo \"  3 == LQ036Q1DA01     TFT QVGA    (3.6)   Sharp w/ASIC\";" \
-       "echo \"  5 == LQ064D343       TFT VGA     (6.4)   Sharp\";"    \
-       "echo \"  7 == LQ10D368        TFT VGA     (10.4)  Sharp\";"    \
-       "echo \" 15 == LQ043T1DG01     TFT WQVGA   (4.3)   Sharp (DEFAULT)\";" \
-       "echo \" vga[-dvi or -hdmi]    LCD VGA     640x480\";"          \
-       "echo \" svga[-dvi or -hdmi]   LCD SVGA    800x600\";"          \
-       "echo \" xga[-dvi or -hdmi]    LCD XGA     1024x768\";"         \
-       "echo \" 720p[-dvi or -hdmi]   LCD 720P    1280x720\";"         \
-       "echo \"Defaulting to 4.3 LCD panel (display=15).\";"           \
-       "setenv display 15;"                                            \
        "setenv preboot;"                                               \
        "nand unlock;"                                                  \
        "saveenv;"
        "mmcdev=0\0" \
        "mmcroot=/dev/mmcblk0p2 rw\0" \
        "mmcrootfstype=ext4 rootwait\0" \
+       "nandroot=ubi0:rootfs rw ubi.mtd=fs noinitrd\0" \
+       "nandrootfstype=ubifs rootwait\0" \
        "autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \
                        "if run loadbootscript; then " \
                                "run bootscript; " \
                "else run defaultboot; fi\0" \
        "defaultboot=run mmcramboot\0" \
        "consoledevice=ttyO0\0" \
-       "display=15\0" \
        "setconsole=setenv console ${consoledevice},${baudrate}n8\0" \
        "dump_bootargs=echo 'Bootargs: '; echo $bootargs\0" \
        "rotation=0\0" \
                "fi\0" \
        "optargs=ignore_loglevel early_printk no_console_suspend\0" \
        "addmtdparts=setenv bootargs ${bootargs} ${mtdparts}\0" \
-       "common_bootargs=setenv bootargs ${bootargs} display=${display} " \
+       "common_bootargs=setenv bootargs ${bootargs} " \
                "${optargs};" \
                "run addmtdparts; " \
                "run vrfb_arg\0" \
                "${optargs} " \
                "root=${mmcroot} " \
                "rootfstype=${mmcrootfstype}\0" \
+       "nandargs=run setconsole; setenv bootargs console=${console} " \
+               "${optargs} " \
+               "root=${nandroot} " \
+               "rootfstype=${nandrootfstype}\0" \
+       "nfsargs=run setconsole; setenv serverip ${tftpserver}; " \
+               "setenv bootargs console=${console} root=/dev/nfs " \
+               "nfsroot=${nfsrootpath} " \
+               "ip=${ipaddr}:${tftpserver}:${gatewayip}:${netmask}::eth0:off\0" \
+       "nfsrootpath=/opt/nfs-exports/omap\0" \
+       "autoload=no\0" \
        "fdtaddr=0x86000000\0" \
        "loadfdtimage=mmc rescan; " \
                "fatload mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \
                "run loadzimage; " \
                "run loadramdisk; " \
                "run loadfdtimage; " \
-               "bootz ${loadaddr} ${ramdiskaddr} ${fdtaddr}\0; " \
+               "bootz ${loadaddr} ${ramdiskaddr} ${fdtaddr};\0" \
        "tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \
                "run ramargs; " \
                "run common_bootargs; " \
                "run dump_bootargs; " \
-               "tftpboot ${loadaddr} ${uimage}; " \
+               "tftpboot ${loadaddr} ${zimage}; " \
                "tftpboot ${ramdiskaddr} ${ramdiskimage}; " \
-               "bootm ${loadaddr} ${ramdiskaddr}\0"
+               "bootm ${loadaddr} ${ramdiskaddr}\0" \
+       "tftpbootz=echo 'Booting kernel NFS rootfs...'; " \
+               "dhcp;" \
+               "run nfsargs;" \
+               "run common_bootargs;" \
+               "run dump_bootargs;" \
+               "tftpboot $loadaddr zImage;" \
+               "bootz $loadaddr\0"
 
 #define CONFIG_BOOTCOMMAND \
        "run autoboot"
 /* **** PISMO SUPPORT *** */
 #if defined(CONFIG_CMD_NAND)
 #define CONFIG_SYS_FLASH_BASE          NAND_BASE
-#elif defined(CONFIG_CMD_ONENAND)
-#define CONFIG_SYS_FLASH_BASE          ONENAND_MAP
 #endif
 
 /* Monitor at start of flash */
 
 #define CONFIG_ENV_IS_IN_NAND          1
 #define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-#define ONENAND_ENV_OFFSET             0x260000 /* environment starts here */
 #define SMNAND_ENV_OFFSET              0x260000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
 #define CONFIG_ENV_OFFSET              SMNAND_ENV_OFFSET
 #define CONFIG_ENV_ADDR                        SMNAND_ENV_OFFSET
 
-
 /* SMSC922x Ethernet */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_SMC911X