Correct SPL uses of LMB
This converts 9 usages of this option to the non-SPL form, since there is no SPL_LMB defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
24f95e141e
commit
210af54947
9 changed files with 9 additions and 9 deletions
|
@ -29,7 +29,7 @@ static int boot_prep_linux(struct bootm_headers *images)
|
|||
{
|
||||
int ret;
|
||||
|
||||
if (CONFIG_IS_ENABLED(LMB)) {
|
||||
if (IS_ENABLED(CONFIG_LMB)) {
|
||||
ret = image_setup_linux(images);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
|
@ -199,7 +199,7 @@ static void boot_prep_linux(struct bootm_headers *images)
|
|||
{
|
||||
char *commandline = env_get("bootargs");
|
||||
|
||||
if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) {
|
||||
if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
|
||||
debug("using: FDT\n");
|
||||
if (image_setup_linux(images)) {
|
||||
panic("FDT creation failed!");
|
||||
|
|
|
@ -60,7 +60,7 @@ int do_bootm_linux(int flag, int argc, char *const argv[],
|
|||
}
|
||||
set_clocks_in_mhz(kbd);
|
||||
|
||||
if (CONFIG_IS_ENABLED(LMB)) {
|
||||
if (IS_ENABLED(CONFIG_LMB)) {
|
||||
ret = image_setup_linux(images);
|
||||
if (ret)
|
||||
goto error;
|
||||
|
|
|
@ -73,7 +73,7 @@ static void boot_jump_linux(struct bootm_headers *images, int flag)
|
|||
|
||||
static void boot_prep_linux(struct bootm_headers *images)
|
||||
{
|
||||
if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) {
|
||||
if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
|
||||
debug("using: FDT\n");
|
||||
if (image_setup_linux(images)) {
|
||||
printf("FDT creation failed! hanging...");
|
||||
|
|
|
@ -214,7 +214,7 @@ static int boot_body_linux(struct bootm_headers *images)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (CONFIG_IS_ENABLED(LMB)) {
|
||||
if (IS_ENABLED(CONFIG_LMB)) {
|
||||
ret = image_setup_linux(images);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
|
@ -64,7 +64,7 @@ static void announce_and_cleanup(int fake)
|
|||
|
||||
static void boot_prep_linux(struct bootm_headers *images)
|
||||
{
|
||||
if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) {
|
||||
if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
|
||||
debug("using: FDT\n");
|
||||
if (image_setup_linux(images)) {
|
||||
printf("FDT creation failed! hanging...");
|
||||
|
|
|
@ -55,7 +55,7 @@ static int boot_prep_linux(struct bootm_headers *images)
|
|||
{
|
||||
int ret;
|
||||
|
||||
if (CONFIG_IS_ENABLED(LMB)) {
|
||||
if (IS_ENABLED(CONFIG_LMB)) {
|
||||
ret = image_setup_linux(images);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
|
@ -78,7 +78,7 @@ static int boot_prep_linux(struct bootm_headers *images)
|
|||
size_t len;
|
||||
int ret;
|
||||
|
||||
if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) {
|
||||
if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
|
||||
debug("using: FDT\n");
|
||||
if (image_setup_linux(images)) {
|
||||
puts("FDT creation failed! hanging...");
|
||||
|
|
|
@ -927,7 +927,7 @@ int image_setup_linux(struct bootm_headers *images)
|
|||
int ret;
|
||||
|
||||
/* This function cannot be called without lmb support */
|
||||
if (!CONFIG_IS_ENABLED(LMB))
|
||||
if (!IS_ENABLED(CONFIG_LMB))
|
||||
return -EFAULT;
|
||||
if (CONFIG_IS_ENABLED(OF_LIBFDT))
|
||||
boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree);
|
||||
|
|
Loading…
Reference in a new issue