mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 16:40:44 +09:00
x86: spl: Reduce priority of the basic SPL image loader
This image loader works on systems where the flash is directly mapped to the last part of the 32-bit address space. On recent Intel systems (such as apollolake) this is not the case. Reduce the priority of this loader so that another one can override it. While we are here, rename the loader to BOOT_DEVICE_SPI_MMAP since BOOT_DEVICE_BOARD is not very descriptive. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
14dd93beb7
commit
daade119aa
@ -10,8 +10,7 @@
|
|||||||
#define CONFIG_SPL_BOARD_LOAD_IMAGE
|
#define CONFIG_SPL_BOARD_LOAD_IMAGE
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
BOOT_DEVICE_SPI = 10,
|
BOOT_DEVICE_SPI_MMAP = 10,
|
||||||
BOOT_DEVICE_BOARD,
|
|
||||||
BOOT_DEVICE_CROS_VBOOT,
|
BOOT_DEVICE_CROS_VBOOT,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#include <asm/mrccache.h>
|
#include <asm/mrccache.h>
|
||||||
#include <asm/mtrr.h>
|
#include <asm/mtrr.h>
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
|
#include <asm/spl.h>
|
||||||
#include <asm-generic/sections.h>
|
#include <asm-generic/sections.h>
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
@ -142,7 +143,7 @@ void board_init_f_r(void)
|
|||||||
|
|
||||||
u32 spl_boot_device(void)
|
u32 spl_boot_device(void)
|
||||||
{
|
{
|
||||||
return BOOT_DEVICE_BOARD;
|
return BOOT_DEVICE_SPI_MMAP;
|
||||||
}
|
}
|
||||||
|
|
||||||
int spl_start_uboot(void)
|
int spl_start_uboot(void)
|
||||||
@ -168,7 +169,7 @@ static int spl_board_load_image(struct spl_image_info *spl_image,
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
SPL_LOAD_IMAGE_METHOD("SPI", 0, BOOT_DEVICE_BOARD, spl_board_load_image);
|
SPL_LOAD_IMAGE_METHOD("SPI", 5, BOOT_DEVICE_SPI_MMAP, spl_board_load_image);
|
||||||
|
|
||||||
int spl_spi_load_image(void)
|
int spl_spi_load_image(void)
|
||||||
{
|
{
|
||||||
|
@ -71,7 +71,7 @@ void board_init_f_r(void)
|
|||||||
u32 spl_boot_device(void)
|
u32 spl_boot_device(void)
|
||||||
{
|
{
|
||||||
return IS_ENABLED(CONFIG_CHROMEOS) ? BOOT_DEVICE_CROS_VBOOT :
|
return IS_ENABLED(CONFIG_CHROMEOS) ? BOOT_DEVICE_CROS_VBOOT :
|
||||||
BOOT_DEVICE_BOARD;
|
BOOT_DEVICE_SPI_MMAP;
|
||||||
}
|
}
|
||||||
|
|
||||||
int spl_start_uboot(void)
|
int spl_start_uboot(void)
|
||||||
@ -97,7 +97,7 @@ static int spl_board_load_image(struct spl_image_info *spl_image,
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
SPL_LOAD_IMAGE_METHOD("SPI", 0, BOOT_DEVICE_BOARD, spl_board_load_image);
|
SPL_LOAD_IMAGE_METHOD("SPI", 5, BOOT_DEVICE_SPI_MMAP, spl_board_load_image);
|
||||||
|
|
||||||
int spl_spi_load_image(void)
|
int spl_spi_load_image(void)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user