bootm.c (578ac1e9ba4c79175e69becb28e7157a84eff241) | bootm.c (770605e4f9874230728f5a592820c619b1565ebc) |
---|---|
1/* 2 * (C) Copyright 2002 3 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> 4 * Marius Groeger <mgroeger@sysgo.de> 5 * 6 * Copyright (C) 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) 7 * 8 * This program is free software; you can redistribute it and/or modify --- 99 unchanged lines hidden (view full) --- 108 return 1; 109 110 s = getenv ("machid"); 111 if (s) { 112 machid = simple_strtoul (s, NULL, 16); 113 printf ("Using machid 0x%x from environment\n", machid); 114 } 115 | 1/* 2 * (C) Copyright 2002 3 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> 4 * Marius Groeger <mgroeger@sysgo.de> 5 * 6 * Copyright (C) 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) 7 * 8 * This program is free software; you can redistribute it and/or modify --- 99 unchanged lines hidden (view full) --- 108 return 1; 109 110 s = getenv ("machid"); 111 if (s) { 112 machid = simple_strtoul (s, NULL, 16); 113 printf ("Using machid 0x%x from environment\n", machid); 114 } 115 |
116 show_boot_progress(BOOTSTAGE_ID_RUN_OS); | 116 bootstage_mark(BOOTSTAGE_ID_RUN_OS); |
117 118#ifdef CONFIG_OF_LIBFDT 119 if (images->ft_len) 120 return bootm_linux_fdt(machid, images); 121#endif 122 123 kernel_entry = (void (*)(int, int, uint))images->ep; 124 --- 222 unchanged lines hidden --- | 117 118#ifdef CONFIG_OF_LIBFDT 119 if (images->ft_len) 120 return bootm_linux_fdt(machid, images); 121#endif 122 123 kernel_entry = (void (*)(int, int, uint))images->ep; 124 --- 222 unchanged lines hidden --- |