diff options
| -rw-r--r-- | arch/arc/cpu/u-boot.lds | 1 | ||||
| -rw-r--r-- | arch/arc/lib/Makefile | 3 | ||||
| -rw-r--r-- | board/synopsys/axs101/axs101.c | 14 | ||||
| -rw-r--r-- | board/synopsys/axs101/axs10x.h | 16 | ||||
| -rw-r--r-- | board/synopsys/axs101/nand.c | 7 | ||||
| -rw-r--r-- | include/configs/axs101.h | 6 |
6 files changed, 46 insertions, 1 deletions
diff --git a/arch/arc/cpu/u-boot.lds b/arch/arc/cpu/u-boot.lds index ccddbf7..693df74 100644 --- a/arch/arc/cpu/u-boot.lds +++ b/arch/arc/cpu/u-boot.lds @@ -13,6 +13,7 @@ SECTIONS .text : { *(.__text_start) *(.__image_copy_start) + arch/arc/lib/start.o (.text*) *(.text*) } diff --git a/arch/arc/lib/Makefile b/arch/arc/lib/Makefile index b887904..e592802 100644 --- a/arch/arc/lib/Makefile +++ b/arch/arc/lib/Makefile @@ -4,6 +4,8 @@ # SPDX-License-Identifier: GPL-2.0+ # +extra-y = start.o +head-y := start.o obj-y += cache.o obj-y += cpu.o obj-y += interrupts.o @@ -18,7 +20,6 @@ obj-y += memcpy-700.o obj-y += memset.o obj-y += reset.o obj-y += timer.o -obj-y += start.o obj-y += ints_low.o obj-y += init_helpers.o diff --git a/board/synopsys/axs101/axs101.c b/board/synopsys/axs101/axs101.c index 7742049..8c16410 100644 --- a/board/synopsys/axs101/axs101.c +++ b/board/synopsys/axs101/axs101.c @@ -9,6 +9,7 @@ #include <malloc.h> #include <netdev.h> #include <phy.h> +#include "axs10x.h" DECLARE_GLOBAL_DATA_PTR; @@ -42,3 +43,16 @@ int board_eth_init(bd_t *bis) return 0; } + + +#define AXS_MB_CREG 0xE0011000 + +int board_early_init_f(void) +{ + if (readl((void __iomem *)AXS_MB_CREG + 0x234) & (1 << 28)) + gd->board_type = AXS_MB_V3; + else + gd->board_type = AXS_MB_V2; + + return 0; +} diff --git a/board/synopsys/axs101/axs10x.h b/board/synopsys/axs101/axs10x.h new file mode 100644 index 0000000..8e8c41f --- /dev/null +++ b/board/synopsys/axs101/axs10x.h @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2015 Synopsys, Inc. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _BOARD_SYNOPSYS_AXS10X_H +#define _BOARD_SYNOPSYS_AXS10X_H + +enum { + AXS_MB_V2, + AXS_MB_V3 +}; + +#endif /* _BOARD_SYNOPSYS_AXS10X_H */ + diff --git a/board/synopsys/axs101/nand.c b/board/synopsys/axs101/nand.c index ff35286..4be52e2 100644 --- a/board/synopsys/axs101/nand.c +++ b/board/synopsys/axs101/nand.c @@ -9,6 +9,9 @@ #include <malloc.h> #include <nand.h> #include <asm/io.h> +#include "axs10x.h" + +DECLARE_GLOBAL_DATA_PTR; #define BUS_WIDTH 8 /* AXI data bus width in bytes */ @@ -232,5 +235,9 @@ int board_nand_init(struct nand_chip *nand) nand->write_buf = axs101_nand_write_buf; nand->read_buf = axs101_nand_read_buf; + /* MBv3 has NAND IC with 16-bit data bus */ + if (gd->board_type == AXS_MB_V3) + nand->options |= NAND_BUSWIDTH_16; + return 0; } diff --git a/include/configs/axs101.h b/include/configs/axs101.h index 5fb8aca..8a7095c 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs101.h @@ -34,6 +34,12 @@ #define CONFIG_SYS_LOAD_ADDR 0x82000000 /* + * This board might be of different versions so handle it + */ +#define CONFIG_BOARD_TYPES +#define CONFIG_BOARD_EARLY_INIT_F + +/* * NAND Flash configuration */ #define CONFIG_SYS_NO_FLASH |