devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

imx233: shorten bootloader messages when screen is small

Browse source 
Change-Id: I403a76277e756cf06b4dca4906940d5fbf32d763
This commit is contained in:
Amaury Pouly 2013-09-25 14:11:56 +02:00
parent f67d9bd14f
commit 7e03dbbf94
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
bootloader/imx233.c
View file

@ -50,6 +50,8 @@
extern char loadaddress[]; extern char loadaddress[];
extern char loadaddressend[]; extern char loadaddressend[];
#define MSG(width, short, long) (LCD_WIDTH < (width) ? short : long)
#ifdef HAVE_BOOTLOADER_USB_MODE #ifdef HAVE_BOOTLOADER_USB_MODE
static void usb_mode(int connect_timeout) static void usb_mode(int connect_timeout)
{ {
@ -98,7 +100,7 @@ static void usb_mode(int connect_timeout)
if(button == SYS_USB_DISCONNECTED) if(button == SYS_USB_DISCONNECTED)
break; break;
struct imx233_powermgmt_info_t info = imx233_powermgmt_get_info(); struct imx233_powermgmt_info_t info = imx233_powermgmt_get_info();
lcd_putsf(0, 7, "Charging status: %s", lcd_putsf(0, 7, "%s: %s", MSG(240, "Status", "Charging status"),
info.state == CHARGE_STATE_DISABLED ? "disabled" : info.state == CHARGE_STATE_DISABLED ? "disabled" :
info.state == CHARGE_STATE_ERROR ? "error" : info.state == CHARGE_STATE_ERROR ? "error" :
info.state == DISCHARGING ? "discharging" : info.state == DISCHARGING ? "discharging" :
@ -106,11 +108,11 @@ static void usb_mode(int connect_timeout)
info.state == TOPOFF ? "topoff" : info.state == TOPOFF ? "topoff" :
info.state == CHARGING ? "charging" : "<unknown>"); info.state == CHARGING ? "charging" : "<unknown>");
lcd_putsf(0, 8, "Battery: %d%% (%d mV)", battery_level(), battery_voltage()); lcd_putsf(0, 8, "Battery: %d%% (%d mV)", battery_level(), battery_voltage());
lcd_putsf(0, 9, "Die temp: %d°C [%d, %d]", lcd_putsf(0, 9, "%s: %d 'C [%d, %d]", MSG(240, "Die", "Die temp"),
adc_read(ADC_DIE_TEMP), IMX233_DIE_TEMP_HIGH, adc_read(ADC_DIE_TEMP), IMX233_DIE_TEMP_HIGH,
IMX233_DIE_TEMP_LOW); IMX233_DIE_TEMP_LOW);
#ifdef ADC_BATT_TEMP #ifdef ADC_BATT_TEMP
lcd_putsf(0, 10, "Batt temp: %d [%d, %d]", lcd_putsf(0, 10, "%s: %d 'C [%d, %d]", MSG(240, "Batt", "Batt temp"),
adc_read(ADC_BATT_TEMP), IMX233_BATT_TEMP_HIGH, adc_read(ADC_BATT_TEMP), IMX233_BATT_TEMP_HIGH,
IMX233_BATT_TEMP_LOW); IMX233_BATT_TEMP_LOW);
#endif #endif
@ -150,15 +152,16 @@ void main(uint32_t arg, uint32_t addr)
button_init(); button_init();
printf("Boot version: %s", RBVERSION); printf("%s: %s", MSG(240, "Ver", "Boot version"), RBVERSION);
printf("arg=%x addr=%x", arg, addr); printf("%s: %x ", MSG(240, "Arg", "Boot arg"), arg);
printf("%s: %x", MSG(240, "Addr", "Boot addr"), addr);
#if IMX233_SUBTARGET >= 3780 #if IMX233_SUBTARGET >= 3780
printf("power up source: %x", BF_RD(POWER_STS, PWRUP_SOURCE)); printf("Power up source: %x", BF_RD(POWER_STS, PWRUP_SOURCE));
#endif #endif
if(arg == 0xfee1dead) if(arg == 0xfee1dead)
{ {
printf("Disable partitions window."); printf("%s", MSG(240, "Disable window", "Disable partitions window"));
imx233_partitions_enable_window(false); imx233_partitions_enable_window(false);
} }