Skip to content

Commit

Permalink
emdk->emsdp: Rename board
Browse files Browse the repository at this point in the history
Real marketing name of the board was recently updated so
to accommodate that change renaming the board and all
related to it.

Signed-off-by: Alexey Brodkin <[email protected]>
  • Loading branch information
abrodkin committed Nov 1, 2018
1 parent fdaccfe commit adc9b09
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 33 deletions.
6 changes: 3 additions & 3 deletions arch/arc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ config TARGET_AXS101
config TARGET_AXS103
bool "Support Synopsys Designware SDP board AXS103"

config TARGET_EMDK
bool "Synopsys EM Development kit"
config TARGET_EMSDP
bool "Synopsys EM Software Development Platform"
select CPU_ARCEM6

config TARGET_HSDK
Expand All @@ -166,7 +166,7 @@ endchoice
source "board/abilis/tb100/Kconfig"
source "board/synopsys/Kconfig"
source "board/synopsys/axs10x/Kconfig"
source "board/synopsys/emdk/Kconfig"
source "board/synopsys/emsdp/Kconfig"
source "board/synopsys/hsdk/Kconfig"
source "board/synopsys/iot_devkit/Kconfig"

Expand Down
2 changes: 1 addition & 1 deletion arch/arc/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dtb-$(CONFIG_TARGET_AXS101) += axs101.dtb
dtb-$(CONFIG_TARGET_AXS103) += axs103.dtb
dtb-$(CONFIG_TARGET_NSIM) += nsim.dtb
dtb-$(CONFIG_TARGET_TB100) += abilis_tb100.dtb
dtb-$(CONFIG_TARGET_EMDK) += emdk.dtb
dtb-$(CONFIG_TARGET_EMSDP) += emsdp.dtb
dtb-$(CONFIG_TARGET_HSDK) += hsdk.dtb
dtb-$(CONFIG_TARGET_IOT_DEVKIT) += iot_devkit.dtb

Expand Down
2 changes: 1 addition & 1 deletion arch/arc/dts/emdk.dts → arch/arc/dts/emsdp.dts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "skeleton.dtsi"

