mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-06 17:30:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "ipq5332: TINY NOR: disable RAMDISK support"

Browse source
This commit is contained in:
Linux Build Service Account 2023-09-15 08:44:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit e63885e667
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/include/asm/config.h
View file

@ -8,7 +8,9 @@
#define _ASM_CONFIG_H_
#define CONFIG_LMB
#ifndef CONFIG_DISABLE_RAMDISK
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
#endif
#ifdef CONFIG_ARM64
#define CONFIG_PHYS_64BIT

3
common/bootm.c
View file

@ -234,7 +234,7 @@ static int bootm_find_os(cmd_tbl_t *cmdtp, int flag, int argc,
int bootm_find_images(int flag, int argc, char * const argv[])
{
int ret;
#ifndef CONFIG_DISABLE_RAMDISK
/* find ramdisk */
ret = boot_get_ramdisk(argc, argv, &images, IH_INITRD_ARCH,
&images.rd_start, &images.rd_end);
@ -242,6 +242,7 @@ int bootm_find_images(int flag, int argc, char * const argv[])
puts("Ramdisk image is corrupt or invalid\n");
return 1;
}
#endif
#if defined(CONFIG_OF_LIBFDT)
/* find flattened device tree */

6
common/image.c
View file

@ -46,9 +46,11 @@ extern int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
#ifndef CONFIG_DISABLE_RAMDISK
static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
int verify);
#endif
#endif
#else
#include "mkimage.h"
#include <u-boot/md5.h>
@ -351,6 +353,7 @@ void image_print_contents(const void *ptr)
#ifndef USE_HOSTCC
#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
#ifndef CONFIG_DISABLE_RAMDISK
/**
* image_get_ramdisk - get and verify ramdisk image
* @rd_addr: ramdisk image start address
@ -413,6 +416,7 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
return rd_hdr;
}
#endif
#endif
#endif /* !USE_HOSTCC */
/*****************************************************************************/
@ -866,6 +870,7 @@ int genimg_has_config(bootm_headers_t *images)
return 0;
}
#ifndef CONFIG_DISABLE_RAMDISK
/**
* boot_get_ramdisk - main ramdisk handling routine
* @argc: command argument count
@ -1077,6 +1082,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
return 0;
}
#endif
#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
/**

1
include/configs/ipq5332.h
View file

@ -457,6 +457,7 @@ extern loff_t board_env_size;
#define CONFIG_DISABLE_CMD_UART
#define CONFIG_DISABLE_KERNEL64
#define CONFIG_CMD_DISABLE_EXECTZT
#define CONFIG_DISABLE_RAMDISK
#else
#define CONFIG_IPQ_ELF_AUTH
#endif