|
@@ -38,7 +38,7 @@ 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)
|
|
|
+#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
|
|
|
static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
|
|
|
int verify);
|
|
|
#endif
|
|
@@ -377,7 +377,7 @@ void image_print_contents(const void *ptr)
|
|
|
|
|
|
|
|
|
#ifndef USE_HOSTCC
|
|
|
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
|
|
|
+#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
|
|
|
/**
|
|
|
* image_get_ramdisk - get and verify ramdisk image
|
|
|
* @rd_addr: ramdisk image start address
|
|
@@ -867,7 +867,7 @@ ulong genimg_get_kernel_addr(char * const img_addr)
|
|
|
*/
|
|
|
int genimg_get_format(const void *img_addr)
|
|
|
{
|
|
|
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
|
|
|
+#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
|
|
|
const image_header_t *hdr;
|
|
|
|
|
|
hdr = (const image_header_t *)img_addr;
|
|
@@ -933,7 +933,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
|
|
|
{
|
|
|
ulong rd_addr, rd_load;
|
|
|
ulong rd_data, rd_len;
|
|
|
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
|
|
|
+#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
|
|
|
const image_header_t *rd_hdr;
|
|
|
#endif
|
|
|
void *buf;
|
|
@@ -1025,7 +1025,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
|
|
|
*/
|
|
|
buf = map_sysmem(rd_addr, 0);
|
|
|
switch (genimg_get_format(buf)) {
|
|
|
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
|
|
|
+#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
|
|
|
case IMAGE_FORMAT_LEGACY:
|
|
|
printf("## Loading init Ramdisk from Legacy "
|
|
|
"Image at %08lx ...\n", rd_addr);
|