August 2016 - U-Boot

[U-Boot] [PATCH v2] SPL: tiny-printf: avoid any BSS usage
by Andre Przywara 06 Aug '16

06 Aug '16

As printf calls may be executed quite early, we should avoid using any BSS stored variables, since some boards put BSS in DRAM, which may not have been initialised yet. Explicitly mark those "static global" variables as belonging to the .data section, to keep tiny-printf clear of any BSS usage. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- Changes v1 .. v2: - remove NO_BSS macro, use __attribute__ ... directly instead lib/tiny-printf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c index 451f4f7..b334f05 100644 --- a/lib/tiny-printf.c +++ b/lib/tiny-printf.c @@ -13,11 +13,16 @@ #include <stdarg.h> #include <serial.h> -static char *bf; -static char zs; +/* + * This code in here may execute before the DRAM is initialised, so + * we should make sure that it doesn't touch BSS, which some boards + * put in DRAM. + */ +static char *bf __attribute__ ((section(".data"))); +static char zs __attribute__ ((section(".data"))); /* Current position in sprintf() output string */ -static char *outstr; +static char *outstr __attribute__ ((section(".data"))); static void out(char c) { -- 2.8.2

5 9

[U-Boot] [PATCH] x86: bayleybay: Add PS/2 keyboard and mouse to ASL file
by Bin Meng 06 Aug '16

06 Aug '16

Without PS/2 keyboard and mouse in the ASL file, Windows does not see them. No problem for Linux as it probes keyboard and mouse via the legacy 8042 I/O port. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- board/intel/bayleybay/acpi/mainboard.asl | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/board/intel/bayleybay/acpi/mainboard.asl b/board/intel/bayleybay/acpi/mainboard.asl index 21785ea..8b7ee3f 100644 --- a/board/intel/bayleybay/acpi/mainboard.asl +++ b/board/intel/bayleybay/acpi/mainboard.asl @@ -9,3 +9,41 @@ Device (PWRB) { Name(_HID, EISAID("PNP0C0C")) } + +/* PS/2 keyboard and mouse */ +Scope (\_SB.PCI0.LPCB) +{ + /* 8042 Keyboard */ + Device (PS2K) + { + Name(_HID, EISAID("PNP0303")) + Name(_CRS, ResourceTemplate() + { + IO(Decode16, 0x60, 0x60, 0x00, 0x01) + IO(Decode16, 0x64, 0x64, 0x00, 0x01) + IRQNoFlags() { 1 } + }) + + Method(_STA, 0, Serialized) + { + Return (STA_VISIBLE) + } + } + + /* 8042 Mouse */ + Device (PS2M) + { + Name(_HID, EISAID("PNP0F03")) + Name(_CRS, ResourceTemplate() + { + IO(Decode16, 0x60, 0x60, 0x00, 0x01) + IO(Decode16, 0x64, 0x64, 0x00, 0x01) + IRQNoFlags() { 12 } + }) + + Method(_STA, 0, Serialized) + { + Return (STA_VISIBLE) + } + } +} -- 1.8.2.1

2 2

[U-Boot] [PATCH] Bug in cbfs
by Yaroslav K. 06 Aug '16

06 Aug '16

