image: Drop another #ifdef for FIT
Drop the prenultimate one of these from select_ramdisk(). Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
		
							parent
							
								
									f7659f69f7
								
							
						
					
					
						commit
						1a68c039c5
					
				| 
						 | 
					@ -363,7 +363,9 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch,
 | 
				
			||||||
				      rd_addr);
 | 
									      rd_addr);
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
#if CONFIG_IS_ENABLED(FIT)
 | 
					#if CONFIG_IS_ENABLED(FIT)
 | 
				
			||||||
		} else {
 | 
							}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
							if (CONFIG_IS_ENABLED(FIT) && !select) {
 | 
				
			||||||
			/* use FIT configuration provided in first bootm
 | 
								/* use FIT configuration provided in first bootm
 | 
				
			||||||
			 * command argument. If the property is not defined,
 | 
								 * command argument. If the property is not defined,
 | 
				
			||||||
			 * quit silently (with -ENOPKG)
 | 
								 * quit silently (with -ENOPKG)
 | 
				
			||||||
| 
						 | 
					@ -377,7 +379,6 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch,
 | 
				
			||||||
			else if (rd_noffset < 0)
 | 
								else if (rd_noffset < 0)
 | 
				
			||||||
				return rd_noffset;
 | 
									return rd_noffset;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
		/*
 | 
							/*
 | 
				
			||||||
		 * Check if there is an initrd image at the
 | 
							 * Check if there is an initrd image at the
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue