diff options
Diffstat (limited to 'include/configs')
63 files changed, 0 insertions, 241 deletions
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index b37f3a8727..7352e34b9c 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -347,11 +347,6 @@ #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ - "echo" - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=mpc8349emds\0" \ diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index 493f6df187..2ae1069e4f 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -404,10 +404,6 @@ #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ -#define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ - "echo" - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=mpc8349emds\0" \ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 0c2df7ec03..9bf5d9d3fd 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -236,11 +236,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 400000 -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ - "echo" - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=tqm834x\0" \ diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index e9a9da3aed..5fa393d45d 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -68,16 +68,6 @@ */ #ifdef CONFIG_USB_AM35X - -#ifdef CONFIG_USB_MUSB_HCD - -#ifdef CONFIG_USB_KEYBOARD -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "usb start" -#endif /* CONFIG_USB_KEYBOARD */ - -#endif /* CONFIG_USB_MUSB_HCD */ - #ifdef CONFIG_USB_MUSB_UDC /* USB device configuration */ #define CONFIG_USB_DEVICE 1 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 1b9dafa1a5..63489133a8 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -29,19 +29,6 @@ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57 -#ifdef CONFIG_USB_MUSB_AM35X - -#ifdef CONFIG_USB_MUSB_HOST - -#ifdef CONFIG_USB_KEYBOARD -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "usb start" -#endif /* CONFIG_USB_KEYBOARD */ - -#endif /* CONFIG_USB_MUSB_HOST */ - -#endif /* CONFIG_USB_MUSB_AM35X */ - /* I2C */ /* Ethernet */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index d7af4f91bc..044ce4467e 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -83,8 +83,6 @@ #define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "run check_flash check_env;" /* * Boot Linux diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 0485e7a6d8..8aa6e1d0c3 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -29,9 +29,6 @@ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT - #define CONFIG_S5P_PA_SYSRAM 0x02020000 #define CONFIG_SMP_PEN_ADDR CONFIG_S5P_PA_SYSRAM diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 648a4db8f1..b8437052a9 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -157,11 +157,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Save the prior stage provided DTB. */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT \ - "fdt addr ${fdtcontroladdr};" \ - "fdt move ${fdtcontroladdr} ${fdtsaveaddr};" \ - "fdt addr ${fdtsaveaddr};" /* * Enable in-place RFS with this initrd_high setting. */ diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 76dc38766d..285e28b535 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -37,8 +37,6 @@ "run manage_userdata; " /* Enable PREBOOT variable */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* Set ARP_TIMEOUT to 500ms */ #define CONFIG_ARP_TIMEOUT 500UL diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h index 0a8d41b8f6..dff41239ba 100644 --- a/include/configs/bur_cfg_common.h +++ b/include/configs/bur_cfg_common.h @@ -23,9 +23,6 @@ "setcurs 1 10;lcdputs serverip; setcurs 10 10; lcdputs ${serverip};" \ "setenv stdout nc;setenv stdin nc;setenv stderr nc\0" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "run cfgscr; run brdefaultip" - /* Network defines */ #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 7b9640fb26..60bac9adc8 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -144,9 +144,6 @@ "echo WARNING: Could not determine dtb to use; fi; \0" \ BOOTENV -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "usb start;sf probe" - #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) \ func(MMC, mmc, 2) \ diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index 1978074617..93dcad4b66 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -37,7 +37,4 @@ "upd_uboot=tftp 100000 conga/u-boot.rom;" \ "sf probe;sf update 100000 0 800000;saveenv\0" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT - #endif /* __CONFIG_H */ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index f0f460aac9..54bbfe3f55 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -124,9 +124,6 @@ #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "ccdc.img" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* enable preboot variable */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth1\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index d3a4a61c6c..a8e1850f2b 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -42,7 +42,4 @@ "upd_uboot=usb reset;tftp 100000 dfi/u-boot.rom;" \ "sf probe;sf update 100000 0 800000;saveenv\0" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT - #endif /* __CONFIG_H */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 2b44437ed3..b175e9d574 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -99,8 +99,5 @@ /* Default Environment */ #define CONFIG_BOOTCOMMAND "sf read ${loadaddr} 0xd0000 0x700000; bootm" #define CONFIG_LOADADDR 0x80000 -#define CONFIG_USE_PREBOOT -#undef CONFIG_PREBOOT /* override preboot for USB and SPI flash init */ -#define CONFIG_PREBOOT "usb start; sf probe" #endif /* _CONFIG_SYNOLOGY_DS414_H */ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 11d367a151..0ff48287ac 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -100,8 +100,6 @@ #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" -#define CONFIG_PREBOOT /* enable preboot variable */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index aec5d61c56..a27627e721 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -138,8 +138,6 @@ /* Miscellaneous configurable options */ #define CONFIG_HWCONFIG -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* Memory configuration */ #define CONFIG_SYS_MEMTEST_START 0x10000000 diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 31ce410448..8fb321178f 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -403,9 +403,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* enable preboot variable */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 8bc8e00f98..43cb14c14e 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -253,10 +253,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x100000 #define CONFIG_LOADS_ECHO #define CONFIG_TIMESTAMP -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run nfsboot\\\" " \ - "to mount root filesystem over NFS;echo" #define CONFIG_BOOTCOMMAND "run boot_cramfs" #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 0fe83be527..a432259cfe 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -185,8 +185,6 @@ /* * Extra Environments */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "run try_bootscript" #define CONFIG_HOSTNAME "m53menlo" #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 6cf8c672eb..aeab2e983b 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -40,9 +40,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* enable preboot variable */ - /* * Hardware drivers */ diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 7ced66774f..78b1615d5c 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -31,8 +31,6 @@ #ifdef CONFIG_USB_KEYBOARD #define STDIN_CFG "usbkbd,serial" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "usb start" #else #define STDIN_CFG "serial" #endif diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index f99bd71167..814fec5b33 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -140,9 +140,6 @@ /* architecture dependent code */ #define CONFIG_SYS_USR_EXCEP /* user exception */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv preboot;echo" - #ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" \ "nor0=flash-0\0"\ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 6ee0443f11..e6d5c680d7 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -38,8 +38,6 @@ #endif /* auto boot */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* * For booting Linux, the board info and command line data diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index dbedad1a97..ff8cc3c770 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -14,8 +14,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* auto boot */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 2931014744..f3f8538541 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -15,8 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* auto boot */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 8e66a2bf67..fc498b2481 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -66,8 +66,6 @@ #define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED /* Framebuffer and LCD */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index fb57a2113c..bbe0574033 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -160,7 +160,5 @@ /* Framebuffer and LCD */ #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT #endif /* __CONFIG_H */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 6eca8b6027..b734b822dd 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -176,8 +176,6 @@ #endif /* Framebuffer and LCD */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index cde8fa210b..3cf2f1ce28 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -49,18 +49,6 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT \ - "if hdmidet; then " \ - "usb start; " \ - "setenv stdin serial,usbkbd; "\ - "setenv stdout serial,vga; " \ - "setenv stderr serial,vga; " \ - "else " \ - "setenv stdin serial; " \ - "setenv stdout serial; " \ - "setenv stderr serial; " \ - "fi;" /* Command definition */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 3709fa6537..23c370b07c 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -67,9 +67,6 @@ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "" - #ifdef CONFIG_CMD_MMC #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) #else diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 43dfeeac32..f47d088303 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -253,31 +253,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "bootmenu_delay=30\0" \ "" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT \ - "setenv mmcnum 1; setenv mmcpart 1;" \ - "setenv mmcscriptfile bootmenu.scr;" \ - "if run switchmmc; then " \ - "setenv mmcdone true;" \ - "setenv mmctype fat;" \ - "if run scriptload; then true; else " \ - "setenv mmctype ext2;" \ - "if run scriptload; then true; else " \ - "setenv mmctype ext4;" \ - "if run scriptload; then true; else " \ - "setenv mmcdone false;" \ - "fi;" \ - "fi;" \ - "fi;" \ - "if ${mmcdone}; then " \ - "run scriptboot;" \ - "fi;" \ - "fi;" \ - "if run slide; then true; else " \ - "setenv bootmenu_delay 0;" \ - "setenv bootdelay 0;" \ - "fi" - #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 0bf2df22ea..e8c60838b7 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -58,9 +58,6 @@ /* TWL4030 LED Support */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "usb start" - #define MEM_LAYOUT_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 8b1773ea07..b7c3ddf564 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -60,11 +60,6 @@ /* Environment information */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT \ - "setenv preboot;" \ - "saveenv;" - #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index d7dd77e535..309b4717c4 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -76,8 +76,6 @@ #define ACFG_CONSOLE_DEV ttymxc0 #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "run check_env" #define CONFIG_BOOTCOMMAND "run emmcboot" #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 307797d0e3..7dfcccb82b 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -77,9 +77,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #endif -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "" - /* Thermal support */ #define CONFIG_IMX_THERMAL diff --git a/include/configs/platinum.h b/include/configs/platinum.h index ced843f97e..1b57e9931f 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -102,8 +102,6 @@ #define CONFIG_BOOTCOMMAND "run bootubi_scr" /* Miscellaneous configurable options */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* MTD/UBI/UBIFS config */ diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index afbf7a828d..c7aaafaad4 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -32,8 +32,6 @@ #include <config_distro_bootcmd.h> -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "pci enum" #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index df22f780b0..ecea1d4765 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -48,8 +48,4 @@ "ramdisk_addr_r=0x88300000\0" \ BOOTENV -#define CONFIG_PREBOOT \ - "setenv fdt_addr ${fdtcontroladdr};" \ - "fdt addr ${fdtcontroladdr};" - #endif /* __CONFIG_H */ diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 5f864fd2ba..ec0e157ec5 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -56,7 +56,4 @@ BOOTENV #endif -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT - #endif diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 455d284c3f..44e8d0ccd2 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -61,7 +61,4 @@ #endif /* CONFIG_SPL_BUILD */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT - #endif diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 4489b21f96..42a49c5502 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -56,7 +56,4 @@ BOOTENV #endif -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT - #endif diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 0a66b07fba..eaa1c582e9 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -70,7 +70,4 @@ BOOTENV #endif -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT - #endif diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 0a612a642d..e706bea8cc 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -73,8 +73,6 @@ /* Environment */ #define CONFIG_ENV_SIZE SZ_16K #define CONFIG_SYS_LOAD_ADDR 0x1000000 -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "usb start" /* Shell */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index f1ce7a0117..dd63adb6db 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -189,8 +189,6 @@ /* UBI Support */ /* Commen environment */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT #define COMMON_ENV_DFU_ARGS "dfu_args=run bootargs_defaults;" \ "setenv bootargs ${bootargs};" \ "mtdparts default;" \ diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h index 9e0d5d45f5..befaeaaf54 100644 --- a/include/configs/socfpga_dbm_soc1.h +++ b/include/configs/socfpga_dbm_soc1.h @@ -12,8 +12,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "run try_bootscript" #define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index a2fc1033b3..590a9af274 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -12,7 +12,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_PREBOOT "run try_bootscript" #define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 7fc1a95e8e..232536a763 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -33,17 +33,6 @@ * if button B is not pressed, boot normal Linux system immediatelly * if button B is pressed, wait $bootdelay and boot recovery system */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT \ - "setenv hostname vining-${unit_serial} ; " \ - "setenv PS1 \"${unit_ident} (${unit_serial}) => \" ; " \ - "if gpio input 78 ; then " \ - "setenv bootdelay 10 ; " \ - "setenv boottype rcvr ; " \ - "else " \ - "setenv bootdelay 5 ; " \ - "setenv boottype norm ; " \ - "fi" #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index ee3cf87327..c7c30d367a 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -272,12 +272,6 @@ #define CONFIG_LOADADDR 200000 /* default addr for tftp & bootm*/ - -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "echo;" \ - "echo Welcome on the ABB Socrates Board;" \ - "echo" - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consdev=ttyS0\0" \ diff --git a/include/configs/strider.h b/include/configs/strider.h index 525b548344..e3d64e52aa 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -436,9 +436,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* enable preboot variable */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 7d92c2177f..d7133a73fc 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -285,11 +285,6 @@ extern int soft_i2c_gpio_scl; #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #endif -#ifdef CONFIG_USB_KEYBOARD -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT -#endif - #ifndef CONFIG_SPL_BUILD #ifdef CONFIG_ARM64 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index c935577f5d..11f76e777b 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -79,16 +79,6 @@ #ifdef CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USBD_HS #endif /* CONFIG_CMD_USB_MASS_STORAGE */ -#ifdef CONFIG_USB_KEYBOARD -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT \ - "usb start; " \ - "if hdmidet; then " \ - "run set_con_hdmi; " \ - "else " \ - "run set_con_serial; " \ - "fi" -#endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_CMD_USB */ /* Environment organization */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index f19218799d..fae0e761fb 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -42,8 +42,6 @@ #ifdef CONFIG_USB_KEYBOARD #define STDIN_KBD_USB ",usbkbd" -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "usb start" #else #define STDIN_KBD_USB "" #endif diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index ac7ee2eda5..0c563e714d 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -13,9 +13,6 @@ #define CONFIG_SYS_MONITOR_LEN (1 << 20) -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT - #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index d28978467b..3562a14261 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -47,9 +47,6 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 3d48ab2352..a915c32607 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -79,9 +79,6 @@ # define EXTRA_ENV_USB #endif -#define CONFIG_USE_PREBOOT -#undef CONFIG_PREBOOT - #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_image=uImage\0" \ diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index fc0fe1504c..7d5f5fa409 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -21,8 +21,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* auto boot */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 710bcaeb1a..23f0389615 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -472,8 +472,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ /* diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index ee22042a81..21e91ee1a4 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -271,8 +271,6 @@ */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index c33a6e018a..73e1fa313f 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -322,8 +322,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ /* diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index f42987cf70..e5a41abd4b 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -320,8 +320,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ /* diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index bc9419225f..9d683768f4 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -98,9 +98,6 @@ #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM + (512*1024)) #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM + PHYS_SDRAM_SIZE) -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT "" - /* * Size of malloc() pool diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 364ffbc1b9..bb6a835ece 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -102,8 +102,6 @@ #define CONFIG_ENV_OVERWRITE /* enable preboot to be loaded before CONFIG_BOOTDELAY */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT /* Boot configuration */ #define CONFIG_SYS_LOAD_ADDR 0 /* default? */ |