cbfs: Fix incorrect CBFS file header size being used This fixes incorrect filenames in cbfsls output. Signed-off-by: Yaroslav K. <yar444(a)gmail.com> --- fs/cbfs/cbfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c index 95a48a4..bfe8e2c 100644 --- a/fs/cbfs/cbfs.c +++ b/fs/cbfs/cbfs.c @@ -97,7 +97,7 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align, } swap_file_header(&header, fileHeader); - if (header.offset < sizeof(const struct cbfs_cachenode *) || + if (header.offset < sizeof(struct cbfs_fileheader) || header.offset > header.len) { file_cbfs_result = CBFS_BAD_FILE; return -1; @@ -106,9 +106,9 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align, newNode->type = header.type; newNode->data = start + header.offset; newNode->data_length = header.len; - name_len = header.offset - sizeof(struct cbfs_cachenode *); + name_len = header.offset - sizeof(struct cbfs_fileheader); newNode->name = (char *)fileHeader + - sizeof(struct cbfs_cachenode *); + sizeof(struct cbfs_fileheader); newNode->name_length = name_len; newNode->checksum = header.checksum; -- 1.9.1

3 2

[U-Boot] [PATCH] arm: omap5: am57/dra7: Fix SRAM_SCRATCH_SPACE_ADDR and SRAM_ROM_VECT_BASE
by Andrew Bradford 05 Aug '16

05 Aug '16

From: Andrew Bradford <andrew.bradford(a)kodakalaris.com> Both am57xx and dra7xx have 512 kiB of SRAM and the mapping within that SRAM is the same as omap5 (which has only 128 kiB) except for a much larger "Download image" area. So, fix am57xx and dra7xx location for SRAM_SCRATCH_SPACE_ADDR to mimmic omap5's locating of this area to a memory region defined by the TRM as "Reserved" immediately following the "Download image" region and fix the ROM code interrupt vector address SRAM_ROM_VECT_BASE to properly match the TRM. Signed-off-by: Andrew Bradford <andrew.bradford(a)kodakalaris.com> --- arch/arm/include/asm/arch-omap5/omap.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h index 2fd5cda..b9e4783 100644 --- a/arch/arm/include/asm/arch-omap5/omap.h +++ b/arch/arm/include/asm/arch-omap5/omap.h @@ -179,21 +179,19 @@ struct s32ktimer { * and indicates the area for the downloaded image. We use all of that * space for download and once up and running may use other parts of the * map for our needs. We set a scratch space that is at the end of the - * OMAP5 download area, but within the DRA7xx download area (as it is - * much larger) and do not, at this time, make use of the additional - * space. + * download area in an area marked reserved in the TRM. */ #if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) #define NON_SECURE_SRAM_START 0x40300000 #define NON_SECURE_SRAM_END 0x40380000 /* Not inclusive */ +#define SRAM_SCRATCH_SPACE_ADDR 0x4037E000 +#define SRAM_ROM_VECT_BASE 0x4037F000 #else #define NON_SECURE_SRAM_START 0x40300000 #define NON_SECURE_SRAM_END 0x40320000 /* Not inclusive */ -#endif #define SRAM_SCRATCH_SPACE_ADDR 0x4031E000 - -/* base address for indirect vectors (internal boot mode) */ #define SRAM_ROM_VECT_BASE 0x4031F000 +#endif /* CONTROL_SRCOMP_XXX_SIDE */ #define OVERRIDE_XS_SHIFT 30 -- 2.8.1

2 1

[U-Boot] [PATCH 1/9] ARM: tegra: adapt to latest HSP DT binding
by Stephen Warren 05 Aug '16

05 Aug '16

From: Stephen Warren <swarren(a)nvidia.com> The DT binding for the Tegra186 HSP module apparently wasn't quite final when I posted initial U-Boot support for it. Add the final DT binding doc and adapt all code and DT files to match it. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/dts/tegra186.dtsi | 10 ++--- .../mailbox/nvidia,tegra186-hsp.txt | 52 ++++++++++++++++++++++ drivers/mailbox/tegra-hsp.c | 47 +++++++++++++++---- include/dt-bindings/mailbox/tegra-hsp.h | 14 ------ include/dt-bindings/mailbox/tegra186-hsp.h | 19 ++++++++ 5 files changed, 113 insertions(+), 29 deletions(-) create mode 100644 doc/device-tree-bindings/mailbox/nvidia,tegra186-hsp.txt delete mode 100644 include/dt-bindings/mailbox/tegra-hsp.h create mode 100644 include/dt-bindings/mailbox/tegra186-hsp.h diff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi index 99d49254b36b..650feb60b1ab 100644 --- a/arch/arm/dts/tegra186.dtsi +++ b/arch/arm/dts/tegra186.dtsi @@ -1,7 +1,7 @@ #include "skeleton.dtsi" #include <dt-bindings/gpio/tegra186-gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/mailbox/tegra-hsp.h> +#include <dt-bindings/mailbox/tegra186-hsp.h> / { compatible = "nvidia,tegra186"; @@ -45,12 +45,8 @@ compatible = "nvidia,tegra186-hsp"; reg = <0x0 0x03c00000 0x0 0xa0000>; interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>; - nvidia,num-SM = <0x8>; - nvidia,num-AS = <0x2>; - nvidia,num-SS = <0x2>; - nvidia,num-DB = <0x7>; - nvidia,num-SI = <0x8>; - #mbox-cells = <1>; + interrupt-names = "doorbell"; + #mbox-cells = <2>; }; gpio@c2f0000 { diff --git a/doc/device-tree-bindings/mailbox/nvidia,tegra186-hsp.txt b/doc/device-tree-bindings/mailbox/nvidia,tegra186-hsp.txt new file mode 100644 index 000000000000..a9152380642d --- /dev/null +++ b/doc/device-tree-bindings/mailbox/nvidia,tegra186-hsp.txt @@ -0,0 +1,52 @@ +NVIDIA Tegra Hardware Synchronization Primitives (HSP) + +The HSP modules are used for the processors to share resources and communicate +together. It provides a set of hardware synchronization primitives for +interprocessor communication. So the interprocessor communication (IPC) +protocols can use hardware synchronization primitives, when operating between +two processors not in an SMP relationship. + +The features that HSP supported are shared mailboxes, shared semaphores, +arbitrated semaphores and doorbells. + +Required properties: +- name : Should be hsp +- compatible + Array of strings. + one of: + - "nvidia,tegra186-hsp" +- reg : Offset and length of the register set for the device. +- interrupt-names + Array of strings. + Contains a list of names for the interrupts described by the interrupt + property. May contain the following entries, in any order: + - "doorbell" + Users of this binding MUST look up entries in the interrupt property + by name, using this interrupt-names property to do so. +- interrupts + Array of interrupt specifiers. + Must contain one entry per entry in the interrupt-names property, + in a matching order. +- #mbox-cells : Should be 2. + +The mbox specifier of the "mboxes" property in the client node should +contain two data. The first one should be the HSP type and the second +one should be the ID that the client is going to use. Those information +can be found in the following file. + +- <dt-bindings/mailbox/tegra186-hsp.h>. + +Example: + +hsp_top0: hsp@3c00000 { + compatible = "nvidia,tegra186-hsp"; + reg = <0x0 0x03c00000 0x0 0xa0000>; + interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "doorbell"; + #mbox-cells = <2>; +}; + +client { + ... + mboxes = <&hsp_top0 HSP_MBOX_TYPE_DB HSP_DB_MASTER_XXX>; +}; diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c index 5c781a50b6ac..3d0362d58740 100644 --- a/drivers/mailbox/tegra-hsp.c +++ b/drivers/mailbox/tegra-hsp.c @@ -8,7 +8,19 @@ #include <asm/io.h> #include <dm.h> #include <mailbox-uclass.h> -#include <dt-bindings/mailbox/tegra-hsp.h> +#include <dt-bindings/mailbox/tegra186-hsp.h> + +#define TEGRA_HSP_INT_DIMENSIONING 0x380 +#define TEGRA_HSP_INT_DIMENSIONING_NSI_SHIFT 16 +#define TEGRA_HSP_INT_DIMENSIONING_NSI_MASK 0xf +#define TEGRA_HSP_INT_DIMENSIONING_NDB_SHIFT 12 +#define TEGRA_HSP_INT_DIMENSIONING_NDB_MASK 0xf +#define TEGRA_HSP_INT_DIMENSIONING_NAS_SHIFT 8 +#define TEGRA_HSP_INT_DIMENSIONING_NAS_MASK 0xf +#define TEGRA_HSP_INT_DIMENSIONING_NSS_SHIFT 4 +#define TEGRA_HSP_INT_DIMENSIONING_NSS_MASK 0xf +#define TEGRA_HSP_INT_DIMENSIONING_NSM_SHIFT 0 +#define TEGRA_HSP_INT_DIMENSIONING_NSM_MASK 0xf #define TEGRA_HSP_DB_REG_TRIGGER 0x0 #define TEGRA_HSP_DB_REG_ENABLE 0x4 @@ -51,7 +63,7 @@ static void tegra_hsp_writel(struct tegra_hsp *thsp, uint32_t val, static int tegra_hsp_db_id(ulong chan_id) { switch (chan_id) { - case TEGRA_HSP_MASTER_BPMP: + case (HSP_MBOX_TYPE_DB << 16) | HSP_DB_MASTER_BPMP: return TEGRA_HSP_DB_ID_BPMP; default: debug("Invalid channel ID\n"); @@ -59,6 +71,21 @@ static int tegra_hsp_db_id(ulong chan_id) } } +static int tegra_hsp_of_xlate(struct mbox_chan *chan, + struct fdtdec_phandle_args *args) +{ + debug("%s(chan=%p)\n", __func__, chan); + + if (args->args_count != 2) { + debug("Invaild args_count: %d\n", args->args_count); + return -EINVAL; + } + + chan->id = (args->args[0] << 16) | args->args[1]; + + return 0; +} + static int tegra_hsp_request(struct mbox_chan *chan) { int db_id; @@ -121,6 +148,7 @@ static int tegra_hsp_bind(struct udevice *dev) static int tegra_hsp_probe(struct udevice *dev) { struct tegra_hsp *thsp = dev_get_priv(dev); + u32 val; int nr_sm, nr_ss, nr_as; debug("%s(dev=%p)\n", __func__, dev); @@ -129,12 +157,14 @@ static int tegra_hsp_probe(struct udevice *dev) if (thsp->regs == FDT_ADDR_T_NONE) return -ENODEV; - nr_sm = fdtdec_get_int(gd->fdt_blob, dev->of_offset, "nvidia,num-SM", - 0); - nr_ss = fdtdec_get_int(gd->fdt_blob, dev->of_offset, "nvidia,num-SS", - 0); - nr_as = fdtdec_get_int(gd->fdt_blob, dev->of_offset, "nvidia,num-AS", - 0); + val = readl(thsp->regs + TEGRA_HSP_INT_DIMENSIONING); + nr_sm = (val >> TEGRA_HSP_INT_DIMENSIONING_NSM_SHIFT) & + TEGRA_HSP_INT_DIMENSIONING_NSM_MASK; + nr_ss = (val >> TEGRA_HSP_INT_DIMENSIONING_NSS_SHIFT) & + TEGRA_HSP_INT_DIMENSIONING_NSS_MASK; + nr_as = (val >> TEGRA_HSP_INT_DIMENSIONING_NAS_SHIFT) & + TEGRA_HSP_INT_DIMENSIONING_NAS_MASK; + thsp->db_base = (1 + (nr_sm >> 1) + nr_ss + nr_as) << 16; return 0; @@ -146,6 +176,7 @@ static const struct udevice_id tegra_hsp_ids[] = { }; struct mbox_ops tegra_hsp_mbox_ops = { + .of_xlate = tegra_hsp_of_xlate, .request = tegra_hsp_request, .free = tegra_hsp_free, .send = tegra_hsp_send, diff --git a/include/dt-bindings/mailbox/tegra-hsp.h b/include/dt-bindings/mailbox/tegra-hsp.h deleted file mode 100644 index e8c23fa91d23..000000000000 --- a/include/dt-bindings/mailbox/tegra-hsp.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This header provides constants for binding nvidia,tegra186-hsp. - * - * The number with TEGRA_HSP_MASTER prefix indicates the bit that is - * associated with a master ID in the doorbell registers. - */ - -#ifndef _DT_BINDINGS_MAILBOX_TEGRA186_HSP_H -#define _DT_BINDINGS_MAILBOX_TEGRA186_HSP_H - -#define TEGRA_HSP_MASTER_CCPLEX 17 -#define TEGRA_HSP_MASTER_BPMP 19 - -#endif diff --git a/include/dt-bindings/mailbox/tegra186-hsp.h b/include/dt-bindings/mailbox/tegra186-hsp.h new file mode 100644 index 000000000000..b4864325d74b --- /dev/null +++ b/include/dt-bindings/mailbox/tegra186-hsp.h @@ -0,0 +1,19 @@ +/* + * This header provides constants for binding nvidia,tegra186-hsp. + * + * The number with HSP_DB_MASTER prefix indicates the bit that is + * associated with a master ID in the doorbell registers. + */ + +#ifndef _DT_BINDINGS_MAILBOX_TEGRA186_HSP_H +#define _DT_BINDINGS_MAILBOX_TEGRA186_HSP_H + +#define HSP_MBOX_TYPE_DB 0x0 +#define HSP_MBOX_TYPE_SM 0x1 +#define HSP_MBOX_TYPE_SS 0x2 +#define HSP_MBOX_TYPE_AS 0x3 + +#define HSP_DB_MASTER_CCPLEX 17 +#define HSP_DB_MASTER_BPMP 19 + +#endif -- 2.9.2

4 29

[U-Boot] [PATCH 0/4] Allow disabling non-FIT image loading from SPL
by Andrew F. Davis 05 Aug '16

05 Aug '16

Hello all, To address a needed feature brought up by Andreas[0], we need a way to disable SPL from loading non-FIT images. The function spl_parse_image_header is common to all SPL loading paths (common/spl/spl_(nand|net|nor|etc..)) so we add the check here, much like the existing CONFIG_SPL_PANIC_ON_RAW_IMAGE. My original attempt was to add CONFIG_SPL_PANIC_ON_MKIMAGE, but then if other formats are added, flaws in restricting image types may be introduced, so we would like a single option to restrict all non-FIT types vs disabling types individually. Thanks, Andrew [0]: https://www.mail-archive.com/u-boot@lists.denx.de/msg219253.html Andrew F. Davis (4): Introduce CONFIG_SPL_PANIC_ON_NON_FIT_IMAGE ARM: AM57xx: Disable non-FIT based image loading for HS devices ARM: AM437x: Disable non-FIT based image loading for HS devices ARM: DRA7xx: Disable non-FIT based image loading for HS devices Kconfig | 8 ++++++++ common/spl/spl.c | 4 ++++ configs/am43xx_hs_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + 5 files changed, 15 insertions(+) -- 2.9.2

3 10

[U-Boot] An anomaly in image booting code
by Champ, Andy 05 Aug '16

05 Aug '16

In common/bootm.c there's a function do_bootm_states. Among other things this sets the global variable images->states to the supplied states. If those states include the flag BOOTM_START it then calls a function bootm_start, which then memset-s the whole of state to zero before setting the flag BOOTM_STATE_START. This code has been there for a few years now, so it obviously doesn't break anything major - but what is it supposed to do? -- Andy Champ

2 1

[U-Boot] [PATCH 0/7] net/ethoc improvements
by Max Filippov 05 Aug '16

05 Aug '16

Hello, this series does the following improvements to the OpenCores 10/100 Mbps driver: - add Kconfig symbol for the driver; - add DM_ETH support; - add device tree support; - add optional phylib support; - add support for configurations with private packet memory; - clean up virtual/physical address usage. Please review. Max Filippov (7): net/ethoc: add Kconfig entry for the driver net/ethoc: use priv instead of dev internally net/ethoc: add CONFIG_DM_ETH support net/ethoc: support device tree net/ethoc: don't mix virtual and physical addresses net/ethoc: support private memory configurations net/ethoc: implement MDIO bus and support phylib configs/openrisc-generic_defconfig | 2 + drivers/net/Kconfig | 5 + drivers/net/ethoc.c | 522 ++++++++++++++++++++++++++++------- include/configs/openrisc-generic.h | 1 - include/dm/platform_data/net_ethoc.h | 21 ++ 5 files changed, 450 insertions(+), 101 deletions(-) create mode 100644 include/dm/platform_data/net_ethoc.h -- 2.1.4

4 19

[U-Boot] [PATCH] arc: Rename AXS101 board to more generic AXS10x
by Alexey Brodkin 05 Aug '16

05 Aug '16

As of now we have 2 flavors of ARC SDP boards: 1) AXS101 - with ARC770 in ASIC 2) AXS103 - with ARC HS38 in FPGA Both options share exactly the same base-board and only differ with CPU-tiles in use. That means all peripherals are the same (they are implemented in FPGA on the base-board) and so generic board could be used for both. While at it: * Recreated defconfigs with savedefconfig * In include/configs/axs10x.h numerical sizes replaced with defines from linux/sizes.h for better readability. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Tom Rini <trini(a)konsulko.com> --- arch/arc/Kconfig | 8 ++++---- arch/arc/dts/Makefile | 2 +- board/synopsys/axs101/Makefile | 8 -------- board/synopsys/{axs101 => axs10x}/Kconfig | 6 +++--- board/synopsys/{axs101 => axs10x}/MAINTAINERS | 6 +++--- board/synopsys/axs10x/Makefile | 8 ++++++++ board/synopsys/{axs101/axs101.c => axs10x/axs10x.c} | 0 board/synopsys/{axs101 => axs10x}/axs10x.h | 0 board/synopsys/{axs101 => axs10x}/nand.c | 0 configs/axs101_defconfig | 2 +- configs/axs103_defconfig | 2 +- include/configs/{axs101.h => axs10x.h} | 19 ++++++++++--------- 12 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 board/synopsys/axs101/Makefile rename board/synopsys/{axs101 => axs10x}/Kconfig (62%) rename board/synopsys/{axs101 => axs10x}/MAINTAINERS (62%) create mode 100644 board/synopsys/axs10x/Makefile rename board/synopsys/{axs101/axs101.c => axs10x/axs10x.c} (100%) rename board/synopsys/{axs101 => axs10x}/axs10x.h (100%) rename board/synopsys/{axs101 => axs10x}/nand.c (100%) rename include/configs/{axs101.h => axs10x.h} (88%) diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index b81d0ca..4c5696b 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -118,7 +118,7 @@ config SYS_DCACHE_OFF choice prompt "Target select" - default TARGET_AXS101 + default TARGET_AXS10X config TARGET_TB100 bool "Support tb100" @@ -126,13 +126,13 @@ config TARGET_TB100 config TARGET_NSIM bool "Support standalone nSIM & Free nSIM" -config TARGET_AXS101 - bool "Support axs101" +config TARGET_AXS10X + bool "Support Synopsys Designware SDP board (AXS101 & AXS103)" endchoice source "board/abilis/tb100/Kconfig" source "board/synopsys/Kconfig" -source "board/synopsys/axs101/Kconfig" +source "board/synopsys/axs10x/Kconfig" endmenu diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile index 196f882..1d94c08 100644 --- a/arch/arc/dts/Makefile +++ b/arch/arc/dts/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -dtb-$(CONFIG_TARGET_AXS101) += axs10x.dtb +dtb-$(CONFIG_TARGET_AXS10X) += axs10x.dtb dtb-$(CONFIG_TARGET_NSIM) += nsim.dtb dtb-$(CONFIG_TARGET_TB100) += abilis_tb100.dtb diff --git a/board/synopsys/axs101/Makefile b/board/synopsys/axs101/Makefile deleted file mode 100644 index f0965f7..0000000 --- a/board/synopsys/axs101/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += axs101.o -obj-$(CONFIG_CMD_NAND) += nand.o diff --git a/board/synopsys/axs101/Kconfig b/board/synopsys/axs10x/Kconfig similarity index 62% rename from board/synopsys/axs101/Kconfig rename to board/synopsys/axs10x/Kconfig index 79e5400..c60b6a2 100644 --- a/board/synopsys/axs101/Kconfig +++ b/board/synopsys/axs10x/Kconfig @@ -1,12 +1,12 @@ -if TARGET_AXS101 +if TARGET_AXS10X config SYS_BOARD - default "axs101" + default "axs10x" config SYS_VENDOR default "synopsys" config SYS_CONFIG_NAME - default "axs101" + default "axs10x" endif diff --git a/board/synopsys/axs101/MAINTAINERS b/board/synopsys/axs10x/MAINTAINERS similarity index 62% rename from board/synopsys/axs101/MAINTAINERS rename to board/synopsys/axs10x/MAINTAINERS index 79fff8e..abb890b 100644 --- a/board/synopsys/axs101/MAINTAINERS +++ b/board/synopsys/axs10x/MAINTAINERS @@ -1,7 +1,7 @@ -AXS101 BOARD +AXS10X BOARD M: Alexey Brodkin <abrodkin(a)synopsys.com> S: Maintained -F: board/synopsys/axs101/ -F: include/configs/axs101.h +F: board/synopsys/axs10x/ +F: include/configs/axs10x.h F: configs/axs101_defconfig F: configs/axs103_defconfig diff --git a/board/synopsys/axs10x/Makefile b/board/synopsys/axs10x/Makefile new file mode 100644 index 0000000..e29d520 --- /dev/null +++ b/board/synopsys/axs10x/Makefile @@ -0,0 +1,8 @@ +# +# Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += axs10x.o +obj-$(CONFIG_CMD_NAND) += nand.o diff --git a/board/synopsys/axs101/axs101.c b/board/synopsys/axs10x/axs10x.c similarity index 100% rename from board/synopsys/axs101/axs101.c rename to board/synopsys/axs10x/axs10x.c diff --git a/board/synopsys/axs101/axs10x.h b/board/synopsys/axs10x/axs10x.h similarity index 100% rename from board/synopsys/axs101/axs10x.h rename to board/synopsys/axs10x/axs10x.h diff --git a/board/synopsys/axs101/nand.c b/board/synopsys/axs10x/nand.c similarity index 100% rename from board/synopsys/axs101/nand.c rename to board/synopsys/axs10x/nand.c diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index 10e802d..dd82581 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -1,7 +1,7 @@ CONFIG_ARC=y CONFIG_SYS_DCACHE_OFF=y -CONFIG_DM_SERIAL=y CONFIG_SYS_CLK_FREQ=750000000 +CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x81000000 CONFIG_DEFAULT_DEVICE_TREE="axs10x" CONFIG_BOOTDELAY=3 diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index c8474de..8977f81 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -1,7 +1,7 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y -CONFIG_DM_SERIAL=y CONFIG_SYS_CLK_FREQ=100000000 +CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x81000000 CONFIG_DEFAULT_DEVICE_TREE="axs10x" CONFIG_BOOTDELAY=3 diff --git a/include/configs/axs101.h b/include/configs/axs10x.h similarity index 88% rename from include/configs/axs101.h rename to include/configs/axs10x.h index c0b68e2..b99248e 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs10x.h @@ -1,12 +1,13 @@ /* - * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. + * Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved. * * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef _CONFIG_AXS101_H_ -#define _CONFIG_AXS101_H_ +#ifndef _CONFIG_AXS10X_H_ +#define _CONFIG_AXS10X_H_ +#include <linux/sizes.h> /* * CPU configuration */ @@ -24,13 +25,13 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_SYS_SDRAM_SIZE 0x20000000 /* 512 Mb */ +#define CONFIG_SYS_SDRAM_SIZE SZ_512M #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN 0x200000 /* 2 MB */ -#define CONFIG_SYS_BOOTM_LEN 0x2000000 /* 32 MB */ +#define CONFIG_SYS_MALLOC_LEN SZ_2M +#define CONFIG_SYS_BOOTM_LEN SZ_32M #define CONFIG_SYS_LOAD_ADDR 0x82000000 /* @@ -113,7 +114,7 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_EEPROM -#define CONFIG_ENV_SIZE 0x00200 /* 512 bytes */ +#define CONFIG_ENV_SIZE SZ_512 #define CONFIG_ENV_OFFSET 0 /* @@ -127,7 +128,7 @@ * Console configuration */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_CBSIZE SZ_256 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) @@ -137,4 +138,4 @@ */ #define CONFIG_BOUNCE_BUFFER -#endif /* _CONFIG_AXS101_H_ */ +#endif /* _CONFIG_AXS10X_H_ */ -- 2.7.4

