diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-18 00:45:18 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-18 00:45:18 +0300 |
| commit | f4df1f767892b42d01e9213d08a6f16eef646152 (patch) | |
| tree | c72ddf53d5fdc2a68dc8c09f0df529e62062a569 | |
| parent | 1dd181ff2b3009405d12ad0b3782176490da2446 (diff) | |
| parent | 474e9312a803ee36dc984217b6e9b7190eca9865 (diff) | |
| download | u-boot-f4df1f767892b42d01e9213d08a6f16eef646152.tar.xz | |
Merge tag 'arc-for-2018.05-rc3' of git://git.denx.de/u-boot-arc
Subtle ARC fixes for v2018.05-RC3
These are only very subtle clean-ups here and there including:
* Correctly specified CPU freq for HSDK
(production boards are all shipped with 500MHZ as opposed
to early batch running at 1GHz)
* Addition of SNPS internal group email to MAINTAINERS file
* Switch to Hush shell on AXS10x boards
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/arc/lib/init_helpers.c | 2 | ||||
| -rw-r--r-- | configs/axs101_defconfig | 1 | ||||
| -rw-r--r-- | configs/axs103_defconfig | 1 | ||||
| -rw-r--r-- | configs/hsdk_defconfig | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 44eeefa635..9f653a0137 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -55,7 +55,9 @@ Maintainers List (try to look for most precise areas first) ----------------------------------- ARC M: Alexey Brodkin <alexey.brodkin@synopsys.com> +M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> S: Maintained +L: uboot-snps-arc@synopsys.com T: git git://git.denx.de/u-boot-arc.git F: arch/arc/ diff --git a/arch/arc/lib/init_helpers.c b/arch/arc/lib/init_helpers.c index 435fe96ef4..822318ff43 100644 --- a/arch/arc/lib/init_helpers.c +++ b/arch/arc/lib/init_helpers.c @@ -7,8 +7,6 @@ #include <asm/cache.h> #include <common.h> -DECLARE_GLOBAL_DATA_PTR; - int init_cache_f_r(void) { sync_n_cleanup_cache_all(); diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index 174b80aeed..25b10888ce 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS3,115200n8" CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="AXS# " # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index 9530061568..b9d387b88a 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS3,115200n8" CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="AXS# " # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig index 37f61902d3..844decad2d 100644 --- a/configs/hsdk_defconfig +++ b/configs/hsdk_defconfig @@ -2,7 +2,7 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y CONFIG_TARGET_HSDK=y CONFIG_SYS_TEXT_BASE=0x81000000 -CONFIG_SYS_CLK_FREQ=1000000000 +CONFIG_SYS_CLK_FREQ=500000000 CONFIG_DEFAULT_DEVICE_TREE="hsdk" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8" |