global_data: Drop pci_bootdelay

This is not used. Drop the field and the environment code which uses it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index b860f3626b81662e39589c2841b737a3ed4a26d2..86e8d654a28803ed686578d3fbc2fd3dd62c5aa0 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -297,17 +297,6 @@ struct global_data {
         * @malloc_ptr: current address of early malloc()
         */
        unsigned long malloc_ptr;
-#endif
-#ifdef CONFIG_PCI_BOOTDELAY
-       /**
-        * @pcidelay_done: delay time before scanning of PIC hose expired
-        *
-        * If CONFIG_PCI_BOOTDELAY=y, pci_hose_scan() waits for the number of
-        * milliseconds defined by environment variable pcidelay before
-        * scanning. Once this delay has expired the flag @pcidelay_done
-        * is set to 1.
-        */
-       int pcidelay_done;
 #endif
        /**
         * @cur_serial_dev: current serial device

diff --git a/include/env_default.h b/include/env_default.h
index 076ffdd44e9bc8c5c30e57aed3bca0e00b897f19..aa3dd40f3fa5e8c89625a97e39be7cf918e93a80 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -82,9 +82,6 @@ const char default_environment[] = {
 #ifdef CONFIG_SYS_LOAD_ADDR
        "loadaddr="     __stringify(CONFIG_SYS_LOAD_ADDR)"\0"
 #endif
-#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
-       "pcidelay="     __stringify(CONFIG_PCI_BOOTDELAY)"\0"
-#endif
 #ifdef CONFIG_ENV_VARS_UBOOT_CONFIG
        "arch="         CONFIG_SYS_ARCH                 "\0"
 #ifdef CONFIG_SYS_CPU