2 3

[U-Boot] [PATCH] arc: Rename ARCangel4 board to nSIM
by Alexey Brodkin 05 Aug '16

05 Aug '16

ARCangel was one of the main development boards back in the day but now it's gone and replaced by other boards like ARC SDP. But we also used to have simulation platform very similar to ARCangel4 in terms of CPU settings as well as basic IO like UART. Even though ARCangel4 is long gone now we have a replacement for simulation which is a plain or stand-alone nSIM and Free nSIM. Note Free nSIM is available for download here: https://www.synopsys.com/cgi-bin/dwarcnsim/req1.cgi And while at it: * Finally switch hex numerical values in nsim.h to defines from include/linux/sizes.h * Add defconfigs with ARC HS38 cores * Recreated all defconfigs with savedefconfig Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- arch/arc/Kconfig | 4 ++-- arch/arc/dts/Makefile | 2 +- arch/arc/dts/{arcangel4.dts => nsim.dts} | 2 +- board/synopsys/Kconfig | 4 ++-- board/synopsys/MAINTAINERS | 8 +++++--- configs/{arcangel4_defconfig => nsim_700_defconfig} | 8 ++++---- .../{arcangel4-be_defconfig => nsim_700be_defconfig} | 7 ++++--- .../{arcangel4-be_defconfig => nsim_hs38_defconfig} | 9 +++++---- ...{arcangel4-be_defconfig => nsim_hs38be_defconfig} | 8 +++++--- include/configs/{arcangel4.h => nsim.h} | 20 +++++++++++--------- 10 files changed, 40 insertions(+), 32 deletions(-) rename arch/arc/dts/{arcangel4.dts => nsim.dts} (83%) rename configs/{arcangel4_defconfig => nsim_700_defconfig} (74%) copy configs/{arcangel4-be_defconfig => nsim_700be_defconfig} (78%) copy configs/{arcangel4-be_defconfig => nsim_hs38_defconfig} (73%) rename configs/{arcangel4-be_defconfig => nsim_hs38be_defconfig} (75%) rename include/configs/{arcangel4.h => nsim.h} (74%) diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index f1dc6c8..b81d0ca 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -123,8 +123,8 @@ choice config TARGET_TB100 bool "Support tb100" -config TARGET_ARCANGEL4 - bool "Support arcangel4" +config TARGET_NSIM + bool "Support standalone nSIM & Free nSIM" config TARGET_AXS101 bool "Support axs101" diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile index d4772ec..196f882 100644 --- a/arch/arc/dts/Makefile +++ b/arch/arc/dts/Makefile @@ -3,7 +3,7 @@ # dtb-$(CONFIG_TARGET_AXS101) += axs10x.dtb -dtb-$(CONFIG_TARGET_ARCANGEL4) += arcangel4.dtb +dtb-$(CONFIG_TARGET_NSIM) += nsim.dtb dtb-$(CONFIG_TARGET_TB100) += abilis_tb100.dtb targets += $(dtb-y) diff --git a/arch/arc/dts/arcangel4.dts b/arch/arc/dts/nsim.dts similarity index 83% rename from arch/arc/dts/arcangel4.dts rename to arch/arc/dts/nsim.dts index bfcb9d8..69e16c2 100644 --- a/arch/arc/dts/arcangel4.dts +++ b/arch/arc/dts/nsim.dts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Synopsys, Inc. (www.synopsys.com) + * Copyright (C) 2015-2016 Synopsys, Inc. (www.synopsys.com) * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/synopsys/Kconfig b/board/synopsys/Kconfig index 8ab48cd..27e5509 100644 --- a/board/synopsys/Kconfig +++ b/board/synopsys/Kconfig @@ -1,9 +1,9 @@ -if TARGET_ARCANGEL4 +if TARGET_NSIM config SYS_VENDOR default "synopsys" config SYS_CONFIG_NAME - default "arcangel4" + default "nsim" endif diff --git a/board/synopsys/MAINTAINERS b/board/synopsys/MAINTAINERS index 43114ce..b9bfd3c 100644 --- a/board/synopsys/MAINTAINERS +++ b/board/synopsys/MAINTAINERS @@ -1,6 +1,8 @@ - BOARD M: Alexey Brodkin <abrodkin(a)synopsys.com> S: Maintained -F: include/configs/arcangel4.h -F: configs/arcangel4_defconfig -F: configs/arcangel4-be_defconfig +F: include/configs/nsim.h +F: configs/nsim_700_defconfig +F: configs/nsim_700be_defconfig +F: configs/nsim_hs38_defconfig +F: configs/nsim_hs38be_defconfig diff --git a/configs/arcangel4_defconfig b/configs/nsim_700_defconfig similarity index 74% rename from configs/arcangel4_defconfig rename to configs/nsim_700_defconfig index efa55d0..202f77c 100644 --- a/configs/arcangel4_defconfig +++ b/configs/nsim_700_defconfig @@ -1,11 +1,11 @@ CONFIG_ARC=y -CONFIG_TARGET_ARCANGEL4=y -CONFIG_DM_SERIAL=y +CONFIG_TARGET_NSIM=y CONFIG_SYS_CLK_FREQ=70000000 +CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x81000000 -CONFIG_DEFAULT_DEVICE_TREE="arcangel4" +CONFIG_DEFAULT_DEVICE_TREE="nsim" CONFIG_BOOTDELAY=3 -CONFIG_SYS_PROMPT="arcangel4# " +CONFIG_SYS_PROMPT="nsim# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/arcangel4-be_defconfig b/configs/nsim_700be_defconfig similarity index 78% copy from configs/arcangel4-be_defconfig copy to configs/nsim_700be_defconfig index c0c2e4b..b7f7924 100644 --- a/configs/arcangel4-be_defconfig +++ b/configs/nsim_700be_defconfig @@ -1,11 +1,12 @@ CONFIG_ARC=y CONFIG_CPU_BIG_ENDIAN=y -CONFIG_TARGET_ARCANGEL4=y -CONFIG_DM_SERIAL=y +CONFIG_TARGET_NSIM=y CONFIG_SYS_CLK_FREQ=70000000 +CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x81000000 -CONFIG_DEFAULT_DEVICE_TREE="arcangel4" +CONFIG_DEFAULT_DEVICE_TREE="nsim" CONFIG_BOOTDELAY=3 +CONFIG_SYS_PROMPT="nsim# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/arcangel4-be_defconfig b/configs/nsim_hs38_defconfig similarity index 73% copy from configs/arcangel4-be_defconfig copy to configs/nsim_hs38_defconfig index c0c2e4b..6b448ef 100644 --- a/configs/arcangel4-be_defconfig +++ b/configs/nsim_hs38_defconfig @@ -1,11 +1,12 @@ CONFIG_ARC=y -CONFIG_CPU_BIG_ENDIAN=y -CONFIG_TARGET_ARCANGEL4=y -CONFIG_DM_SERIAL=y +CONFIG_ISA_ARCV2=y +CONFIG_TARGET_NSIM=y CONFIG_SYS_CLK_FREQ=70000000 +CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x81000000 -CONFIG_DEFAULT_DEVICE_TREE="arcangel4" +CONFIG_DEFAULT_DEVICE_TREE="nsim" CONFIG_BOOTDELAY=3 +CONFIG_SYS_PROMPT="nsim# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/arcangel4-be_defconfig b/configs/nsim_hs38be_defconfig similarity index 75% rename from configs/arcangel4-be_defconfig rename to configs/nsim_hs38be_defconfig index c0c2e4b..3e1c599 100644 --- a/configs/arcangel4-be_defconfig +++ b/configs/nsim_hs38be_defconfig @@ -1,11 +1,13 @@ CONFIG_ARC=y +CONFIG_ISA_ARCV2=y CONFIG_CPU_BIG_ENDIAN=y -CONFIG_TARGET_ARCANGEL4=y -CONFIG_DM_SERIAL=y +CONFIG_TARGET_NSIM=y CONFIG_SYS_CLK_FREQ=70000000 +CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x81000000 -CONFIG_DEFAULT_DEVICE_TREE="arcangel4" +CONFIG_DEFAULT_DEVICE_TREE="nsim" CONFIG_BOOTDELAY=3 +CONFIG_SYS_PROMPT="nsim# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set diff --git a/include/configs/arcangel4.h b/include/configs/nsim.h similarity index 74% rename from include/configs/arcangel4.h rename to include/configs/nsim.h index d608104..1edc560 100644 --- a/include/configs/arcangel4.h +++ b/include/configs/nsim.h @@ -1,11 +1,13 @@ /* - * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. + * Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved. * * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef _CONFIG_ARCANGEL4_H_ -#define _CONFIG_ARCANGEL4_H_ +#ifndef _CONFIG_NSIM_H_ +#define _CONFIG_NSIM_H_ + +#include <linux/sizes.h> /* * CPU configuration @@ -19,13 +21,13 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_SYS_SDRAM_SIZE 0x10000000 /* 256 Mb */ +#define CONFIG_SYS_SDRAM_SIZE SZ_256M #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN 0x200000 /* 2 MB */ -#define CONFIG_SYS_BOOTM_LEN 0x2000000 /* 32 MB */ +#define CONFIG_SYS_MALLOC_LEN SZ_2M +#define CONFIG_SYS_BOOTM_LEN SZ_32M #define CONFIG_SYS_LOAD_ADDR 0x82000000 #define CONFIG_SYS_NO_FLASH @@ -48,7 +50,7 @@ * Environment settings */ #define CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_SIZE 0x00200 /* 512 bytes */ +#define CONFIG_ENV_SIZE SZ_512 #define CONFIG_ENV_OFFSET 0 /* @@ -62,9 +64,9 @@ * Console configuration */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_CBSIZE SZ_256 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -#endif /* _CONFIG_ARCANGEL4_H_ */ +#endif /* _CONFIG_NSIM_H_ */ -- 2.7.4

1 1