From 6624fd535627cdffdbb01f18161cb3d81a6081a6 Mon Sep 17 00:00:00 2001 From: Alexey Galakhov Date: Tue, 9 Jul 2013 21:23:16 +0600 Subject: [PATCH 1/2] friendlyarm-tiny210: use LEDs for boot errors Signed-off-by: Alexey Galakhov Signed-off-by: Sascha Hauer --- .../arm/boards/friendlyarm-tiny210/lowlevel.c | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c index 0c7fbf3de..96760945b 100644 --- a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c +++ b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c @@ -33,6 +33,22 @@ #define IRAM_CODE_BASE 0xD0020010 +/* Tiny210 has 4 leds numbered from 0 to 3 at GPJ2 */ +static inline void __bare_init debug_led(int led, bool state) +{ + uint32_t r; + /* GPJ2CON: mode 0001=output */ + r = readl(0xE0200280); + r &= ~(0xF << (4 * led)); + r |= (0x1 << (4 * led)); + writel(r, 0xE0200280); + /* GPJ2DAT: active low */ + r = readl(0xE0200284); + r &= ~(1 << led); + r |= (state ? 0 : 1) << led; + writel(r, 0xE0200284); +} + /* * iROM boot from MMC * TODO: replace this by native boot @@ -76,18 +92,28 @@ void __bare_init barebox_arm_reset_vector(void) s5p_init_pll(); #endif + debug_led(0, 1); + if (get_pc() < IRAM_CODE_BASE) /* Are we running from iRAM? */ /* No, we don't. */ goto boot; s5p_init_dram_bank_ddr2(S5P_DMC0_BASE, 0x20E00323, 0, 0); + debug_led(1, 1); + if (! load_stage2((void*)(ld_var(_text) - 16), - ld_var(_barebox_image_size) + 16)) + ld_var(_barebox_image_size) + 16)) { + debug_led(3, 1); while (1) { } /* hang */ + } + + debug_led(2, 1); jump_sdram(IRAM_CODE_BASE - ld_var(_text)); + debug_led(1, 0); + boot: barebox_arm_entry(S3C_SDRAM_BASE, SZ_256M, 0); } From 5808e2e7e908d85597e69b9e68ebecfbeb725f6b Mon Sep 17 00:00:00 2001 From: Alexey Galakhov Date: Tue, 9 Jul 2013 21:23:17 +0600 Subject: [PATCH 2/2] friendlyarm-tiny210: add heartbeat LED Signed-off-by: Alexey Galakhov Signed-off-by: Sascha Hauer --- arch/arm/boards/friendlyarm-tiny210/tiny210.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boards/friendlyarm-tiny210/tiny210.c b/arch/arm/boards/friendlyarm-tiny210/tiny210.c index 18494b051..fb144f554 100644 --- a/arch/arm/boards/friendlyarm-tiny210/tiny210.c +++ b/arch/arm/boards/friendlyarm-tiny210/tiny210.c @@ -105,6 +105,8 @@ static int tiny210_devices_init(void) led_gpio_register(&leds[i]); } + led_set_trigger(LED_TRIGGER_HEARTBEAT, &leds[0].led); + armlinux_set_bootparams((void*)S3C_SDRAM_BASE + 0x100); armlinux_set_architecture(MACH_TYPE_MINI210);