diff options
| author | Stefano Babic <sbabic@denx.de> | 2016-11-29 16:28:28 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-11-29 16:28:28 +0100 |
| commit | 2d221489df021393654805536be7effcb9d39702 (patch) | |
| tree | 1b636f10b4ccde42624ec665df13288408b59b7f /arch/arm/cpu/armv7/omap5/boot.c | |
| parent | 45a3ad81fafe3090f7f89b458f6bd9f547a453df (diff) | |
| parent | e94793c844a40606252f2e3f6428063e057b3fd2 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/cpu/armv7/omap5/boot.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap5/boot.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/arch/arm/cpu/armv7/omap5/boot.c b/arch/arm/cpu/armv7/omap5/boot.c deleted file mode 100644 index 583beccad5..0000000000 --- a/arch/arm/cpu/armv7/omap5/boot.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * OMAP5 boot - * - * Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <asm/io.h> -#include <asm/omap_common.h> -#include <spl.h> - -static u32 boot_devices[] = { -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) - BOOT_DEVICE_MMC2, - BOOT_DEVICE_NAND, - BOOT_DEVICE_MMC1, - BOOT_DEVICE_SATA, - BOOT_DEVICE_XIP, - BOOT_DEVICE_XIP, - BOOT_DEVICE_SPI, - BOOT_DEVICE_SPI, -#else - BOOT_DEVICE_MMC2, - BOOT_DEVICE_NAND, - BOOT_DEVICE_MMC1, - BOOT_DEVICE_SATA, - BOOT_DEVICE_XIP, - BOOT_DEVICE_MMC2, - BOOT_DEVICE_XIPWAIT, -#endif -}; - -u32 omap_sys_boot_device(void) -{ - u32 sys_boot; - - /* Grab the first 4 bits of the status register for SYS_BOOT. */ - sys_boot = readl((u32 *) (*ctrl)->control_status) & ((1 << 4) - 1); - - if (sys_boot >= (sizeof(boot_devices) / sizeof(u32))) - return BOOT_DEVICE_NONE; - - return boot_devices[sys_boot]; -} |