projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dra7: Allow selecting a new dtb after board detection.
[oweals/u-boot.git]
/
arch
/
arm
/
mach-omap2
/
boot-common.c
diff --git
a/arch/arm/mach-omap2/boot-common.c
b/arch/arm/mach-omap2/boot-common.c
index 2bcc8e9f979c894fbde2ce9e20b693afb27c1ce5..176d4f67cbbf6d5933e790f499db634d7604d395 100644
(file)
--- a/
arch/arm/mach-omap2/boot-common.c
+++ b/
arch/arm/mach-omap2/boot-common.c
@@
-1,11
+1,10
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* boot-common.c
*
* Common bootmode functions for omap based boards
*
* Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
/*
* boot-common.c
*
* Common bootmode functions for omap based boards
*
* Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-99,7
+98,7
@@
void save_omap_boot_params(void)
sys_boot_device = 1;
break;
#endif
sys_boot_device = 1;
break;
#endif
-#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USB
ETH_SUPPORT
)
+#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USB
_ETHER
)
case BOOT_DEVICE_USBETH:
sys_boot_device = 1;
break;
case BOOT_DEVICE_USBETH:
sys_boot_device = 1;
break;
@@
-196,13
+195,14
@@
u32 spl_boot_mode(const u32 boot_device)
void spl_board_init(void)
{
void spl_board_init(void)
{
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
/* Prepare console output */
preloader_console_init();
/* Prepare console output */
preloader_console_init();
-
+#endif
#if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT)
gpmc_init();
#endif
#if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT)
gpmc_init();
#endif
-#if
def CONFIG_SPL_I2C_SUPPORT
+#if
defined(CONFIG_SPL_I2C_SUPPORT) && !defined(CONFIG_DM_I2C)
i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
#endif
#if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW_SUPPORT)
i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
#endif
#if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW_SUPPORT)
@@
-236,13
+236,3
@@
void arch_preboot_os(void)
ahci_reset((void __iomem *)DWC_AHSATA_BASE);
}
#endif
ahci_reset((void __iomem *)DWC_AHSATA_BASE);
}
#endif
-
-#if defined(CONFIG_USB_FUNCTION_FASTBOOT) && !defined(CONFIG_ENV_IS_NOWHERE)
-int fb_set_reboot_flag(void)
-{
- printf("Setting reboot to fastboot flag ...\n");
- setenv("dofastboot", "1");
- env_save();
- return 0;
-}
-#endif