/ {
model = "snps,emdk";
model = "snps,emsdp";

#address-cells = <1>;
#size-cells = <1>;
Expand Down
6 changes: 3 additions & 3 deletions board/synopsys/emdk/Kconfig → board/synopsys/emsdp/Kconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
if TARGET_EMDK
if TARGET_EMSDP

config SYS_BOARD
default "emdk"
default "emsdp"

config SYS_VENDOR
default "synopsys"

config SYS_CONFIG_NAME
default "emdk"
default "emsdp"

endif
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
EM DEVELOPMENT KIT BOARD
M: Alexey Brodkin <[email protected]>
S: Maintained
F: board/synopsys/emdk/
F: configs/emdk_defconfig
F: arch/arc/dts/emsdp.dts
F: board/synopsys/emsdp/
F: configs/emsdp_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# SPDX-License-Identifier: GPL-2.0+
#

obj-y += emdk.o
obj-y += emsdp.o
11 changes: 6 additions & 5 deletions board/synopsys/emdk/README → board/synopsys/emsdp/README
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
================================================================================
Useful notes on bulding and using of U-Boot on ARC EM Development Kit (AKA EMDK)
Useful notes on bulding and using of U-Boot on
ARC EM Software Development Platform (AKA EMSDP)
================================================================================

BOARD OVERVIEW

The DesignWare ARC EM Development Kit is FPGA-bases platform for rapid
software development on the ARC EM family of processors.
The DesignWare ARC EM Software Development Platform is FPGA-bases platform
for rapid software development on the ARC EM family of processors.

Since this board is based on FPGA it's possible to load and use different
versions of ARC EM CPUs. U-Boot is built to be run on the simplest
Expand Down Expand Up @@ -50,7 +51,7 @@ Useful notes on bulding and using of U-Boot on ARC EM Development Kit (AKA EMDK)

1. Configure U-Boot:
------------------------->8----------------------
make emdk_defconfig
make emsdp_defconfig
------------------------->8----------------------

2. To build Elf file (for example to be used with host debugger via JTAG
Expand All @@ -69,7 +70,7 @@ Useful notes on bulding and using of U-Boot on ARC EM Development Kit (AKA EMDK)

EXECUTING U-BOOT

1. The EMDK board is supposed to auto-start U-Boot image stored in ROM on
1. The EMSDP board is supposed to auto-start U-Boot image stored in ROM on
power-on. For that make sure VCCIO DIP-switches are all in "off" state.

2. Though it is possible to load U-Boot as a simple Elf file via JTAG right
Expand Down
18 changes: 9 additions & 9 deletions board/synopsys/emdk/emdk.c → board/synopsys/emsdp/emsdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void reset_cpu(ulong addr)
; /* loop forever till reset */
}

static int do_emdk_rom(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
static int do_emsdp_rom(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
{
u32 creg_boot = readl((u32 *)(CREG_BASE + CREG_BOOT_OFFSET));

Expand All @@ -71,17 +71,17 @@ static int do_emdk_rom(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
return CMD_RET_SUCCESS;
}

cmd_tbl_t cmd_emdk[] = {
U_BOOT_CMD_MKENT(rom, 2, 0, do_emdk_rom, "", ""),
cmd_tbl_t cmd_emsdp[] = {
U_BOOT_CMD_MKENT(rom, 2, 0, do_emsdp_rom, "", ""),
};

static int do_emdk(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
static int do_emsdp(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
{
cmd_tbl_t *c;

c = find_cmd_tbl(argv[1], cmd_emdk, ARRAY_SIZE(cmd_emdk));
c = find_cmd_tbl(argv[1], cmd_emsdp, ARRAY_SIZE(cmd_emsdp));

/* Strip off leading 'emdk' command */
/* Strip off leading 'emsdp' command */
argc--;
argv++;

Expand All @@ -92,8 +92,8 @@ static int do_emdk(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
}

U_BOOT_CMD(
emdk, CONFIG_SYS_MAXARGS, 0, do_emdk,
"Synopsys EMDK specific commands",
emsdp, CONFIG_SYS_MAXARGS, 0, do_emsdp,
"Synopsys EMSDP specific commands",
"rom unlock - Unlock non-volatile memory for writing\n"
"emdk rom lock - Lock non-volatile memory to prevent writing\n"
"emsdp rom lock - Lock non-volatile memory to prevent writing\n"
);
6 changes: 3 additions & 3 deletions configs/emdk_defconfig → configs/emsdp_defconfig
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
CONFIG_ARC=y
CONFIG_ISA_ARCV2=y
CONFIG_CPU_ARCEM6=y
CONFIG_TARGET_EMDK=y
CONFIG_TARGET_EMSDP=y
CONFIG_SYS_TEXT_BASE=0x00000000
CONFIG_SYS_CLK_FREQ=40000000
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
CONFIG_VERSION_VARIABLE=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="emdk# "
CONFIG_SYS_PROMPT="emsdp# "
# CONFIG_CMD_BOOTD is not set
# CONFIG_CMD_XIMG is not set
CONFIG_CMD_MMC=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DEFAULT_DEVICE_TREE="emdk"
CONFIG_DEFAULT_DEVICE_TREE="emsdp"
CONFIG_ENV_IS_IN_FAT=y
CONFIG_ENV_FAT_INTERFACE="mmc"
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
Expand Down
10 changes: 5 additions & 5 deletions include/configs/emdk.h → include/configs/emsdp.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Copyright (C) 2018 Synopsys, Inc. All rights reserved.
*/

#ifndef _CONFIG_EMDK_H_
#define _CONFIG_EMDK_H_
#ifndef _CONFIG_EMSDP_H_
#define _CONFIG_EMSDP_H_

#include <linux/sizes.h>

Expand All @@ -30,11 +30,11 @@

#define CONFIG_EXTRA_ENV_SETTINGS \
"upgrade_image=u-boot.bin\0" \
"upgrade=emdk rom unlock && " \
"upgrade=emsdp rom unlock && " \
"fatload mmc 0 ${loadaddr} ${upgrade_image} && " \
"cp.b ${loadaddr} 0 ${filesize} && " \
"dcache flush && " \
"emdk rom lock\0"
"emsdp rom lock\0"

#endif /* _CONFIG_EMDK_H_ */
#endif /* _CONFIG_EMSDP_H_ */

0 comments on commit adc9b09

Please sign in to comment.