@@ -1694,6 +1694,7 @@ yaboot_main(void)
char *endp;
int conf_given = 0;
char conf_path[1024];
+ int ret;
if (_machine == _MACH_Pmac)
setup_display();
@@ -1702,7 +1703,8 @@ yaboot_main(void)
DEBUG_F("/chosen/bootargs = %s\n", bootargs);
prom_get_chosen("bootpath", bootdevice, BOOTDEVSZ);
DEBUG_F("/chosen/bootpath = %s\n", bootdevice);
- prom_get_options("ibm,fw-nbr-reboots",fw_nbr_reboots, FW_NBR_REBOOTSZ);
+ if (prom_get_options("ibm,#reconfig-reboots",fw_nbr_reboots, FW_NBR_REBOOTSZ) == -1 )
+ prom_get_options("ibm,fw-nbr-reboots",fw_nbr_reboots, FW_NBR_REBOOTSZ);
fw_reboot_cnt = simple_strtol(fw_nbr_reboots,&endp,10);
if (fw_reboot_cnt > 0L)
prom_get_options("boot-last-label", bootlastlabel, BOOTLASTSZ);