mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 00:32:04 +02:00
configs: Rename CONFIG_IMAGE_FORMAT_LEGACY to CONFIG_LEGACY_IMAGE_FORMAT
The name CONFIG_LEGACY_IMAGE_FORMAT reads slightly better along with allowing us to avoid a rather nasty Kbuild/Kconfig issue down the line with CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY). In a few places outside of cmd/ switch to using CONFIG_IS_ENABLED() to test what is set. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -33,7 +33,7 @@ static void fdt_error(const char *msg)
|
||||
puts(" - must RESET the board to recover.\n");
|
||||
}
|
||||
|
||||
#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
|
||||
#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
|
||||
static const image_header_t *image_get_fdt(ulong fdt_addr)
|
||||
{
|
||||
const image_header_t *fdt_hdr = map_sysmem(fdt_addr, 0);
|
||||
@@ -263,7 +263,7 @@ error:
|
||||
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
|
||||
bootm_headers_t *images, char **of_flat_tree, ulong *of_size)
|
||||
{
|
||||
#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
|
||||
#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
|
||||
const image_header_t *fdt_hdr;
|
||||
ulong load, load_end;
|
||||
ulong image_start, image_data, image_end;
|
||||
@@ -344,7 +344,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
|
||||
*/
|
||||
buf = map_sysmem(fdt_addr, 0);
|
||||
switch (genimg_get_format(buf)) {
|
||||
#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
|
||||
#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
|
||||
case IMAGE_FORMAT_LEGACY:
|
||||
/* verify fdt_addr points to a valid image header */
|
||||
printf("## Flattened Device Tree from Legacy Image at %08lx\n",
|
||||
|
Reference in New Issue
Block a user