Merge remote-tracking branch 'u-boot-samsung/master'

[karo-tx-uboot.git] / include / configs / tegra-common-post.h

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 3bf55ce428f204a6699a50798e5c5436fb44b8a1..1c770c90fecaa3d98a144f5dcfe523c531a36f07 100644 (file)
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -66,6 +66,20 @@
 #define BOOT_TARGETS_DHCP ""
 #endif
 
+#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
+#define BOOTCMDS_PXE \
+       "bootcmd_pxe=" \
+               BOOTCMD_INIT_USB \
+               "dhcp; " \
+               "if pxe get; then " \
+                       "pxe boot; " \
+               "fi\0"
+#define BOOT_TARGETS_PXE "pxe"
+#else
+#define BOOTCMDS_PXE ""
+#define BOOT_TARGETS_PXE ""
+#endif
+
 #define BOOTCMDS_COMMON \
        "rootpart=1\0" \
        \
@@ -87,13 +101,12 @@
        \
        "do_sysboot_boot="                                                \
                "sysboot ${devtype} ${devnum}:${rootpart} any "           \
-                       "${scriptaddr} ${prefix}extlinux.conf\0"          \
+                       "${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \
        \
        "sysboot_boot="                                                   \
                "if test -e ${devtype} ${devnum}:${rootpart} "            \
-                               "${prefix}extlinux.conf; then "           \
-                       "echo Found extlinux config "                     \
-                               "${prefix}extlinux.conf; "                \
+                               "${prefix}extlinux/extlinux.conf; then "  \
+                       "echo Found ${prefix}extlinux/extlinux.conf; "    \
                        "run do_sysboot_boot; "                           \
                        "echo SCRIPT FAILED: continuing...; "             \
                "fi\0"                                                    \
@@ -108,6 +121,7 @@
        "boot_targets=" \
                BOOT_TARGETS_MMC " " \
                BOOT_TARGETS_USB " " \
+               BOOT_TARGETS_PXE " " \
                BOOT_TARGETS_DHCP " " \
                "\0" \
        \
@@ -117,7 +131,8 @@
        \
        BOOTCMDS_MMC \
        BOOTCMDS_USB \
-       BOOTCMDS_DHCP
+       BOOTCMDS_DHCP \
+       BOOTCMDS_PXE
 
 #define CONFIG_BOOTCOMMAND \
        "set usb_need_init; " \
@@ -158,6 +173,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        TEGRA_DEVICE_SETTINGS \
        MEM_LAYOUT_ENV_SETTINGS \
+       "fdt_high=ffffffff\0" \
+       "initrd_high=ffffffff\0" \
        BOOTCMDS_COMMON \
        BOARD_EXTRA_ENV_SETTINGS