diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-13 14:56:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-13 14:56:04 +0200 |
| commit | b2c398f44031efc3c6ab2bec19f56df0c05ad3de (patch) | |
| tree | f64b1bb976f832daa0160e1a67cfcd669822ae58 /arch/arm/boards | |
| parent | 0a12c7156890eae6c74732f69a6b731135b0bb27 (diff) | |
| parent | b12f38097bce1f12e4b7e420c2c11bea281b4daa (diff) | |
| download | barebox-b2c398f44031efc3c6ab2bec19f56df0c05ad3de.tar.gz barebox-b2c398f44031efc3c6ab2bec19f56df0c05ad3de.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/boards')
| -rw-r--r-- | arch/arm/boards/guf-santaro/lowlevel.c | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/arch/arm/boards/guf-santaro/lowlevel.c b/arch/arm/boards/guf-santaro/lowlevel.c index e2b6df5839..1502bb3d38 100644 --- a/arch/arm/boards/guf-santaro/lowlevel.c +++ b/arch/arm/boards/guf-santaro/lowlevel.c @@ -3,36 +3,47 @@ #include <io.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> +#include <asm/cache.h> #include <mach/generic.h> #include <mach/imx6-regs.h> #include <debug_ll.h> +#include <console.h> +#include <mach/esdctl.h> static inline void setup_uart(void) { - void __iomem *iomuxbase = (void *)MX6_IOMUXC_BASE_ADDR; + void __iomem *iomuxbase = IOMEM(MX6_IOMUXC_BASE_ADDR); writel(0x1, iomuxbase + 0x2b0); imx6_ungate_all_peripherals(); - imx6_uart_setup_ll(); - - putc_ll('>'); + imx6_uart_setup(IOMEM(MX6_UART2_BASE_ADDR)); } extern char __dtb_imx6q_guf_santaro_start[]; -ENTRY_FUNCTION(start_imx6q_guf_santaro, r0, r1, r2) +static noinline void santaro_start(void) { - void *fdt; + pbl_set_putc(imx_uart_putc, IOMEM(MX6_UART2_BASE_ADDR)); + + pr_debug("Garz+Fricke Santaro\n"); + + imx6q_barebox_entry(__dtb_imx6q_guf_santaro_start); +} +ENTRY_FUNCTION(start_imx6q_guf_santaro, r0, r1, r2) +{ imx6_cpu_lowlevel_init(); arm_setup_stack(0x00920000 - 8); - if (IS_ENABLED(CONFIG_DEBUG_LL)) - setup_uart(); + arm_early_mmu_cache_invalidate(); + + setup_uart(); - fdt = __dtb_imx6q_guf_santaro_start - get_runtime_offset(); + relocate_to_current_adr(); + setup_c(); + barrier(); - barebox_arm_entry(0x10000000, SZ_1G, fdt); + santaro_start(); } |