colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / common / board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index 8fa26e3ca5488ab6aa22ee8f078195b89b400f7e..01194eaa0e4d3cf9ba20c00aee0cd24ef69b0a20 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <bloblist.h>
+#include <bootstage.h>
 #include <clock_legacy.h>
 #include <console.h>
 #include <cpu.h>
@@ -25,6 +26,7 @@
 #include <init.h>
 #include <initcall.h>
 #include <lcd.h>
+#include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <os.h>
@@ -40,6 +42,7 @@
 #include <trace.h>
 #include <video.h>
 #include <watchdog.h>
+#include <asm/cache.h>
 #ifdef CONFIG_MACH_TYPE
 #include <asm/mach-types.h>
 #endif
@@ -183,11 +186,11 @@ static int print_cpuinfo(void)
        char desc[512];
        int ret;
 
-       ret = uclass_first_device_err(UCLASS_CPU, &dev);
-       if (ret) {
-               debug("%s: Could not get CPU device (err = %d)\n",
-                     __func__, ret);
-               return ret;
+       dev = cpu_get_current_dev();
+       if (!dev) {
+               debug("%s: Could not get CPU device\n",
+                     __func__);
+               return -ENODEV;
        }
 
        ret = cpu_get_desc(dev, desc, sizeof(desc));
@@ -309,7 +312,7 @@ __weak int mach_cpu_init(void)
 /* Get the top of usable RAM */
 __weak ulong board_get_usable_ram_top(ulong total_size)
 {
-#ifdef CONFIG_SYS_SDRAM_BASE
+#if defined(CONFIG_SYS_SDRAM_BASE) && CONFIG_SYS_SDRAM_BASE > 0
        /*
         * Detect whether we have so much RAM that it goes past the end of our
         * 32-bit address space. If so, clip the usable RAM so it doesn't.
@@ -385,33 +388,10 @@ static int reserve_round_4k(void)
        return 0;
 }
 
-#ifdef CONFIG_ARM
-__weak int reserve_mmu(void)
+__weak int arch_reserve_mmu(void)
 {
-#if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
-       /* reserve TLB table */
-       gd->arch.tlb_size = PGTABLE_SIZE;
-       gd->relocaddr -= gd->arch.tlb_size;
-
-       /* round down to next 64 kB limit */
-       gd->relocaddr &= ~(0x10000 - 1);
-
-       gd->arch.tlb_addr = gd->relocaddr;
-       debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr,
-             gd->arch.tlb_addr + gd->arch.tlb_size);
-
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
-       /*
-        * Record allocated tlb_addr in case gd->tlb_addr to be overwritten
-        * with location within secure ram.
-        */
-       gd->arch.tlb_allocated = gd->arch.tlb_addr;
-#endif
-#endif
-
        return 0;
 }
-#endif
 
 static int reserve_video(void)
 {
@@ -472,6 +452,17 @@ static int reserve_uboot(void)
        return 0;
 }
 
