Tegra2: implement Warmboot code and lp0_vec

include/configs/tegra2-common.h

 /*
  *  (C) Copyright 2010
  *  NVIDIA Corporation <www.nvidia.com>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
@@ skipping 119 matching lines @@
 #include <config_cmd_default.h>
 
 /* turn on command-line edit/hist/auto */
 
 #define CONFIG_CMDLINE_EDITING          1
 #define CONFIG_COMMAND_HISTORY          1
 #define CONFIG_AUTOCOMPLETE                     1
 
 #define TEGRAPARTS_DEFAULT              "system:3680:2bc0:800"
 #define TEGRABOOT_DEFAULT               "nand"
+
 #undef CONFIG_YAFFS2                    /* YAFFS2 Support               */
 #define CONFIG_YAFFS2_TAG_NO_ECC /* Disable YAFFS2 ECC calculation */
                                  /* This is required in order to reduce nand
                                   * tag space used by yaffs2 to fit the 20 bytes
                                   * available with Reed-Solomon ecc enabled.
                                   * Ecc is calculated and checked by nvddk
                                   * stack. */
 #undef CONFIG_YAFFS_DOES_ECC /* Ditto */
 #define CONFIG_SYS_64BIT_STRTOUL                1
 #define CONFIG_SYS_64BIT_VSPRINTF               1
@@ skipping 50 matching lines @@
  * packets depending on the buffer address and size.
  */
 #define CONFIG_USB_EHCI_TXFIFO_THRESH   10
 
 #define CONFIG_EHCI_IS_TDI
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_USB_ETHER_SMSC95XX
 
+/* Enable Warmboot code and lp0_vec */
+#define CONFIG_TEGRA2_LP0               1
+
+#ifdef CONFIG_TEGRA2_LP0
+#define TEGRA_LP0_DEFAULT_ADDR  0x1C406000  /* inside carveout memory region */
+#define TEGRA_LP0_SIZE          0x2000      /* 8KB */
+
+/* make sure the following has the same value of TEGRA_LP0_DEFAULT_ADDR */

[Tom Warren, 2010/11/16 16:44:11]

This set of #defines is awfully messy. Better to just put a #ifdef
CONFIG_TEGRA2_LP0 around the 'lp0_vec=' line below.

[yelin, 2010/11/16 23:41:04]

No, I can not do that. The #ifdef can not be part of
CONFIG_DEFAULT_ENV_SETTINGS.

+#define TEGRA_LP0_DEFAULT_ADDR_STR      "0x1C406000"
+/* make sure the following has the same value of TEGRA_LP0_SIZE */
+#define TEGRA_LP0_SIZE_STR              "0x2000"
+#define AT                              "@"
+#define LP0_VEC                         "lp0_vec="
+#else
+#define TEGRA_LP0_DEFAULT_ADDR_STR      " "
+#define TEGRA_LP0_SIZE_STR              " "
+#define AT                              " "
+#define LP0_VEC                         " "
+#endif
 
 /* Environment information */
 #define CONFIG_DEFAULT_ENV_SETTINGS \
         "tegraparts=" TEGRAPARTS_DEFAULT "\0" \
         "tegraboot=" TEGRABOOT_DEFAULT "\0" \
         "nfsport=" TEGRA_NFSPORT_DEFAULT "\0" \
         "console=ttyS0,115200n8\0" \
         "mem=" TEGRA2_SYSMEM "\0" \
         "smpflag=smp\0" \
-        "videospec=tegrafb\0"
+        "videospec=tegrafb\0" \
+        "lp0_vec=" LP0_VEC TEGRA_LP0_SIZE_STR AT TEGRA_LP0_DEFAULT_ADDR_STR "\0"
 
 #define CONFIG_IPADDR           10.0.0.2
 #define CONFIG_SERVERIP         10.0.0.1
 #define CONFIG_LOADADDR         0x408000 /* free RAM to download kernel to */
 #define CONFIG_BOOTFILE         vmlinux.uimg
 #define TEGRA_EHCI_PROBE_DELAY_DEFAULT  "5000"
 #define CONFIG_BOOTDELAY                2      /* -1 to disable auto boot */
 #define CONFIG_EXTRA_ENV_SETTINGS \
         "usbprobedelay=" TEGRA_EHCI_PROBE_DELAY_DEFAULT "\0" \
         "usbhost=on\0" \
@@ skipping 35 matching lines @@
                                 "tegra_ehci_probe_delay=${usbprobedelay}; " \
                 "fi;\0" \
         "usbboot=usb start; " \
                 "ext2load usb 0:3 ${loadaddr} /boot/${bootfile}; " \
                 "setenv bootargs root=/dev/sda3 rw rootwait " \
                 "${mem} " \
                 "video=${videospec} " \
                 "console=${console} " \
                 "usbcore.old_scheme_first=1 " \
                 "tegraboot=${tegraboot} " \
+                "${lp0_vec} " \

[Tom Warren, 2010/11/16 16:44:11]

Shouldn't this be "lp0_vec=$(lp0_vec) "? And below in mmcboot.

[yelin, 2010/11/16 23:41:04]

No. That is correct. It is the same way as "${mem} " about 5 lines above.

                 "tegrap earlyprintk; "\
                 "bootm ${loadaddr}\0" \
         "nandboot=setenv bootcmd  " \
                 "run nandargs \\; " \
                 "ymount /flash\\; " \
                 "yrdm /flash/boot/${bootfile} ${loadaddr}\\; " \
                 "yumount /flash\\; " \
                 "bootm ${loadaddr}\0" \
         "mmcboot=ext2load mmc 0:3 ${loadaddr} /boot/${bootfile}; " \
                 "setenv bootargs root=/dev/mmcblk0p3 rw rootwait " \
                 "${mem} " \
                 "video=${videospec} " \
                 "console=${console} " \
                 "usbcore.old_scheme_first=1 " \
                 "tegraboot=${tegraboot} " \
+                "${lp0_vec} " \
                 "tegrap earlyprintk; "\
                 "bootm ${loadaddr}\0" \
         "nfsboot=setenv bootcmd " \
                 "run nfsargs\\; "\
                 "tftpboot ${loadaddr}\\;"\
                 "bootm ${loadaddr}\0"
 
 /* auto load */
 /* try load from usb first, then mmc */
 #undef CONFIG_BOOTCOMMAND
@@ skipping 95 matching lines @@
  */
 #define CONFIG_TEGRA2_I2C
 
 #ifdef CONFIG_TEGRA2_I2C
 #define CONFIG_CMD_I2C
 #define CONFIG_I2C_MULTI_BUS    1
 #define CONFIG_SYS_MAX_I2C_BUS  4
 #endif
 
 #endif /* __CONFIG_H */