+/*
+ * reserve after start_addr_sp the requested size and make the stack pointer
+ * 16-byte aligned, this alignment is needed for cast on the reserved memory
+ * ref = x86_64 ABI: https://reviews.llvm.org/D30049: 16 bytes
+ *     = ARMv8 Instruction Set Overview: quad word, 16 bytes
+ */
+static unsigned long reserve_stack_aligned(size_t size)
+{
+       return ALIGN_DOWN(gd->start_addr_sp - size, 16);
+}
+
 #ifdef CONFIG_SYS_NONCACHED_MEMORY
 static int reserve_noncached(void)
 {
@@ -497,7 +488,7 @@ static int reserve_noncached(void)
 /* reserve memory for malloc() area */
 static int reserve_malloc(void)
 {
-       gd->start_addr_sp = gd->start_addr_sp - TOTAL_MALLOC_LEN;
+       gd->start_addr_sp = reserve_stack_aligned(TOTAL_MALLOC_LEN);
        debug("Reserving %dk for malloc() at: %08lx\n",
              TOTAL_MALLOC_LEN >> 10, gd->start_addr_sp);
 #ifdef CONFIG_SYS_NONCACHED_MEMORY
@@ -511,7 +502,7 @@ static int reserve_malloc(void)
 static int reserve_board(void)
 {
        if (!gd->bd) {
-               gd->start_addr_sp -= sizeof(bd_t);
+               gd->start_addr_sp = reserve_stack_aligned(sizeof(bd_t));
                gd->bd = (bd_t *)map_sysmem(gd->start_addr_sp, sizeof(bd_t));
                memset(gd->bd, '\0', sizeof(bd_t));
                debug("Reserving %zu Bytes for Board Info at: %08lx\n",
@@ -530,7 +521,7 @@ static int setup_machine(void)
 
 static int reserve_global_data(void)
 {
-       gd->start_addr_sp -= sizeof(gd_t);
+       gd->start_addr_sp = reserve_stack_aligned(sizeof(gd_t));
        gd->new_gd = (gd_t *)map_sysmem(gd->start_addr_sp, sizeof(gd_t));
        debug("Reserving %zu Bytes for Global Data at: %08lx\n",
              sizeof(gd_t), gd->start_addr_sp);
@@ -548,7 +539,7 @@ static int reserve_fdt(void)
        if (gd->fdt_blob) {
                gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
 
-               gd->start_addr_sp -= gd->fdt_size;
+               gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size);
                gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size);
                debug("Reserving %lu Bytes for FDT at: %08lx\n",
                      gd->fdt_size, gd->start_addr_sp);
@@ -563,7 +554,7 @@ static int reserve_bootstage(void)
 #ifdef CONFIG_BOOTSTAGE
        int size = bootstage_get_size();
 
-       gd->start_addr_sp -= size;
+       gd->start_addr_sp = reserve_stack_aligned(size);
        gd->new_bootstage = map_sysmem(gd->start_addr_sp, size);
        debug("Reserving %#x Bytes for bootstage at: %08lx\n", size,
              gd->start_addr_sp);
@@ -580,8 +571,7 @@ __weak int arch_reserve_stacks(void)
 static int reserve_stacks(void)
 {
        /* make stack pointer 16-byte aligned */
-       gd->start_addr_sp -= 16;
-       gd->start_addr_sp &= ~0xf;
+       gd->start_addr_sp = reserve_stack_aligned(16);
 
        /*
         * let the architecture-specific code tailor gd->start_addr_sp and
@@ -593,8 +583,7 @@ static int reserve_stacks(void)
 static int reserve_bloblist(void)
 {
 #ifdef CONFIG_BLOBLIST
-       gd->start_addr_sp &= ~0xf;
-       gd->start_addr_sp -= CONFIG_BLOBLIST_SIZE;
+       gd->start_addr_sp = reserve_stack_aligned(CONFIG_BLOBLIST_SIZE);
        gd->new_bloblist = map_sysmem(gd->start_addr_sp, CONFIG_BLOBLIST_SIZE);
 #endif
 
@@ -836,9 +825,9 @@ static int initf_dm(void)
 #if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN)
        int ret;
 
-       bootstage_start(BOOTSTATE_ID_ACCUM_DM_F, "dm_f");
+       bootstage_start(BOOTSTAGE_ID_ACCUM_DM_F, "dm_f");
        ret = dm_init_and_scan(true);
-       bootstage_accum(BOOTSTATE_ID_ACCUM_DM_F);
+       bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F);
        if (ret)
                return ret;
 #endif
@@ -867,6 +856,11 @@ __weak int checkcpu(void)
        return 0;
 }
 
+__weak int clear_bss(void)
+{
+       return 0;
+}
+
 static const init_fnc_t init_sequence_f[] = {
        setup_mon_len,
 #ifdef CONFIG_OF_CONTROL
@@ -965,9 +959,7 @@ static const init_fnc_t init_sequence_f[] = {
        reserve_pram,
 #endif
        reserve_round_4k,
-#ifdef CONFIG_ARM
-       reserve_mmu,
-#endif
+       arch_reserve_mmu,
        reserve_video,
        reserve_trace,
        reserve_uboot,
@@ -1002,11 +994,8 @@ static const init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_X86) || defined(CONFIG_ARC)
        copy_uboot_to_ram,
        do_elf_reloc_fixups,
-       clear_bss,
 #endif
-#if defined(CONFIG_XTENSA)
        clear_bss,
-#endif
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \
                !CONFIG_IS_ENABLED(X86_64)
        jump_to_copy,